github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity
6268 commits 3 branches 7 tags 221 MiB
Commit graph

3584 commits

Author SHA1 Message Date
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
bd9f30d858 Adjust icon spacing in PDF toolbar 2018-02-08 14:41:39 +00:00
James Allen
5bf2ff0a47 Show animated bar while auto-compile is pending 2018-02-08 13:39:56 +00:00
Shane Kilkelly
8117061674 Make the retry-on-fail behaviour optional 2018-02-08 13:04:47 +00:00
Shane Kilkelly
1c15e0966c Add a retry to analytics requests 2018-02-08 11:42:48 +00:00
Henry Oswald
696e9d27d6 send invalid_email error type down when sharing project 2018-02-08 10:35:18 +00:00
Brian Gough
14ef9a2c49 comment out broken length check 2018-02-08 10:08:22 +00:00
Brian Gough
cba4a391a9 Merge pull request #314 from sharelatex/bg-validate-filenames-server 
server side check for valid filenames
 2018-02-08 09:16:31 +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
9c36b38e2c make SafePath.coffee shareable between client and server code 2018-02-07 15:43:56 +00:00
Brian Gough
57549d32be remove unused path module 2018-02-07 15:28:26 +00:00
Brian Gough
2a5ed0caf5 use Errors.InvalidName instead of plain Error object 2018-02-07 15:22:00 +00:00
Brian Gough
c6f74d24f1 add missing SafePath.clean function 2018-02-07 15:21:04 +00:00
Henry Oswald
df9b866bee remove 'script blocker' from recaptcha message 2018-02-07 14:24:15 +00:00
Henry Oswald
b387ca3b2a change wording on recaptcha to JLM's option 2018-02-07 14:19:33 +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
Shane Kilkelly
a06c4003f9 Merge pull request #312 from sharelatex/sk-add-from-v2-flag-to-analytics 
Add a `fromV2` flag to Analytics events, when coming from V2 instance
 2018-02-07 09:48:11 +00:00
Alberto Fernández Capel
413e81f29a Update analytics manager to use new path 
It fixes a typo in the path.

Related to https://github.com/sharelatex/analytics-sharelatex/pull/43
 2018-02-07 09:39:00 +00:00
Brian Gough
ddf1d6e65e add valid-file directive for front-end 2018-02-06 11:46:50 +00:00
Brian Gough
7f727d434e server side check for valid filenames 2018-02-06 10:44:58 +00:00
Alasdair Smith
e93e055b13 Merge pull request #309 from sharelatex/ja-tags-folders-tweaks 
UX tweaks to tags/folders side bar entry
 2018-02-06 10:36:15 +00:00
Alasdair Smith
e3811d33e9 Merge pull request #302 from sharelatex/msw-history-failure 
Bail out if history API request fails
 2018-02-06 10:35:57 +00:00
Shane Kilkelly
6d8b50efc4 Add a fromV2 flag to Analytics events, when coming from V2 instance 2018-02-06 10:35:15 +00:00
James Allen
fc4ffc3905 Fix typo and file extension in example tex template 2018-02-06 10:27:10 +00:00
James Allen
6a1597560e Remove unused modal templates 2018-02-06 10:16:06 +00:00
James Allen
4f89506afc Make link sharing more prominant 2018-02-06 10:06:32 +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
James Allen
3e5527b826 UX tweaks to tags/folders side bar entry 2018-02-05 17:04:56 +00:00
James Allen
c89bbd7588 Merge pull request #296 from sharelatex/ja-show-v2-message 
Show v2 message if awareOfV2 flag set
 2018-02-02 11:04:06 +00:00
Michael Walker
e886217b85 Bail out if history API request fails 2018-02-02 10:12:54 +00:00
Hayden Faulds
9955fd570c Merge pull request #299 from sharelatex/hof-tpds-locking 
Project Locking: TPDS locking
 2018-02-02 09:20:07 +00:00
Shane Kilkelly
6e2af763ec Revert "Bail out if history API request fails" 2018-02-01 12:49:25 +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
Shane Kilkelly
ba31df3dae Merge pull request #295 from sharelatex/msw-history-failure 
Bail out if history API request fails
 2018-02-01 12:31:30 +00:00
Hayden Faulds
a9be50ebcd stream request to file outside of project lock 2018-02-01 10:44:53 +00:00
Hayden Faulds
e214347ede add locking around project structure updates in TPDS 2018-02-01 10:44:52 +00:00
Brian Gough
c19acd82a4 Merge pull request #291 from sharelatex/bg-fix-project-get-exclusion 
fix typo in project getter exclusions
 2018-01-31 11:51:01 +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
