Commit graph

2231 commits

Author SHA1 Message Date
Paulo Reis
637c492e6e Merge branch 'master' into pr-v2-history-ui 2018-05-30 11:24:33 +01:00
Timothée Alby
6db3bf59a6 Merge pull request #586 from sharelatex/ta-refactor-user-getter
Canonical Way to Get Users by Email
2018-05-29 17:56:59 +02:00
Timothée Alby
eeff32bf4f Merge pull request #584 from sharelatex/ta-remove-deprecated-method
Remove getUserOrCreateHoldingAccount Function
2018-05-29 17:56:42 +02:00
Jessica Lawshe
85ee5a36c8 Merge pull request #587 from sharelatex/jel-contact
Move contact form to modules
2018-05-29 09:20:05 -05:00
Tim Alby
5fbe5c5537 remove UserLocator
Use UserGetter instead
2018-05-28 14:11:13 +02:00
Tim Alby
bbaca91e57 add UserGetter#getUserByMainEmail
Use only that method to find users by email.
2018-05-28 14:11:09 +02:00
Tim Alby
5a590aa021 remove getUserOrCreateHoldingAccount function
The function is deprecated
2018-05-28 14:09:13 +02:00
Jessica Lawshe
868083676f Move contact form 2018-05-25 08:50:38 -05:00
Hayden Faulds
29f7ce0bbf Merge pull request #576 from sharelatex/mm-handle-export-error
Handle error in ExportsController
2018-05-25 13:22:18 +01:00
James Allen
7bcd285bb1 Add Dropbox test for Front widget too 2018-05-24 09:51:29 +01:00
James Allen
1d0be569a6 Fix SubscriptionUpdater -> FeaturesUpdater miscall 2018-05-22 10:05:08 +01:00
James Allen
50bd60dd51 Split FeaturesUpdater out of SubscriptionUpdater 2018-05-22 10:05:08 +01:00
James Allen
0830c473ad Update unit tests and refactor to make more testable 2018-05-22 10:05:08 +01:00
James Allen
4deaf7865d Guard against no apis.v1 setting 2018-05-22 10:05:08 +01:00
James Allen
b1f378208d Properly merge subscriptions from different places 2018-05-22 10:05:08 +01:00
Paulo Reis
2a52eab8d6 Proxy history filetree requests through web. 2018-05-21 15:10:46 +01:00
Hugh O'Brien
346f37011f Merge pull request #546 from sharelatex/ns-allow-latexmkrc
Allow for latexmkrc files in project zip upload
2018-05-21 09:03:40 +01:00
Michael Mazour
19e07485bc Handle error in ExportsController 2018-05-18 15:08:33 +01:00
Hugh O'Brien
24b4f9c46f Merge pull request #436 from sharelatex/mm-project-export
Project exports spike
2018-05-18 10:31:15 +01:00
James Allen
e7a4aeaf79 Merge pull request #560 from sharelatex/ja-enable-v2-for-all
Enable the v2 banner for everyone if showV2Banner is set
2018-05-17 11:55:21 +01:00
Michael Mazour
e34dd90a1f Add project export route and controller 2018-05-16 14:58:34 +01:00
Michael Mazour
a661084485 Add ExportsHander for project exports performed via v1 2018-05-16 14:58:34 +01:00
Shane Kilkelly
06c0b45ef7 Merge branch 'master' into sk-fix-references-full-index 2018-05-14 13:45:12 +01:00
Shane Kilkelly
43d00a2e5f Account for the new referencesSearch flag when deciding to do fullIndex 2018-05-14 11:31:59 +01:00
Hayden Faulds
3fb3daaee7 Merge pull request #529 from sharelatex/sk-remove-templates-from-v2
Add `templates` to the `Features.hasFeature` function
2018-05-14 10:57:28 +01:00
James Allen
58b5d67bdd Enable the v2 banner for everyone if showV2Banner is set 2018-05-14 10:29:42 +01:00
Nate Stemen
d108b11bc0 Add latexmkrc in FileTypeManager 2018-05-10 16:59:58 -04:00
James Allen
dee96920b0 Allow font family and line height to be user configurable 2018-05-10 18:03:54 +01:00
Hayden Faulds
9ccdf073c4 accept attributes rather than projectHistoryId to ProjectCreationHandler 2018-05-10 11:39:23 +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
Brian Gough
2bb2d9615f added comment about using a project entity iterator 2018-05-08 13:37:33 +01:00
Brian Gough
f34ce5b12b rename _updateProjectStructure to _updateProjectStructureWithDeletedEntity 2018-05-08 13:37:33 +01:00
Brian Gough
1278e2da45 fix project structure version when deleting folder 2018-05-08 13:37:33 +01:00
Brian Gough
24764f66ff Merge pull request #544 from sharelatex/bg-add-lockvalue-to-lockmanager
improve locking in web
2018-05-08 11:11:32 +01:00
Hugh O'Brien
57f07fb5fe Merge pull request #518 from sharelatex/hob-publish-modal-qs
Publish modal accessible from query string
2018-05-08 09:40:41 +01:00
Brian Gough
afd4a10a19 retry lock with exponential backoff 2018-05-04 15:02:36 +01:00
James Allen
1aadd7d369 Configure line height and font family separately for v2 2018-05-04 14:05:20 +01:00
Brian Gough
e414100c41 add support for unique lock values 2018-05-04 13:22:33 +01:00
Hayden Faulds
ba0e06d0fe add V1HistoryNotSyncedError 2018-05-02 13:18:43 +01:00
Shane Kilkelly
af70ef0dc4 Add templates to the hasFeature function 2018-05-01 14:01:52 +01:00
James Allen
4c7364fd01 Merge pull request #503 from sharelatex/ja-reorder-compile-rate-limits
Re-order compile rate limits
2018-05-01 08:48:22 +01:00
James Allen
d454be8053 Bring down proportion to 10% 2018-04-30 17:19:21 +01:00
James Allen
6399621d1f Show front widget for paid and sampled free users 2018-04-30 17:13:57 +01:00
hugh-obrien
157efa6d96 make publish modal accessible from query string 2018-04-27 15:50:11 +01:00
Alasdair Smith
ad1df3532f Merge pull request #490 from sharelatex/hof-deleted-project-history
Pass project history id with updates
2018-04-23 10:05:07 +01:00
James Allen
d9a7b1248a Re-order compile rate limits to do project/user check before everyone check 2018-04-17 14:43:54 +01:00
James Allen
9e525702c1 Merge branch 'master' into ja-restore-files 2018-04-16 16:14:31 +01:00
Alasdair Smith
3af10733cc Replace hard coded rich text hashed file path with registration system 2018-04-16 14:14:49 +01:00
Hayden Faulds
7755a7cc1f add overleaf to projections for project structure updates 2018-04-13 13:45:07 +01:00
Hayden Faulds
9ef40902ca send projectHistoryId with resync requests 2018-04-13 13:45:03 +01:00