github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity
7770 commits 3 branches 7 tags 206 MiB
Commit graph

2578 commits

Author SHA1 Message Date
Henry Oswald
b24b110037 Merge pull request #647 from sharelatex/ho-clsi-domain 
PDF download takes optional domain paramater
 2018-06-13 11:30:17 +01:00
Henry Oswald
02110064f7 Merge branch 'master' into ho-clsi-domain 2018-06-13 10:32:51 +01:00
Shane Kilkelly
3baf0836bc Support project-linked-files originating from imported v1 projects 2018-06-13 10:02:54 +01:00
Jessica Lawshe
baa321fa1a Merge pull request #628 from sharelatex/ns-only-one-doc-env 
only suggest one document environment per project
 2018-06-12 08:44:14 -05:00
James Allen
f7532e5854 Merge pull request #619 from sharelatex/afc-email-tokens 
Use emails with tokens for team invites
 2018-06-12 08:30:23 +01:00
Henry Oswald
75c9489c06 PDF Downloads work, not tested on large pdf's yet 2018-06-08 17:17:00 +01:00
Jessica Lawshe
d57660aeb5 Merge pull request #632 from sharelatex/jel-plans-pricing-fix 
Plans and Pricing fixes
 2018-06-08 07:17:28 -05:00
Alberto Fernández Capel
59688efb56 Merge remote-tracking branch 'origin/master' into afc-email-tokens 2018-06-08 12:21:17 +01:00
Jessica Lawshe
6c92238f37 Fix analytics event label for when shouldABTestPlans: false 2018-06-07 10:30:21 -05:00
Jessica Lawshe
484ee9ad61 Should not AB test when signed up before 2018-06-06 2018-06-07 10:30:21 -05:00
Alberto Fernández Capel
5e70825c94 Rename view variable to invite 
Makes the meaning more explicit
 2018-06-07 16:12:02 +01:00
Alasdair Smith
3fa6f4743d Merge pull request #637 from sharelatex/as-fix-clone-owner 
Set the owner object to the current user when cloning a project
 2018-06-07 11:54:09 +01:00
Alasdair Smith
f3c871a972 Merge pull request #640 from sharelatex/as-fix-leave-quick-action 
Show leave quick action instead of archive for unowned projects
 2018-06-07 11:44:36 +01:00
Alasdair Smith
4a1c2cf0e0 Set cloned project's owner to current user 
Fixes a bug where cloning a project then selecting to delete it, the wrong
button for deletion is shown (leave instead of archive/delete). This is
because we are using the owner object (which was undefined after cloning) to
determine which button to show
 2018-06-07 11:19:11 +01:00
Alasdair Smith
0900559579 Fix blurrly autocomplete highlight on Chrome 
The blurrly text shadow is back on Chrome. I suspect it maybe intended, not a
bug, so I've fixed it for all versions of Chrome.

I've replaced with font-weight: bold, which visually has the same appearance
 2018-06-06 17:19:12 +01:00
Alasdair Smith
8f71b104c5 Fix bug where unowned project would show archive quick action instead of leave 
If the user does not own the project, the project can only be left, not
archived. Previously the quick action button was only showing the archive icon
but clicking the button would correctly leave the project. This is confusing,
so this commit corrects to show the leave icon for projects not owned by the
current user
 2018-06-06 16:59:13 +01:00
Nate Stemen
26385718e6 only suggest thebibliography once 2018-06-05 11:02:03 -04:00
Alberto Fernández Capel
6fb6119ca8 Merge remote-tracking branch 'origin' into afc-email-tokens 2018-06-05 15:42:17 +01:00
Jessica Lawshe
b63384cbf1 Merge pull request #537 from sharelatex/jel-pricing-plans 
Plans and pricing variant
 2018-06-05 09:30:43 -05:00
Nate Stemen
863128a030 only suggest one document environment in project 2018-06-05 10:08:27 -04:00
Paulo Reis
8e5032fb34 Merge branch 'master' into pr-v2-history-ui 2018-06-05 10:55:42 +01:00
Paulo Reis
f858786f2d Add i18n. 2018-06-05 10:14:16 +01:00
Jessica Lawshe
b1c988e4c1 Add hover and scroll events 2018-06-04 14:42:26 -05:00
Jessica Lawshe
10cf5825a5 Add plans variant 
Also, fix for multiple quotes. Without a closing quote subsequent quotes are considered nested, and
will use a ‘ instead of “

Also, move repeated elements to partials
 2018-06-04 14:42:26 -05:00
Hugh O'Brien
63482e0ea0 Merge pull request #617 from sharelatex/hb-check-for-folders-clientside 
Add function to check for existence of folders
 2018-06-04 12:07:25 +01:00
