Commit Graph

2105 Commits

Author SHA1 Message Date
James Allen b4a5e5a041 Tidy up HistoryV2Manager 2017-12-19 13:58:47 +00:00
James Allen 8a3fadbfc1 Style the edit/add/rename options 2017-12-19 13:58:47 +00:00
James Allen 50b12e88a2 Add HistoryV2Manager alongside existing HistoryManager 2017-12-19 13:58:47 +00:00
James Allen 8ea779af58 Add some front end tests for HistoryManager 2017-12-19 13:58:47 +00:00
James Allen 4691a6e85c Get diffs showing in client 2017-12-19 13:58:47 +00:00
James Allen a1615e6d84 Prototype of requesting history information by doc path, while tracking renames 2017-12-19 13:58:47 +00:00
Alasdair Smith f3342f327d Merge pull request #202 from sharelatex/as-v2-upgrade-redirect
Use V1 trial page on V2 instead of legacy SL
2017-12-19 10:07:08 +00:00
Alasdair Smith da2c0b3fea Switch redirectToOLFreeTrialUrl to calculate trial url
Sending unnecessary query params to OL seems like a footgun, so switch to
compromise that is more explicit but doesn't send unnecessary query params
2017-12-14 17:09:11 +00:00
Alasdair Smith 7322522323 Use freeTrialBaseUrl instead of potentially fragile v1BaseUrl 2017-12-14 17:05:12 +00:00
Henry Oswald cbf656518f remove versioned files from fingerprinting 2017-12-14 11:24:47 +00:00
Henry Oswald 490c56c692 libs -> libraries
don't use hash in non minjs version
2017-12-13 17:15:44 +00:00
Alasdair Smith b7a43d95e0 Remove unused method, now handled by FreeTrialModalController 2017-12-13 15:55:32 +00:00
Alasdair Smith e7992e65e4 Merge branch 'master' into as-v2-upgrade-redirect 2017-12-13 14:45:51 +00:00
Alasdair Smith 4c81cd874f Remove unnecessary method - handled by FreeTrialModalController 2017-12-13 11:09:46 +00:00
Alasdair Smith f5c914ed6c When upgrading track changes on V2, redirect to V1 trial page 2017-12-11 18:03:09 +00:00
Paulo Reis 59e675797e Merge branch 'master' into pr-style-v2-resizers 2017-12-11 15:55:50 +00:00
Paulo Reis 0652fc62a0 Configure resizer cursors for v2. 2017-12-11 15:33:00 +00:00
James Allen de484e1a08 Remove unused reference to e 2017-12-11 13:31:16 +00:00
James Allen 53dc8cddfc Refactor captcha into middleware and angular service 2017-12-11 12:58:55 +00:00
James Allen 69499847e4 Refactor front end code into validateCaptcha service 2017-12-11 12:32:43 +00:00
James Allen 83086e4a79 Add recaptch to share endpoint 2017-12-11 11:57:59 +00:00
Paulo Reis 7c5a7880b0 Merge branch 'master' into pr-style-v2-resizers 2017-12-06 15:49:18 +00:00
Nate Stemen 9bf5d1e14c removing labels service 2017-12-05 13:57:36 -05:00
Paulo Reis 9fda8e62fa Merge branch 'pr-style-v2-resizers' of github.com:sharelatex/web-sharelatex-internal into pr-style-v2-resizers 2017-12-04 13:48:52 +00:00
Paulo Reis fd852004fe Refactor synctex controls z-index handling. 2017-12-04 12:25:40 +00:00
James Allen 0602fed6e5 Merge branch 'master' into as-import-v1 2017-12-04 10:02:21 +00:00
James Allen 158b0d56cf Merge branch 'master' into pr-style-v2-resizers 2017-12-04 10:01:45 +00:00
Henry Oswald c020e4e6bd moment and fineuploader are loaded seperately in editor, not packaged up 2017-12-02 12:29:06 +00:00
Shane Kilkelly 2ea3caf08b Properly version the fineuploader library 2017-12-01 11:22:41 +00:00
Paulo Reis 3a959cccfd Use custom chat resizer values. 2017-11-30 15:24:48 +00:00
Paulo Reis 826f49b9a4 Add default resizer values to layout directive. 2017-11-30 15:24:39 +00:00
Alasdair Smith 6eae1d59ea Use asyncForm directive to trigger import 2017-11-30 10:16:15 +00:00
Alasdair Smith 265e659999 Add multiple steps 2017-11-30 10:16:15 +00:00
Alasdair Smith 958e4cad9b Fix wrong controller 2017-11-30 10:16:15 +00:00
Alasdair Smith b68d6411ee Basic styles for import modal 2017-11-30 10:16:15 +00:00
Alasdair Smith 0e11668a61 Change v1 project link to button which opens import modal 2017-11-30 10:16:15 +00:00
Alasdair Smith cbba7c38df Add basic v1 import modal template & controller 2017-11-30 10:16:15 +00:00
Nate Stemen c2bb8b9f89 removing calls 2017-11-29 13:30:53 -05:00
Nate Stemen 74ba7402de Merge branch 'ns-file-completer' 2017-11-29 09:20:09 -05:00
Shane Kilkelly 8b5115ff03 Merge branch 'sk-update-fineuploader' 2017-11-29 09:41:14 +00:00
Nate Stemen 26df9bca05 Merge pull request #136 from sharelatex/ns-autocomplete-bugs
fixing popup and code folding issues
2017-11-28 10:28:54 -05:00
Nate Stemen 2a50a18d23 Merge branch 'ns-package-aware-autocomplete' 2017-11-28 10:24:37 -05:00
Nate Stemen 8ef48925c1 Merge pull request #71 from sharelatex/ns-package-completer
fixing package completer
2017-11-28 08:56:49 -05:00
Shane Kilkelly 661041a35d Use template elements for file uploaders, and i18n 2017-11-27 12:06:18 +00:00
Alasdair Smith e61b82c452 Remove unused link sharing rollout, but keep onboarding popup 2017-11-22 17:07:50 +00:00
Shane Kilkelly 57d0bab354 Remove commented out code, and un-used button 2017-11-22 17:00:30 +00:00
Shane Kilkelly c8cbdfd3cb Use the configured 'processing' text 2017-11-22 16:50:21 +00:00
Alasdair Smith 6f8b0c6e87 Revert "Remove old unused link sharing onboarding"
This reverts commit 66a0a7ff8b5b5081d86df333429cb0455221c81a.
2017-11-22 16:46:16 +00:00
Nate Stemen ac9e27713d changing allowed file types 2017-11-22 11:25:02 -05:00
Alasdair Smith de3b9d6a49 Remove old unused link sharing onboarding 2017-11-22 16:09:32 +00:00