Brian Gough
c652abf739 replace error message with Error object 2018-01-31 10:26:31 +00:00
James Allen
97c0577d8e Merge pull request #293 from sharelatex/ja-allow-sl-login-to-v2 
Show different message if user comes from SL instead of OL v2
 2018-01-31 10:23:22 +00:00
James Allen
de7f13aea6 Use hasFeature for message about returning to v1/SL 2018-01-31 10:05:56 +00:00
James Allen
aa6c16593e Add renamingToName override name for instant apparent renames 2018-01-31 09:42:41 +00:00
Brian Gough
b30dd22f0e return a 400 status code for invalid moves 
was previously returning 500
 2018-01-26 17:00:55 +00:00
James Allen
12e55fb487 Show v2 message if awareOfV2 flag set 2018-01-26 16:44:14 +00:00
Michael Walker
9303969d7b Bail out if history API request fails 2018-01-26 15:16:37 +00:00
James Allen
7e829f6944 Fix OL v1 URL 2018-01-26 11:32:17 +00:00
Brian Gough
4bac80dfd5 Merge branch 'bg-prevent-duplicate-filenames' of github.com:sharelatex/web-sharelatex-internal into bg-prevent-duplicate-filenames 2018-01-25 17:09:43 +00:00
Brian Gough
aa5d880902 don't update project structure if file not created 2018-01-25 17:09:32 +00:00
Brian Gough
302bbe8893 rename checkElementName to checkValidElementName 2018-01-25 17:09:31 +00:00
Brian Gough
7ba17a8875 only need to load rootFolder from project 2018-01-25 17:09:31 +00:00
Brian Gough
9d74a0a2f0 handle errors normally in addFolder modal 2018-01-25 17:09:31 +00:00
Brian Gough
e183956d16 check for duplicates on move 2018-01-25 17:09:31 +00:00
Brian Gough
e421192b5c check for duplicates on rename 2018-01-25 17:09:31 +00:00
Brian Gough
6e0881f85d check for duplicates in addFolder 2018-01-25 17:09:31 +00:00
Brian Gough
82a9fc97d9 check for duplicates in putElement 2018-01-25 17:09:30 +00:00
James Allen
3ed805a65a Show different message if user comes from SL rather than OL v2 2018-01-24 16:56:51 +00:00
Brian Gough
ec93cedf27 rename checkElementName to checkValidElementName 2018-01-24 10:07:42 +00:00
Brian Gough
2a0b0d3a87 only need to load rootFolder from project 2018-01-24 10:07:42 +00:00
Brian Gough
9b8ce78eb9 handle errors normally in addFolder modal 2018-01-24 10:07:42 +00:00
Brian Gough
4f5a5cb677 check for duplicates on move 2018-01-24 10:07:42 +00:00
Brian Gough
3881eb1d78 check for duplicates on rename 2018-01-24 10:07:42 +00:00
Brian Gough
c6cca79737 check for duplicates in addFolder 2018-01-24 10:07:42 +00:00
Brian Gough
b537747ccd check for duplicates in putElement 2018-01-24 10:07:42 +00:00
Brian Gough
77adb60a8a fix typo in project getter exclusions 2018-01-24 10:06:53 +00:00
Alberto Fernández Capel
4ca71fb379 Do not track anonymous sessions 
And DRY the controller a bit.
 2018-01-23 15:51:10 +00:00
James Allen
a558d05ac6 Only show import modal for owned projects 2018-01-23 15:12:00 +00: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
8714909a9a Build query string with style 2018-01-23 12:47:51 +00:00
James Allen
ce9a1fec87 Revert "Go back to allowing v1 projects to be imported" 2018-01-23 11:49:33 +00:00
James Allen
a5195fcbc3 Merge pull request #285 from sharelatex/hof-modal-success 
Stop import modal button flicker
 2018-01-23 10:35:37 +00:00
James Allen
d5c5d9c204 Merge pull request #268 from sharelatex/as-unsupported-project-error 
Adds UnsupportedBrandError & UnsupportedExportRecordsError types
 2018-01-23 10:30:33 +00:00
James Allen
2fb4059633 Merge pull request #258 from sharelatex/ja-allow-v1-imports 
Go back to allowing v1 projects to be imported
 2018-01-23 10:30:23 +00:00
Alberto Fernández Capel
0bef5531bb Rename editSession -> editingSession 2018-01-23 10:29:11 +00:00
James Allen
a84cc16ce2 Merge pull request #287 from sharelatex/ja-fix-delete-endpoint 
Fix call of UpdateMerger.deleteUpdate in TpdsController.deleteProjectContents
 2018-01-22 16:47:05 +00:00