Alasdair Smith
7898a1deca Fix missed snake_case to camelCase, causing bug where projects couldn't be restored 2018-06-04 10:45:23 +01:00
Alberto Fernández Capel
25d7196570 Merge remote-tracking branch 'origin/master' into afc-email-tokens 2018-06-01 16:49:47 +01:00
hugh-obrien
063187b5fc add function to check for existance of folders 2018-05-31 17:03:41 +01:00
Alberto Fernández Capel
d262de14d6 Use team invites to join domain licensed teams 2018-05-31 16:15:47 +01:00
Alberto Fernández Capel
39c8595c27 Split SubscriptionGroupInvites and rename to DomainSubscriptionJoin 
To not cause confusion with team invites.
They are not really an invite because they are user initiated, but
more of a user choosing to join a team.
 2018-05-31 14:25:47 +01:00
Alberto Fernández Capel
11edfde153 Accept & revoke team invites 2018-05-31 11:54:50 +01:00
Shane Kilkelly
d3ae276091 Merge pull request #579 from sharelatex/sk-linked-files-from-project 
Linked Files from Project
 2018-05-31 11:08:08 +01:00
Alasdair Smith
57c56a0853 Merge pull request #565 from sharelatex/as-dash-action-btns 
Add action buttons to v2 dash
 2018-05-31 10:11:20 +01:00