James Allen
d79d6b4ede Fix call of UpdateMerger.deleteUpdate in TpdsController.deleteProjectContents 2018-01-22 16:25: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
Hayden Faulds
445ed4d604 fix ng-disabled in v1ImportModal 2018-01-18 16:44:32 +00:00
Alasdair Smith
89af8ba123 More renaming 2018-01-18 16:41:26 +00:00
Alasdair Smith
f8a068ee9e Rename to be more explicit about the error 2018-01-18 15:42:32 +00:00
Alasdair Smith
649ca86a75 Add publisher exports error type 2018-01-18 15:41:14 +00:00
Alasdair Smith
f234e84c95 Export error 2018-01-18 12:09:33 +00:00
Alasdair Smith
950ef0cebb Add unsupported project error 2018-01-17 17:50:09 +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
Alasdair Smith
89205092b6 Fix v2 faq link 2018-01-17 11:41:25 +00:00
James Allen
c466025df4 Go back to allowing v1 projects to be imported 2018-01-16 09:40:58 +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
67061154fe Merge pull request #237 from sharelatex/hof-editor-controller-locking 
Project Locking: EditorController
 2018-01-15 14:21:03 +00:00
Timothée Alby
62bc3f947f Merge pull request #257 from sharelatex/ta-remove-proxy-headers 
Remove headers when proxying analytics request
 2018-01-12 15:48:18 +02:00
Hayden Faulds
e781779c24 use LockManager.runWithLock in EditorController 2018-01-12 10:53:36 +00:00
Hayden Faulds
76c7dff33a rename EditorController.replaceFile -> replaceFileWithoutLock 2018-01-12 10:06:18 +00:00
Hayden Faulds
a8818a4149 add locking for EditorController.renameEntity 2018-01-12 10:06:18 +00:00
Tim Alby
7a9d52b0f6 remove all headers when proxying the analytics request 2018-01-11 19:04:41 +02:00
Alberto Fernández-Capel
4dce9e36c3 Merge pull request #251 from sharelatex/fix-group-member-subscription-page 
Fix subscription page for members of a group
 2018-01-11 14:41:31 +00:00
Alberto Fernández-Capel
feaa7c6d3f Merge pull request #242 from sharelatex/rename-entity-bugfix 
Ensure the dirname is not affected when we rename an entity
 2018-01-11 14:41:21 +00:00
James Allen
8edef2f94d Fix next -> callback 2018-01-11 14:11:44 +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
945ef25ef5 Merge pull request #244 from sharelatex/hof-lock-file-upload 
Project Locking: ProjectUploadController
 2018-01-11 08:42:36 +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
Tim Alby
c1febbeb7c run analytics proxy on public API router 2018-01-11 09:34:24 +02:00
Timothée Alby
bdef7b707d Merge pull request #241 from sharelatex/ta-analytics-proxy 
Proxy requests to analytics service
 2018-01-10 15:39:28 +02:00
Timothée Alby
859e03cd4f Merge pull request #234 from sharelatex/hof-remove-unused-method 
remove unused EditorController.getListOfDocPaths
 2018-01-10 15:26:02 +02:00
Tim Alby
08b74c95f5 proxy requests to analytics service 2018-01-10 15:03:14 +02:00
Alberto Fernández Capel
a81b56556f Add test for SubscriptionViewModelBuilder 2018-01-09 17:00:56 +00:00
Hayden Faulds
817840840a use LockManger.runWithLock 2018-01-09 16:37:34 +00:00
Alberto Fernández Capel
6d007bfe74 DRY logic to get subscription from Recurly 
We were making two calls to recurly: one from the SubscriptionController
and another from the SubscriptionViewModelBuilder. This change moves
all the logic to the builder so we only have to do one call.
 2018-01-05 16:32:29 +00:00
Alberto Fernández Capel
79eddcc736 Fix subscription page for members of a group 
For a member of a group LimitationsManager.userHasSubscriptionOrIsGroupMember
doesn't return any subscription, so when the controller tries to
access subscription.recurlySubscription_id there's an error.

SubscriptionViewModelBuilder already knows how to handle the case
in which the user is a member of a group but has not subscription
of their own, so guarding against the crash is enough to fix
the issue.
 2018-01-05 16:28:49 +00:00
James Allen
626e0a16ef Fix acceptance test when overleaf setting not present 2018-01-04 15:49:31 +00:00
James Allen
e58f6cab47 Merge pull request #248 from sharelatex/ja-disable-import-dialog 
Don't show import dialog for projects, just link to v1 editor
 2018-01-04 15:22:48 +00:00
James Allen
692182c784 Show apology message instead of raw binary files 2018-01-04 10:53:49 +00:00
James Allen
967353d080 Update comment to use button for import dialog for a11y 2018-01-03 17:06:51 +00:00
James Allen
bbfcff30fb Enable project history for new projects if enabled in settings 2018-01-03 16:55:33 +00:00
James Allen
f0d7658bdd Don't show import dialog for projects, just link to v1 editor 2018-01-03 16:46:26 +00:00
Paulo Reis
8b9f3268b1 Make plans page consistent with others, fixing header issues. 2018-01-03 13:54:33 +00:00
James Allen
0f1b0be231 Merge pull request #236 from sharelatex/sk-fix-doc-updater-logging 
Change an erroneous `logger.error` to `logger.log`; Fixes #227
 2018-01-03 11:30:46 +00:00
James Allen
7918232757 Merge pull request #240 from sharelatex/pr-v2-styling-fixes 
v2 styling fixes
 2018-01-03 11:30:39 +00:00
James Allen
ada76e820a Merge pull request #238 from sharelatex/as-ol-emails 
v2 themed emails
 2018-01-03 11:30:28 +00:00
James Allen
882286afb1 Merge pull request #245 from sharelatex/as-autocompile-rollout-100 
Increase autocompile rollout to 100%
 2018-01-03 11:30:10 +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
Alasdair Smith
b2d92ea482 Increase autocompile rollout to 100% 2018-01-03 10:01:35 +00:00
Hayden Faulds
fe62db05a0 lock project when uploading a file 2018-01-02 12:43:41 +00:00
Alberto Fernández Capel
bf324b5e04 Ensure the dirname is not affected when we rename an entity 
Fixes https://github.com/sharelatex/web-sharelatex-internal/issues/93
 2017-12-22 14:24:00 +00:00
Paulo Reis
0484b46027 Redundancy. 2017-12-21 13:52:34 +00:00
Paulo Reis
484d34e296 Only render announcements in SL. 2017-12-21 12:57:07 +00:00
Alasdair Smith
1be9e29f35 Switch from button to link to fit better 2017-12-21 11:10:23 +00:00
Alasdair Smith
fb23b30c45 Merge branch 'master' into as-update-v2-copy 2017-12-21 10:57:16 +00:00
Alasdair Smith
0114ed362f Swap out email templates based on brand prefix 2017-12-21 10:26:14 +00:00
Alasdair Smith
1fc527ff48 Fix OL auto-linking styles 2017-12-21 09:59:19 +00:00
Shane Kilkelly
c76bdaa824 Change an erroneous logger.error to logger.log 2017-12-21 09:54:35 +00:00
Alasdair Smith
9657108146 Add OL themed email templates 2017-12-20 17:53:45 +00:00
Alasdair Smith
7f7916f5b1 Clean up whitespace 2017-12-20 17:52:49 +00:00
James Allen
e6281911f0 Add history-file-tree.pug 2017-12-20 16:42:23 +00:00
James Allen
d0fee7e76c Show a file tree of changed paths, so we can work with renamed and deleted files 2017-12-20 16:22:32 +00:00
Paulo Reis
70b755603d Fix empty project list card. 2017-12-20 16:03:12 +00:00
Paulo Reis
cf30cfd923 Create new style for links inside alerts; apply it to the reconnection alert. 2017-12-20 15:39:50 +00:00
Hayden Faulds
8663dba37c remove unused EditorController.getListOfDocPaths 2017-12-20 15:14:56 +00:00
Alasdair Smith
b1f656826e Remove unnecessary & incorrect title 2017-12-20 14:10:05 +00:00
Shane Kilkelly
18ae27fd66 Merge branch 'sk-account-sync' 2017-12-20 14:02:45 +00:00
James Allen
c191ac2e8d Show deleted files in v2 history 2017-12-20 13:59:17 +00:00
Henry Oswald
ec41f984e6 Merge branch 'ho-remove-groove' 2017-12-20 13:37:15 +00:00
Paulo Reis
0a0c6c6c0c Merge branch 'master' into pr-style-v2-chatpane 2017-12-20 09:50:49 +00:00
James Allen
339b7ec14f Merge branch 'ja-allow-importing-without-history' 2017-12-19 15:06:17 +00:00
James Allen
1d89a535a1 Merge pull request #208 from sharelatex/ja-front-end-history 
Add in web front end that supports v2 history; Fixes #168
 2017-12-19 15:00:34 +00:00
James Allen
0a4febfce6 Merge pull request #225 from sharelatex/ho-hash-on-minifiy-only 
only hash the static content when minified is on
 2017-12-19 15:00:15 +00:00
James Allen
e18dc1e41d Merge pull request #214 from sharelatex/hof-version-entity-deletion 
version entity deletion
 2017-12-19 14:59:37 +00:00
James Allen
731cd57250 Make intermediate argument signature clearer 2017-12-19 13:59:06 +00:00
James Allen
5463b608ad Add add{File|Doc}WithoutUpdatingHistory methods to allow importing OL projects with existing history 2017-12-19 13:59:06 +00:00