Alasdair Smith
5ec238cae8 Switch archive button with restore button for archived projects 2018-05-31 10:05:39 +01:00
Alasdair Smith
7dffc56804 Clone project action button 2018-05-31 10:05:04 +01:00
Alasdair Smith
2354f4156b Download project action button 2018-05-31 10:04:59 +01:00
Alasdair Smith
ffc06f2a3b Archive project action button 2018-05-31 10:04:50 +01:00
Paulo Reis
7cb4280a4d Remove commented-out code. 2018-05-30 15:18:15 +01:00
Alberto Fernández Capel
9aa95cb0d5 Show team invites 2018-05-30 13:06:27 +01:00
Alasdair Smith
d0b160d9a2 Rename flag for clarity 2018-05-30 11:55:09 +01:00
Alberto Fernández Capel
7e09c0e0b1 First stab at email token invites (WIP) 2018-05-30 11:29:21 +01:00
Paulo Reis
637c492e6e Merge branch 'master' into pr-v2-history-ui 2018-05-30 11:24:33 +01:00
Paulo Reis
8d2189f843 Support using both point-in-time and compare modes. 2018-05-29 16:50:15 +01:00
Shane Kilkelly
9e65e5e813 Fix loading of Rich Text page in Test Controls 2018-05-29 10:46:22 +01:00
Shane Kilkelly
dccac6302e Use a decorateLinkedFileData function on server to add project name 2018-05-29 10:07:31 +01:00
Shane Kilkelly
ce147b012f Cleaner unpacking of data from scope 2018-05-25 16:03:45 +01:00
Jessica Lawshe
868083676f Move contact form 2018-05-25 08:50:38 -05:00
Shane Kilkelly
105d858155 Move waitFor into an angular service 2018-05-25 13:02:58 +01:00
Shane Kilkelly
cfc17d56e8 Use a promise (with Angular's $q) in waitFor 2018-05-25 11:42:13 +01:00
Shane Kilkelly
8be4279165 Fix a broken if-else-if statement 2018-05-25 10:56:32 +01:00
Shane Kilkelly
f5f253ad01 Add an optional pollInterval parameter to waitFor 2018-05-25 10:56:08 +01:00
Shane Kilkelly
e33b7b1a49 Use waitFor when restoring a file in v2 history 2018-05-25 10:37:04 +01:00
Shane Kilkelly
19d8700947 Use waitFor when refreshing the binary file view 2018-05-25 10:36:39 +01:00
Shane Kilkelly
3849bcfb40 Add a waitFor helper to the ide object 2018-05-25 10:36:20 +01:00
Shane Kilkelly
0cb5beb689 Merge branch 'master' into sk-linked-files-from-project 2018-05-24 13:47:28 +01:00
Shane Kilkelly
b2a68cb911 Merge pull request #582 from sharelatex/sk-add-test-controls-panel 
Add a "Test Controls" section to the left-panel
 2018-05-24 11:41:10 +01:00
Shane Kilkelly
73a45b15ce Make string replace op safer 2018-05-24 11:35:55 +01:00
Shane Kilkelly
de1f33a720 Remove 'private' methods from the controller scope 2018-05-24 11:32:44 +01:00
Shane Kilkelly
16419847ae Fix linked-file-types check when opening modal 2018-05-24 11:32:20 +01:00
Shane Kilkelly
656d40ac39 Better view refresh after refreshing linked file 2018-05-24 11:31:50 +01:00
Shane Kilkelly
561b62f7db Add a hidden 'Test Controls' section to the left-menu. 
This is to be used for hidden features that are not yet ready to ship,
and would otherwise be hidden behind a console command.
Append `?tc=true` to the project url to reveal this panel.
 2018-05-23 12:37:42 +01:00
Paulo Reis
fb33fc6c30 Add loading indicators; handle binary files; keep selected file across points in time. 2018-05-23 12:14:27 +01:00
Shane Kilkelly
f5dd94ca1d Remove test code from FileTreeManager 2018-05-23 11:46:37 +01:00
James Allen
103ddd79ef Merge pull request #580 from sharelatex/ja-fix-trials 
Use intelligent /user/trial v2 URL for v2 trials
 2018-05-23 11:46:17 +01:00
James Allen
2ff5ecb342 Use intelligent /user/trial v2 URL for v2 trials 2018-05-22 16:59:59 +01:00
Jessica Lawshe
6a84fb374f Merge pull request #567 from sharelatex/jel-remove-wiki-page-btn 
Remove suggest new wiki doc
 2018-05-22 10:07:47 -05:00
Paulo Reis
f4f3a4375b Add history toolbar (just scaffolding); show files at point in time. 2018-05-22 15:40:57 +01:00
Shane Kilkelly
691eec48ba Merge branch 'master' into sk-linked-files-from-project 2018-05-22 15:39:09 +01:00
Paulo Reis
81c93e11d0 History file tree integration with the backend. 2018-05-21 15:13:34 +01:00
Paulo Reis
a716f9ccd3 Integrate history file tree in the UI. 2018-05-21 15:12:47 +01:00
Paulo Reis
6701b4413b Add history file tree components. 2018-05-21 15:12:03 +01:00
Shane Kilkelly
1f2ee4e3fc Show error if refresh fails 2018-05-21 11:02:12 +01:00
Alasdair Smith
309792401f Re-focus editor after clicking suggestion 2018-05-21 10:35:43 +01:00
Alasdair Smith
c2d7809e05 Add removeWord so that learning word removes all highlights for given word 2018-05-18 14:23:36 +01:00
Alasdair Smith
a719ac6e6e IE11 doesn't support Array.find so use underscore instead 2018-05-18 13:33:06 +01:00
Alasdair Smith
681e67ecea Be more consistent with naming 2018-05-18 11:29:27 +01:00
Alasdair Smith
846f27f0ad Clear highlights that are "touching" the cursor on change 
This means that correcting a mistake won't wait until the request has resolved and that only the word at the end of the line will have it's spelling
highlight removed instead of the entire row
 2018-05-18 11:29:27 +01:00
Alasdair Smith
2be023c731 Prevent spell error marker adding newly typed characters 2018-05-18 11:29:27 +01:00
Alasdair Smith
9fa85400b3 HighlightedWordManager is more naive about tracking position 
We are relying entirely on Ace's tracking of markers with the anchor trick.
This means that we don't have to apply changes to ensure that the word manager
data structure tracks which row the highlights are on. This is traded off
against slightly less efficient searching/removing
 2018-05-18 11:29:27 +01:00
Alasdair Smith
ebf1b7c84c Extract SpellCheckAdapter to separate file 2018-05-18 11:29:27 +01:00
Alasdair Smith
d2bba0eb60 Fix firefox not closing contextmenu correctly 2018-05-18 11:29:27 +01:00
Alasdair Smith
034531d323 Replace word with suggestion and learn word 2018-05-18 11:29:27 +01:00
Alasdair Smith
cf123ce857 Extract spellMenu component and use when showing spell suggestions 2018-05-18 11:29:27 +01:00
Alasdair Smith
e6ffaaa489 Handle contextmenu for spelling 2018-05-18 11:29:27 +01:00
Alasdair Smith
8de2267824 Adapt aceEditor to use new spell check manager with adapter 2018-05-18 11:29:27 +01:00
Alasdair Smith
22e41cdce7 Simplify word manager to use Range + Anchor to automatically keep marker positions up-to-date 
Re-implement highlighted word manager to be simpler
 2018-05-18 11:29:16 +01:00
Alasdair Smith
37ca7b54a6 Re-implement spell check manager with adapter to abstract away editor 2018-05-18 11:29:16 +01:00
Shane Kilkelly
2b99080ed3 Fix rendering of long previews, stop cutting off last line in short ones 2018-05-18 11:25:01 +01:00
Shane Kilkelly
4acd55b1c6 More tidy unpacking of data 2018-05-18 11:07:59 +01:00
Shane Kilkelly
16106df2f0 Remove obsolete code 2018-05-18 11:05:20 +01:00
Shane Kilkelly
94a599d530 Fix the reloading of file view after refreshing linked file 2018-05-18 10:35:02 +01:00
Jessica Lawshe
0fd29d4819 Remove missing wiki controller 2018-05-17 09:43:19 -05:00
Shane Kilkelly
9624e2a290 Record the source project display name, to render with the file 2018-05-16 13:44:21 +01:00
Shane Kilkelly
f533674dbd Clean up 2018-05-16 13:26:59 +01:00
Shane Kilkelly
7292602167 More fine-grained loading spinners 2018-05-16 11:49:10 +01:00
Shane Kilkelly
e3bc6cac9e Auto-set filename based on selected file 2018-05-16 11:12:00 +01:00
Shane Kilkelly
103832af7d Functioning project-linked-file importer 2018-05-16 10:29:51 +01:00
Shane Kilkelly
9c33f3f8bc WIP: Project Linked File modal 2018-05-15 16:22:47 +01:00
Shane Kilkelly
33b4a1768b Merge branch 'master' into sk-linked-files-from-project 2018-05-15 10:53:59 +01:00
James Allen
ed7b68169e Revert accidental dev changes to UndoManager 2018-05-11 17:05:39 +01:00
James Allen
35dc518d05 Merge pull request #553 from sharelatex/ja-configurable-fonts 
Allow font family and line height to be user configurable
 2018-05-11 13:50:03 +01:00
Alasdair Smith
df9294816e Show archive or leave icon based on selected projects 2018-05-11 13:46:15 +01:00
James Allen
dee96920b0 Allow font family and line height to be user configurable 2018-05-10 18:03:54 +01:00
James Allen
78aefc2871 Merge pull request #542 from sharelatex/ja-match-front-to-v1 
Update font and line spacing in Ace to match OL v1
 2018-05-09 12:24:37 +01:00
James Allen
1aadd7d369 Configure line height and font family separately for v2 2018-05-04 14:05:20 +01:00
James Allen
b847638ed1 Clean up comments and callbacks 2018-05-04 13:31:26 +01:00
Shane Kilkelly
3c3ce2010a Add endpoint to list entities within a project 2018-05-04 10:45:13 +01:00
Shane Kilkelly
4925bfe536 Add an endpoint to get users projects as json 2018-05-04 09:44:13 +01:00
James Allen
7e250be66d Update font and line spacing in Ace to match OL v1 2018-05-03 17:04:49 +01:00
Shane Kilkelly
5cb85c0332 WIP: Add ProjectFileAgent 2018-05-03 14:29:03 +01:00
James Allen
8ecd073efc Support Ctrl-. to compile for v1 compabitility 2018-05-03 12:28:14 +01:00
James Allen
09486f2eea Recompile on Cmd-S and :w 2018-05-03 12:20:53 +01:00
Paulo Reis
9f6dc12658 Add custom styling; add code to handle point-in-time selection. 2018-05-01 17:27:51 +01:00
James Allen
5c87a2aa90 Display last modified as a relative date in v2 2018-04-27 16:50:46 +01:00
Paulo Reis
6e6bc91130 Style the history entries components. 2018-04-27 15:59:28 +01:00
Paulo Reis
8249f4e17e Wrap copies of existing history UI elements in components. 2018-04-27 11:22:20 +01:00
Henry Oswald
c6f4df4f77 Merge pull request #498 from sharelatex/ho-recurly-v4 
Payment page improvments
 2018-04-24 09:01:34 +01:00
Alasdair Smith
152c816b5c Add documentation and tests of EventEmitter implementation 2018-04-23 11:01:19 +01:00
Alasdair Smith
b0349af21d Merge pull request #493 from sharelatex/as-editor-toolbar 
Add toggle switch directive to editor toolbar
 2018-04-23 10:04:12 +01:00
James Allen
87cc08569a Fix bad if statement sending doc open into infinite loop 2018-04-16 17:03:18 +01:00
James Allen
9e525702c1 Merge branch 'master' into ja-restore-files 2018-04-16 16:14:31 +01:00
Henry Oswald
45f51c9a27 change country select to proper angular setup so pre population works 
it may have been broken from an angular upgrade or similar.
 2018-04-16 15:12:03 +01:00
Henry Oswald
c3eeefdc5b only use recurly.js from our public libs folder 2018-04-16 10:52:33 +01:00
Henry Oswald
903a9db936 upgrade static recurly lib to 4.8.5 for plans page 2018-04-16 10:10:43 +01:00
Henry Oswald
a1be0e95b4 remove the dead validation 2018-04-16 10:10:25 +01:00
Alasdair Smith
4a12754d90 Mark visible toggle switch as hidden from screen readers 2018-04-16 10:07:46 +01:00
Alasdair Smith
0f70d526d9 Remove unused toggleRichText method 2018-04-16 09:42:26 +01:00
Alasdair Smith
591f341f5f Add switch-toggle directive 2018-04-16 09:36:10 +01:00
Henry Oswald
b1ee05de3e better styling, close to being deployable 2018-04-13 17:32:20 +01:00
Henry Oswald
ae3858bcd0 can subscribe using new form. terrible styling 2018-04-13 16:35:32 +01:00
Henry Oswald
7e8b59cbb3 wip form loads as ifram 2018-04-13 16:01:41 +01:00
Paulo Jorge Reis
9e40555c89 Merge pull request #487 from sharelatex/pr-fix-v2-togglers 
Control the visibility of the custom toggler
 2018-04-13 13:46:55 +01:00
Jessica Lawshe
18c6802b84 Revert "Revert "Merge pull request #480 from sharelatex/jel-remove-old-exp"" 
This reverts commit 5c3f391041303456aeb800522c0fdcfe900625ac.
 2018-04-12 13:53:26 -05:00
Jessica Lawshe
5290c29ce1 Revert "Merge pull request #480 from sharelatex/jel-remove-old-exp" 
This reverts commit c5919be6d2e880ac4d3f5820c38211b1c88812ff, reversing
changes made to 3c8772cf020738c767b6f7a956bd002b47988932.
 2018-04-12 13:25:42 -05:00
Paulo Reis
35d7c96d04 Control the visibility of the custom toggler when panes are hidden externally. 2018-04-12 16:41:49 +01:00
Jessica Lawshe
be5f95ba69 Remove "history-discount" experiment 2018-04-12 10:18:15 -05:00
Jessica Lawshe
2301b83f22 Remove "teaser-dropbox-text" experiment 2018-04-12 10:18:15 -05:00
Jessica Lawshe
55cb5b3c70 Remove "teaser-history" experiment 2018-04-12 10:18:15 -05:00
Jessica Lawshe
f44ddcb928 Remove "plans-1610" experiment 
There is 1 place that the variants appear still,
`/web/public/coffee/main/subscription-dashboard.coffee`. This should
remain for users that bought these plans.
 2018-04-12 10:18:15 -05:00
James Allen
11d47fcc31 Use updated project-history response format 2018-04-06 15:20:18 +01:00
James Allen
415be6b4e0 Open file after restoring 2018-04-06 10:30:13 +01:00
James Allen
0a1c543841 Hook up front end to restore documents 2018-04-06 10:30:13 +01:00
Jessica Lawshe
b2c7bb9d95 Track v2 onboard events 
Added events to the v2 banner to track on Metabase and Google
Analytics.
 2018-04-03 08:48:11 -05:00
Paulo Jorge Reis
8f7228d26e Merge pull request #437 from sharelatex/pr-v2-splitters 
Improve v2 splitters
 2018-03-27 10:08:05 +01:00
Alasdair Smith
3f8eda2223 Extract rich text code to module 2018-03-23 12:37:16 +00:00
James Allen
b1ca81bf2d Merge pull request #430 from sharelatex/ja-hide-v2-notification 
Allow dismissing/hiding v2 and v1 banners
 2018-03-22 16:33:02 +00:00
James Allen
363ab86b24 Merge pull request #375 from sharelatex/as-clean-up-sharejs 
Clean up ShareJS
 2018-03-22 16:32:52 +00:00
Alasdair Smith
3e4b8cd409 Clean up change listeners on sharejs 2018-03-22 16:32:25 +00:00
Paulo Reis
2447e85f3f Remove stray console.log(). 2018-03-22 14:08:16 +00:00
Jessica Lawshe
ffbdb760c6 Merge pull request #417 from sharelatex/subscription-analytics 
Subscription analytics
 2018-03-22 08:47:42 -05:00
Paulo Reis
906f4899aa Only use custom togglers in v2. 2018-03-22 12:10:34 +00:00
Paulo Reis
3f073c2341 Rename attributes and vars for clarity 2018-03-20 16:11:09 +00:00
Paulo Reis
fb7d902038 Make custom togglers react to opening and closing panes. Dynamically add CSS classes. 2018-03-20 16:11:09 +00:00
Paulo Reis
fc0be22c6d Extend layout directive to support custom togglers. 2018-03-20 16:11:09 +00:00
James Allen
01343b8419 Remove console.log line 2018-03-20 14:21:34 +00:00
Henry Oswald
a4c6cd208c validate captcha on every email addition 2018-03-20 13:53:16 +00:00
James Allen
a023512872 Collapse panel with v1 info 2018-03-20 13:50:51 +00:00
Jessica Lawshe
5cc6fb8843 Send analytics event after submitting group inquiry form 2018-03-20 08:31:35 -05:00
Jessica Lawshe
d7756ea2de Add event tracking for upgrade button 2018-03-20 08:31:34 -05:00
Jessica Lawshe
47696ea3f1 Correct analytics label and send event when group modal opened 2018-03-20 08:31:34 -05:00
James Allen
d8ed0e5277 Allow v2 notification banner to be dismissed 2018-03-20 12:15:18 +00:00
Alasdair Smith
8abf3593fb Prevent CM/Sharejs adapter from overwriting value in editor 2018-03-13 11:16:56 +00:00
Alasdair Smith
9cf9a7e4fc Fix CM/ShareJS adapter using old CM api 
Fixes bug where deleting text in CM would throw an error in some
circumstances
 2018-03-13 11:16:49 +00:00
James Allen
f94105b1e9 Remove debug lines 2018-03-05 11:31:24 +00:00
James Allen
e77168d791 Don't render URL section if not linked file 2018-03-05 11:21:31 +00:00
James Allen
d4025908b7 Add in enabledLinkedFileTypes setting 2018-03-05 10:37:53 +00:00
James Allen
6848e97a82 Hook up refresh button to backend 2018-03-05 10:37:00 +00:00
James Allen
9733223840 Show linked file status in front end 2018-03-05 10:37:00 +00:00
James Allen
b1dda931f4 Add in modal for creating linked URL file 2018-03-05 10:37:00 +00:00
James Allen
becb76d69b Don't allow backslashes in file names 2018-03-01 11:42:44 +00:00
James Allen
1f62df17c8 Merge pull request #363 from sharelatex/ja-guest-track-changes 
Tidy up logic (a bit) around guest track changes
 2018-02-23 14:41:12 +00:00
Alasdair Smith
85ceab5310 Tear down Ace session when aceEditor is destroyed 
This cleans up the Ace worker that parses syntax, preventing a memory leak
 2018-02-23 10:13:24 +00:00
James Allen
1d3db923f0 Tidy up logic (a bit) around guest track changes 2018-02-23 09:55:57 +00:00
Alasdair Smith
2be37795bd TODO for cleaning up sharejs callbacks 2018-02-22 11:44:09 +00:00
Alasdair Smith
598837e17c Use applyAsync to prevent issue when switching docs 2018-02-22 11:44:09 +00:00
Alasdair Smith
c5735a31df Remove unused listener 2018-02-22 11:44:09 +00:00
Alasdair Smith
e1187f3d8a Listen for changes to the CodeMirror Doc, instead of all changes to the editor 
This prevents an issue where switching docs (i.e. files) would cause the newly
opened doc from being inserted into the old doc.

This approach is similar to Ace's sessions.
 2018-02-22 11:44:09 +00:00
Alasdair Smith
c85e9ba3b1 Instead of setting value of CM, swap Docs 
This allows for tracking changes on individual docs (i.e. files), instead of
just changes to the editor. This is similar to how Ace works with sessions
 2018-02-22 11:44:09 +00:00
Brian Gough
fc1e94b14a Merge pull request #343 from sharelatex/bg-block-javascript-property-names 
block javascript property names being used as file names
 2018-02-16 14:07:12 +00:00
Brian Gough
8a10e98b56 block javascript property names being used as file names 2018-02-16 10:31:47 +00:00
James Allen
4754f1e78a Use bare objects without prototypes for tracking filenames 2018-02-15 11:06:40 +00:00
James Allen
a7fabb8e43 Merge pull request #321 from sharelatex/ja-recompile-tweaks 
Animate toolbar for auto-compile and consolidate trigger logic
 2018-02-14 09:34:16 +00:00
James Allen
29d2b408ad Don't error when detaching from history with no sharejsDoc 2018-02-13 08:43:00 +00:00
James Allen
5d3ecdb924 Add explicit editor init event 2018-02-13 08:27:48 +00:00
James Allen
3802df5cfa Use popup instance variable like Ace autocompleter does 2018-02-13 08:27:41 +00:00
James Allen
5d6925921c Fix read only links 2018-02-12 10:42:57 +00:00
James Allen
92e59f7008 Remove unneeded apply 2018-02-09 17:58:19 +00:00
James Allen
ab940fb462 Fix typo in comment 2018-02-09 17:54:58 +00:00
Alasdair Smith
6088fcf82b Merge pull request #310 from sharelatex/ja-link-sharing-tweaks 
Link sharing UX improvments
 2018-02-09 11:23:28 +00:00
Alasdair Smith
7ff0f40477 Merge pull request #266 from sharelatex/as-cm 
CodeMirror
 2018-02-09 11:23:11 +00:00
Alasdair Smith
bfda9c595b Hide rich text behind feature flag 2018-02-09 10:42:11 +00:00
Alasdair Smith
4c23a3c8f0 Fix bug where spell check cache would error when toggling between ace & cm 2018-02-09 10:42:11 +00:00
Alasdair Smith
d15efc6fb6 Create cmEditor directive to connect to ShareJS 2018-02-09 10:42:11 +00:00
Alasdair Smith
b9327cb2d4 Add toolbar with button to toggle rich text 2018-02-09 10:42:00 +00:00
Alasdair Smith
7783e18a50 Allow Documents to be attached to CM 2018-02-09 10:38:51 +00:00
Alasdair Smith
09fbafa1f6 Include ShareJS CM adapter in compiled lib and fix bug with CM adapter 
Because the CM & Ace scripts are naively concat-ed together, the Ace
applyToShareJS function would be overwritten by the CM version.

Also fixes bugs where adapter was calling old version of ShareJS api
and the old CM api
 2018-02-09 10:38:51 +00:00
Henry Oswald
ba1e45d12c Merge pull request #317 from sharelatex/ho-nice-recaptcha-message 
improved recaptcha error message
 2018-02-09 10:26:33 +00:00
James Allen
7866a91d21 Refactor auto-compile trigger logic 2018-02-08 13:39:59 +00:00
James Allen
5bf2ff0a47 Show animated bar while auto-compile is pending 2018-02-08 13:39:56 +00:00
Henry Oswald
696e9d27d6 send invalid_email error type down when sharing project 2018-02-08 10:35:18 +00:00
Brian Gough
9224e164fe Merge pull request #315 from sharelatex/bg-validate-filenames-client 
validate filenames on the client
 2018-02-08 09:16:05 +00:00
Brian Gough
b083e4bc5f remove redundant MAX_PATH definition 2018-02-07 16:14:56 +00:00
Brian Gough
c14380d563 use the SafePath.coffee file in the client too 2018-02-07 15:50:29 +00:00
Henry Oswald
a52aed9070 improved recaptcha error message 
- works on register and share project
- decided not to go down i18n for register, would be scope creep on async form
 2018-02-07 14:15:13 +00:00
Brian Gough
76281a3d79 use extended file validation rules in frontend 2018-02-06 11:46:50 +00:00
Brian Gough
ddf1d6e65e add valid-file directive for front-end 2018-02-06 11:46:50 +00:00
James Allen
37115b8408 Add loading indicator while server returns links 2018-02-06 10:00:59 +00:00
James Allen
e7ba75c2e5 Don't show pop-up when changing link sharing status 2018-02-06 09:56:46 +00:00
Alberto Fernández Capel
ae33b84289 Ignore heartbeat event handler params 
They are not used for anything and the cause an error when
the handler is called from a scroll event.
 2018-02-05 13:48:52 +00:00
James Allen
9e5c98dd07 Use local references to variable 2018-02-01 16:52:43 +00:00
Shane Kilkelly
19c97cb15b Merge pull request #289 from sharelatex/afc-track-edit-sessions 
Send editing session heartbeat to the analytics service
 2018-02-01 12:31:38 +00:00
Brian Gough
5e52ade1ff Merge pull request #286 from sharelatex/bg-prevent-duplicate-filenames 
prevent duplicate filenames
 2018-01-31 11:50:45 +00:00
James Allen
9a9938083c Merge pull request #267 from sharelatex/as-remove-rollout 
Remove rollout logic for auto compile and link sharing
 2018-01-31 10:27:09 +00:00
James Allen
aa6c16593e Add renamingToName override name for instant apparent renames 2018-01-31 09:42:41 +00:00
James Allen
9721dffbb6 Add missing state reset to error handler 2018-01-31 09:41:58 +00:00
Brian Gough
1c6dc66ed1 prevent double calls to rename 2018-01-29 16:45:59 +00:00
Brian Gough
6ed181d52c fix check for name in filetree move 2018-01-29 15:27:52 +00:00
Brian Gough
63fa024d98 client-side duplicate check for move/rename/create 2018-01-29 15:24:51 +00:00
Alberto Fernández Capel
839ea496f1 Track clicks anywhere on the window as activity when the editor is open 2018-01-25 16:32:00 +00:00
Alberto Fernández Capel
a68489a604 Track session activvity if the user scrolls the editor 2018-01-25 16:10:47 +00:00
Alberto Fernández Capel
7d0d18ea5e Use the cursor:editor:update event to track user activity 
It is strictly a superset of the change event we were using
before: if there's a change, there will be always a cursor
update, but there can be cursor updates (like when the user
presses the arrow keys) that don't change the document.

This is coherent with what we do to track user activity at

dfb9943521/public/coffee/ide/connection/ConnectionManager.coffee (L49-L50)
 2018-01-24 17:20:30 +00:00
Alberto Fernández Capel
e42d1f9b13 Change heartbeat backoff logic 
Send first two heartbeats at 0 and 30 secs, then increase the backoff
interval 1min per call until a maximun of 5min.
 2018-01-24 16:05:53 +00:00
Alberto Fernández Capel
dd2e9d7431 Remove unused var 2018-01-24 15:37:16 +00:00
Alberto Fernández Capel
f0777f996c Space editing sessions heartbeats with an increasing backoff 
We send the first heartbeat as soon as the session start.
The next ones are sent (if there's any activity)
when the editing session is about 30 and 60 seconds.
Then at 2min, 3min, 4min, 5min and later on every 5min.

The backoff is not reset, so if due to inactivity the
session expires in the server the backoff will still be
the same.
 2018-01-24 15:22:41 +00:00
Brian Gough
feb02dacd4 only update client filetree on success 2018-01-24 10:07:42 +00:00
James Allen
28deb4e107 Merge pull request #292 from sharelatex/ja-v1-ownership 
Fallback to project creator when there is no owner
 2018-01-24 09:50:20 +00:00
Alberto Fernández Capel
8a1523cc03 Read project id from the global window var 2018-01-23 15:58:59 +00:00
Nate Stemen
ea5063d7ea dont return needsClosingBrace from Helpers 2018-01-23 09:35:24 -05:00
Nate Stemen
91302cfb16 move end bracket logic to helpers and remove unecessary unpacking 2018-01-23 09:35:24 -05:00
Nate Stemen
30eca714eb fix random things with snippets 2018-01-23 09:35:24 -05:00
Nate Stemen
d2adc753aa use helpers to see if there is '}' already 2018-01-23 09:35:24 -05:00
James Allen
d7706f642b Show the creator as the owner if no owner present 2018-01-23 13:47:48 +00:00
Alberto Fernández Capel
b3b05d1af3 Disable the trailing throttle event in the editing session heartbeat 
Throttle sends an event as soon as the function is called. Then
we wait X minutes, but we only want to send another event if
there's any activity *after* those X minutes.
 2018-01-23 10:29:11 +00:00
Alberto Fernández Capel
0bef5531bb Rename editSession -> editingSession 2018-01-23 10:29:11 +00:00
Alberto Fernández Capel
868e32c1bc Send edit sessions heartbeat to the analytics service 2018-01-22 15:10:52 +00:00
Alberto Fernández Capel
1a1ccc9f46 Remove trailing whitespace 2018-01-22 15:00:56 +00:00
Alasdair Smith
4d29c4d769 Remove unused link sharing onboarding now at 100% 2018-01-17 15:18:40 +00:00
Alasdair Smith
45de9bb5dc Remove unused autocompile rollout logic now that at 100% 2018-01-17 15:17:55 +00:00
James Allen
6d04eeaa03 Merge pull request #256 from sharelatex/ja-display-v2-history-users 
Inject v2 user details into project-history updates and diffs
 2018-01-15 14:21:14 +00:00
James Allen
662122bb1c CI and local dev environment improvements 
The need for this became very noticeable due to the slowness of filesystem access in docker-in-mac, with a full compile taking over a minute for me in docker. Using make to introduce incremental compile makes this near instantaneous outside of docker (if only a few files have changed), and quick enough inside docker.

With incremental compile via make, it compiles quickly enough that re-compiling and restarting the web service automatically when backend files change is quick enough now. This is how the service is run via docker-compose in https://github.com/sharelatex/sharelatex-dev-environment, so it shouldn't be necessary to manually restart the container each time a coffee file changes.

At the moment Jenkins pull web modules in via the GitSCM plugin, but I believe this is creating a dependency in Jenkins, where any commits to any of the modules causes all of the web branches to rebuild. By doing it via our own scripts we can hopefully avoid this. It also creates a build process which is reproducible locally.

**Note that at the moment in this PR all modules pull from `ja-dockerize-dev` branches, but these should be merged first, and this PR updated to point to the master branches before merging**. This is necessary for other changes to build process/docker-compose workflow.

As well as a Makefile for web, there is now a `Makefile.module`. This is copied into each module directory by the top-level Makefile, and is written in a way to be flexible and support unit tests, acceptance tests, front-end js for the ide and main, and the modules `app/coffee` directory, while allowing modules to have some of these missing (not all modules have e.g. acceptance tests, or front-end JS). This will allows us to refine the build process in future, without needing to update the Makefile in each module repo separately (I found this to be a painful part of this development).

This makes web compatible with the docker-compose workflow at https://github.com/sharelatex/sharelatex-dev-environment, where each service is running in its own docker container, with networking managed by docker.

Previously the Makefile was set up to run unit tests in docker with `make unit_tests`. This now just runs them natively. In the CI, they are run in docker anyway (all steps in Jenkins are), and locally, they run fine natively with `npm run test:unit`, or can be run in docker via https://github.com/sharelatex/sharelatex-dev-environment with `bin/run web_sl npm run test:unit`.

Previously we did a lot of juggling with only mounting source files (coffee, less, etc) into the docker container for acceptance tests. This was to avoid creating root owned files if the whole directory was mounted. Now instead the whole web directory is mounted read-only, with the compilation step done outside of the container before running the tests.

This allows the host and container to share the `node_modules` folder as well, which avoids needing to `npm install` twice on the CI box, and should speed up the build by a few minutes.

On macOS, this would cause a problem with compiled modules if you tried to use the same `node_modules` to run the app natively. However, if running via docker-compose in https://github.com/sharelatex/sharelatex-dev-environment, this is no longer a problem.
 2018-01-15 09:36:41 +00:00
James Allen
17a5dfa5a5 Inject v2 user details into project-history updates and diffs 2018-01-11 11:32:16 +00:00
James Allen
0cf875bd0a Merge pull request #170 from sharelatex/pr-fix-link-rewriting 
Enable HTML5 mode in Angular, to allow disabling link rewriting.
 2018-01-11 08:42:29 +00:00
James Allen
79055d0e8d Merge pull request #243 from sharelatex/ja-dont-show-binary-diffs 
Show apology message instead of raw binary files
 2018-01-11 08:42:13 +00:00
Nate Stemen
c43aa54bee Merge branch 'ns-fix-package-command-meta' 2018-01-08 08:53:42 -05:00
Nate Stemen
7af615ff6c Merge branch 'ns-no-duplicate-packages' 2018-01-08 08:53:07 -05:00
Nate Stemen
cf4d6c1165 Merge branch 'master' into ns-no-duplicate-packages 2018-01-05 11:46:44 -05:00
James Allen
692182c784 Show apology message instead of raw binary files 2018-01-04 10:53:49 +00:00
James Allen
2dcc17ad09 Merge pull request #235 from sharelatex/ja-show-deleted-files-in-v2-history 
Handle deleted and renamed files better in v2 history UI; Fixes #226
 2018-01-03 11:29:59 +00:00
Nate Stemen
d2ee03d9b9 make commandNames object for fast lookups 2017-12-21 15:51:50 -05:00
James Allen
940b22ef95 Remove debug line 2017-12-20 16:42:09 +00:00