Brian Gough
207b0d84c7
Merge pull request #1074 from sharelatex/bg-fail-gracefully-on-copy-project-error
...
handle failure in parallel copy
GitOrigin-RevId: 67ad5ab9f31689ef66ea2cce75c99c72bf23df41
2018-10-29 13:57:02 +00:00
Brian Gough
707a258d5b
Merge pull request #1040 from sharelatex/bg-start-history-in-v2-for-old-projects
...
allow creating v2 history for existing project without v2 history
GitOrigin-RevId: 2ccbe55f5c203c37d37be00306de5e265555f909
2018-10-29 13:56:55 +00:00
Timothée Alby
3d94be22b1
Merge pull request #1065 from sharelatex/ta-manage-group-members
...
Manage Group Members
GitOrigin-RevId: f0b120630ded1874dfc0352055633afff0015da9
2018-10-25 15:26:00 +00:00
Timothée Alby
aa549dd0d4
Merge pull request #1063 from sharelatex/ta-remove-add-user-to-group
...
Remove addUserToGroup Action
GitOrigin-RevId: 4f0cbf3dce47ee317b14784402128960a2caffa1
2018-10-25 15:25:55 +00:00
Timothée Alby
edd832b1f2
Merge pull request #1067 from sharelatex/ta-add-missing-mock
...
Add Missing Test Mock
GitOrigin-RevId: 69a08a1a13a72fe180ab11d1001eca424b149d1f
2018-10-25 15:25:44 +00:00
Timothée Alby
b123f830ff
Merge pull request #1042 from sharelatex/ta-user-membership-access
...
User Membership Access Refactor
GitOrigin-RevId: 23e8d342bc4829450625146213ff92cb042550dd
2018-10-24 14:02:55 +00:00
Brian Gough
d75d8ee079
Merge pull request #1035 from sharelatex/bg-fix-github-sync-filetypes
...
check the filetype before syncing file
GitOrigin-RevId: ec1a309e2423c6ff2c73202dcabae610edce4f6e
2018-10-23 13:16:30 +00:00
Simon Detheridge
8b55643f7e
Merge pull request #1030 from sharelatex/spd-bonus-program
...
Implement bonus program
GitOrigin-RevId: a18dd8a916c6f317a11661f106cdb4a2983c4ad8
2018-10-23 11:36:17 +00:00
Paulo Reis
00a489a000
Fetch brand variation details for branded projects; inject details into the editor page front-end.
...
Test brand variation details.
Rename BrandVariationsController to BrandVariationsHandler.
Use the V1 API helper.
Do not swallow errors when fetching brand details for project load.
Fix indentation.
2018-10-19 10:47:02 +01:00
Brian Gough
c6ec31c773
Merge pull request #1024 from sharelatex/bg-avoid-duplicate-project-names
...
avoid duplicate project names for templates and zips
2018-10-18 13:51:05 +01:00
Simon Detheridge
6ad16c9406
Merge pull request #1028 from sharelatex/spd-no-github-for-new-users
...
retry: Don't add old v1 features for new accounts
2018-10-17 14:51:46 +01:00
Hugh O'Brien
3b766bf523
Merge pull request #1015 from sharelatex/pr-create-projects-with-brand-variation-id
...
Create projects with brand variation id
2018-10-16 11:17:09 +01:00
Hugh O'Brien
876663f94b
Merge pull request #1006 from sharelatex/hb-v2-affiliations-callback
...
Add affiliations on university domain confirmation
2018-10-16 11:17:01 +01:00
Simon Detheridge
0f54bc2c52
Add additional tests for V1SubscriptionManager
...
One call was not returning the v1Id correctly. These tests check for that case. Also added some more generic tests for the v1 API call.
bug: overleaf/sharelatex#1014
2018-10-16 10:15:42 +01:00
Simon Detheridge
6fc6c44605
Don't add old v1 features for new accounts
...
Introduces the notion of v1 'grandfathered features', specifically Gihub and Mendeley integration. This allows us to create new v1 accounts for new users without them automatically getting the new features.
Requires a settings change in `settings.web.sl.coffee` to disable these features by default for v1 accounts.
bug: overleaf/sharelatex#1014
2018-10-16 09:45:16 +01:00
Simon Detheridge
ec9c38df57
Revert "Don't add old v1 features for new accounts"
2018-10-15 17:46:48 +01:00
Simon Detheridge
85f097343f
Merge pull request #1022 from sharelatex/spd-no-github-for-new-users
...
Don't add old v1 features for new accounts
2018-10-15 15:28:34 +01:00
Tim Alby
e646c5c42a
refactor to use config file
2018-10-15 14:46:38 +02:00
Brian Gough
a640397052
make project names unique for zip uploads and template imports
2018-10-15 09:33:39 +01:00
Brian Gough
59cf0aa3cb
fix bug in call to findAllUsersProjects
2018-10-15 09:33:39 +01:00
Simon Detheridge
48995d2d44
Don't add old v1 features for new accounts
...
Introduces the notion of v1 'grandfathered features', specifically Gihub and Mendeley integration. This allows us to create new v1 accounts for new users without them automatically getting the new features.
Requires a settings change in `settings.web.sl.coffee` to disable these features by default for v1 accounts.
bug: overleaf/sharelatex#1014
2018-10-12 17:45:57 +01:00
Hugh O'Brien
b825f0b267
Merge branch 'master' into hb-v2-affiliations-callback
2018-10-11 17:14:35 +01:00
Paulo Reis
b0802380ae
Update tests
2018-10-10 14:09:47 +01:00
Paulo Reis
901fb0fc1e
Unit test brand variation id.
2018-10-10 14:09:47 +01:00
Simon Detheridge
ea2782ff22
Merge pull request #1005 from sharelatex/spd-no-more-asterisks
...
Sanitize paths in all relevant ProjectEntityHandler methods
2018-10-10 10:44:13 +01:00
Tim Alby
48e5c6b523
add UserMembership logic
2018-10-09 12:09:11 +01:00
Brian Gough
a68bde819d
Merge pull request #1004 from sharelatex/ta-test-mock-fix
...
Fix Test Mock
2018-10-09 10:35:50 +01:00
Simon Detheridge
56dcbefb5b
Check for safe paths in all ProjectEntityHandler methods
...
Some import mechanisms (for example, Github project import) call methods such as 'upsert*' directly, bypassing existing filename checks.
Added checks to all methods in ProjectEntityHandler that can create or rename a file.
bug: overleaf/sharelatex#908
Signed-off-by: Simon Detheridge <s@sd.ai>
2018-10-08 15:31:04 +01:00
Simon Detheridge
e66210d2af
Add method to sanitize full paths
...
For convenience, add a method to SafePath to break a path into components and verify the status of each one.
bug: overleaf/sharelatex#908
Signed-off-by: Simon Detheridge <s@sd.ai>
2018-10-08 14:48:17 +01:00
hugh-obrien
f6307f9086
store reversedHostname property and update test accordingly
2018-10-08 13:37:12 +01:00
hugh-obrien
3919acad46
store reversed hostname and review fixes for v2 university domain confirmation
2018-10-08 12:08:29 +01:00
Alasdair Smith
e129172553
Fix ordering of boolean check to be more readable
2018-10-08 11:25:24 +01:00
Alasdair Smith
1ef947b1fe
Fix tests after refactoring register validation
2018-10-08 10:44:25 +01:00
Hugh O'Brien
cc962c3e6f
Merge pull request #978 from sharelatex/hb-use-exports-for-pdf-from-publish-modal
...
Generic Zip or Pdf Exports endpoint
2018-10-08 10:13:18 +01:00
hugh-obrien
65ecdf84f4
cleanup and tests for v2 affiliations confirmation
2018-10-07 16:40:26 +01:00
Tim Alby
c00a0a435d
remove console.log in tests
2018-10-05 16:24:28 +01:00
Tim Alby
7b4b75b51a
fix incorrect or missing test mocks
2018-10-05 16:24:05 +01:00
Shane Kilkelly
70b56d0362
Fix up acceptance tests
2018-10-04 15:05:40 +01:00
Shane Kilkelly
2ef23194df
WIP: trying to get acceptance tests to pass
2018-10-04 15:05:40 +01:00
Shane Kilkelly
f9ed367148
Move the auth mechanism for sudo-mode into SudoModeHandler
2018-10-04 15:05:40 +01:00
Ersun Warncke
752658f773
Merge pull request #990 from sharelatex/ew-use-v1-doc-info-api
...
Use v1 Doc Info API for Token Access
2018-10-03 09:22:41 -04:00
Timothée Alby
c74c782cee
Merge pull request #961 from sharelatex/ta-account-sync-affiliations
...
Add getInstitutionsPlan Function
2018-10-03 14:19:56 +01:00
Brian Gough
2b738907aa
Merge pull request #989 from sharelatex/bg-clean-up-broken-project-on-error
...
clean up broken project on error in ProjectDuplicator
2018-10-03 10:04:30 +01:00
Ersun Warncke
642b45d0d6
use v1 doc info api
2018-10-02 11:16:46 -04:00
Brian Gough
4621234220
clean up broken project on error in ProjectDuplicator
2018-10-02 12:14:22 +01:00
Alasdair Smith
1330c8da73
Also check if v1 project exported if not found for read-only tokens
2018-09-28 11:47:14 +01:00
Alasdair Smith
435fe11115
Check if v1 project was exported if not found
...
This prevents a redirect loop for projects which were exported but then
deleted on v2. v2 would not find the project, redirect to v1, which
would find that it was exported and redirect back to v2.
2018-09-28 11:47:14 +01:00
Brian Gough
6d5908f2f4
Merge pull request #893 from sharelatex/ja-fix-duplicate-text-in-email
...
Don't include the license name twice in invite emails
2018-09-28 11:15:40 +01:00
Brian Gough
1f6abd4e69
fix invalid project names when opening templates
2018-09-28 10:38:25 +01:00
Brian Gough
6b80d3563d
add support for creating unique project names
2018-09-28 09:48:15 +01:00
hugh-obrien
52859cdfaa
make the zip fetching endpoint for exports generic to either zips or pdfs
2018-09-27 16:11:11 +01:00
Alasdair Smith
4f2c91a59a
Add new redirect option to auth with v1, which will urlencode the query string
...
This is necessary for the GET /docs endpoint, which can be used to send
urls as part of query parameters. If these are not encoded before
redirecting, they can become corrupted.
2018-09-27 12:19:16 +01:00
Ersun Warncke
a23f0a3d15
fix test failure from merge
2018-09-25 08:54:01 -04:00
Ersun Warncke
7b90fcb186
Merge pull request #969 from sharelatex/ew-check-doc-token-access
...
check access for doc on read only token
2018-09-25 08:35:56 -04:00
Ersun Warncke
eeed857dd9
change api path
2018-09-25 06:45:27 -04:00
Ersun Warncke
f0c0834b0f
only do v1 access check when api config present
2018-09-25 05:42:04 -04:00
James Allen
e2f90ba01a
Merge pull request #966 from sharelatex/as-no-project-token-based
...
Redirect logged out users to v1 if project is not found from token based url
2018-09-25 10:25:30 +01:00
Alasdair Smith
298ee2dbb4
Fix v1 return to path
2018-09-25 10:06:24 +01:00
Alasdair Smith
da16e8d01f
Add acceptance test for unimported read only token
2018-09-25 09:43:39 +01:00
Alasdair Smith
ca895ae1b1
Redirect to v1 via sign in link
2018-09-25 09:37:22 +01:00
Brian Gough
89ba3912c0
Merge pull request #964 from sharelatex/csh-issue-963-MultipleProjectDownloads
...
Replace ShareLaTeX with Overleaf in name of multiple project download file
2018-09-25 09:33:53 +01:00
Brian Gough
5947294016
Merge branch 'bg-support-main-file-for-templates'
2018-09-25 09:32:14 +01:00
Brian Gough
0d4143205d
strip quotes from mainFile
2018-09-25 09:05:49 +01:00
Ersun Warncke
f89e85231a
check access for doc on read only token
2018-09-24 18:03:28 -04:00
Alasdair Smith
d6350c963e
Remove projectExists flag from higher access check
...
Now that find project by read and read/write token methods check whether
the project exists, it is not neccessary to check whether the project
exists in the higher access check. Therefore it has been removed
2018-09-24 19:00:10 +01:00
Alasdair Smith
99dec02266
If no project found for read/write token, redirect to v1
2018-09-24 19:00:10 +01:00
Alasdair Smith
237810509a
If no project found for read token, redirect to v1
2018-09-24 19:00:10 +01:00
Christopher Hoskin
5c35cc9593
Replace ShareLaTeX with Overleaf in name of multiple project download file ( Closes : #963 )
2018-09-24 16:33:54 +01:00
Brian Gough
418bc10a18
allow getting doc paths by project id
2018-09-24 16:04:23 +01:00
Brian Gough
5954e45016
add missing require
2018-09-24 15:44:09 +01:00
Brian Gough
2692090f3f
support a mainFile parameter for templates
2018-09-24 15:27:16 +01:00
Tim Alby
51c5228288
add getInstitutionsPlan function
2018-09-24 13:16:31 +01:00
hugh-obrien
c0b32f031e
force gallery items to use legacy OL v1 texlive image
2018-09-24 10:49:01 +01:00
Shane Kilkelly
7d5bd74c43
Enable legacy login for tests
2018-09-24 08:34:50 +01:00
Shane Kilkelly
eff7b4d59e
Add the enableLegacyRegistration option to acceptance test settings
2018-09-20 15:34:14 +01:00
Hugh O'Brien
b377b89447
Merge pull request #933 from sharelatex/bg-avoid-exception-for-no-emails
...
fix exception when user has no emails field
2018-09-19 11:33:03 +01:00
Brian Gough
02854274a7
2018-09-18 14:09:05 +01:00
Timothée Alby
b16cffe587
Merge pull request #932 from sharelatex/as-redirect-query-string
...
Support passing through query params in redirects
2018-09-18 12:35:21 +01:00
Timothée Alby
b6925647ef
Merge pull request #922 from sharelatex/ta-forbid-null-query
...
Prevent Calls to UserGetter.getUser with Null Query
2018-09-18 12:24:19 +01:00
Alasdair Smith
7e358ab318
Support passing through query params
2018-09-18 11:34:04 +01:00
hugh-obrien
39f580d6ba
fixing broken exports test
2018-09-18 10:13:33 +01:00
James Allen
15103ac894
Support the same URL with multiple methods in redirects
2018-09-17 15:38:58 +01:00
James Allen
83a1039b7e
Add acceptance tests for RedirectManager
2018-09-17 15:38:58 +01:00
James Allen
40f08d1592
Add additional functionality to RedirectManager
2018-09-17 15:38:45 +01:00
Alasdair Smith
42cef8e393
Merge pull request #920 from sharelatex/mm-gallery-exports
...
Add gallery fields to export controller and handler
2018-09-17 09:42:26 +01:00
Alasdair Smith
e1e7091f30
Merge pull request #905 from sharelatex/as-project-intelligent-redirect
...
Intelligently redirect to v1 if no v2 project found
2018-09-17 09:40:52 +01:00
Tim Alby
41b92d4647
prevent calls to UserGetter.getUser with null query
2018-09-14 12:46:00 +01:00
Michael Mazour
10fcdd6daf
Add optional gallery fields to export request
...
Support the optional (well, gallery-only) fields `title`, `description`, `author`, `license`, and `show_source` in export requests.
2018-09-14 11:02:51 +01:00
Tim Alby
0051e59309
remove unused call to UserGetter.getUser
2018-09-13 17:39:30 +01:00
James Allen
ef11161ddb
Revert "Record and show last modified by user for projects"
2018-09-13 14:00:30 +01:00
Michael Mazour
1f976a0e04
Improve ExportsController unit tests
...
Test the params the handler's called with.
2018-09-13 12:24:03 +01:00
Alasdair Smith
8a969d1c25
Redirect directly from controller instead of via handler
2018-09-13 12:09:19 +01:00
Alasdair Smith
0c658127ef
Add tests for ProjectNotTokenAccessError
2018-09-13 12:09:19 +01:00
Alasdair Smith
893e2dd235
Add test for location of redirect to v1
2018-09-13 12:09:19 +01:00
Alasdair Smith
cf8ae7c28c
Add test for redirecting to v1 if project unimported
2018-09-13 12:09:19 +01:00
James Allen
ab10336110
Record last update time and user from project-history
2018-09-13 10:38:52 +01:00
Hugh O'Brien
24c479e984
Merge pull request #885 from sharelatex/hb-ip-matcher-notifications
...
IP matcher affiliation CTA notifications
2018-09-13 08:59:25 +01:00
Ersun Warncke
7d3e17651f
set options and method for request, pass cookies and form body
2018-09-10 06:10:36 -04:00
Ersun Warncke
dd056e36ae
add overleaf method
2018-09-10 06:10:36 -04:00
hugh-obrien
8ef90a0dcb
move call for creating ip matched notifcation to project controller
2018-09-05 15:40:59 +01:00
Tim Alby
9ec60a128a
add userHasSubscriptionOrIsGroupMember alias
2018-09-05 11:37:37 +01:00
hugh-obrien
23e6292fd7
updating tests for ip matcher logic
2018-09-05 11:22:26 +01:00
hugh-obrien
de83df2703
adding tests for ip matching notifications
2018-09-05 11:22:25 +01:00
James Allen
24f60bf791
Don't include the license name twice in invite emails
2018-09-05 11:05:38 +01:00
Shane Kilkelly
d432b6799f
Merge pull request #888 from sharelatex/ta-v1-subscription-check-fix
...
Don't Regard v1 Teams as Paid Subscriptions
2018-09-05 10:22:46 +01:00
Ersun Warncke
e4e6a0fa1b
add new tag methods
2018-09-03 10:40:28 -04:00
Tim Alby
3324796086
don't regard v1 teams as paid subscriptions
...
- use `userHasV1Subscription` instead of `userHasV1SubscriptionOrTeam` in `LimitationsManager.userHasSubscriptionOrIsGroupMember `
- remove `userHasV1SubscriptionOrTeam`
- rename `LimitationsManager.userHasSubscriptionOrIsGroupMember` to `LimitationsManager.hasPaidSubscription`
- rename some variables for clarity
2018-09-03 15:09:57 +01:00
James Allen
52381c8fb7
Merge pull request #851 from sharelatex/jel-remove-a-b-test
...
Remove Plans and Pricing A/B Test
2018-08-30 15:19:56 +01:00
Paulo Jorge Reis
cb4d4145a1
Merge pull request #855 from sharelatex/pr-v2-light-theme
...
v2 light theme
2018-08-30 11:24:52 +01:00
Ersun Warncke
9feb8ef39f
Revert "Merge pull request #843 from sharelatex/ew-collabratec"
...
This reverts commit 223beab491d2f8dcf4c7285267fda355cfce3f05, reversing
changes made to a726537c4372641bfca0eb37fc130ca3a932d433.
2018-08-29 12:00:53 -04:00
Ersun Warncke
afc22dc5c2
Revert "Merge pull request #790 from sharelatex/ew-add-cookie-and-form-to-proxy"
...
This reverts commit ebefc2f28c6e88bbfa632f2b22cb8b99b75e95ec, reversing
changes made to 223beab491d2f8dcf4c7285267fda355cfce3f05.
2018-08-29 12:00:20 -04:00
Ersun Warncke
e7eefc0474
Merge pull request #790 from sharelatex/ew-add-cookie-and-form-to-proxy
...
set options and method for request, pass cookies and form body
2018-08-29 10:17:21 -04:00
Ersun Warncke
c1859f3e80
Merge pull request #843 from sharelatex/ew-collabratec
2018-08-29 10:17:02 -04:00
Jessica Lawshe
8889f2aed2
Remove Plans and Pricing A/B Test
...
Remove all layouts, analytics events, and scope related to the A/B test.
The group modal from the default layout of the A/B test should be maintained though for v2.
2018-08-28 12:42:09 -05:00
Paulo Reis
76fcee721e
Update unit tests.
2018-08-28 14:24:05 +01:00
Paulo Reis
efc926ffc5
Load theme as a user setting; allow the user to change it; update tests.
2018-08-27 15:25:00 +01:00
Tim Alby
ef37902dfc
check institution confirmation status
2018-08-27 15:45:31 +02:00
Hugh O'Brien
29253c5a93
Merge branch 'master' into hb-fetch-licences-graph
2018-08-23 16:11:43 +01:00
Tim Alby
753fb02c05
always return an array when getting affiliations
2018-08-23 15:15:53 +02:00
Paulo Jorge Reis
d838f8778a
Merge pull request #832 from sharelatex/pr-change-free-history-limits
...
Change history limits for free users
2018-08-23 14:02:08 +01:00
Ersun Warncke
8f21ab7f10
add overleaf method
2018-08-22 13:44:40 -04:00
hugh-obrien
8d72fc78fc
send licences graph request to v1 for data instead of analytics
2018-08-22 18:31:29 +01:00
Hugh O'Brien
eeadd1e9bb
Merge pull request #797 from sharelatex/hb-inform-v1-affiliation-confirms
...
Tell v1 confirmation status of affiliation emails
2018-08-22 08:34:33 +01:00
Paulo Reis
54e0a7cfd2
Merge branch 'master' into pr-change-free-history-limits
2018-08-21 11:23:28 +01:00
Alasdair Smith
d99a42e678
Merge pull request #824 from sharelatex/as-redirect-sl-login-to-v2-login
...
Allow for redirection of unlinked SL account to /user/login_to_ol_v2
2018-08-21 10:13:52 +01:00
Paulo Reis
4dee3fd5e1
Update frontend unit tests.
2018-08-20 17:02:55 +01:00
Tim Alby
8d6505b518
log institutions API errors
2018-08-17 17:48:00 +02:00
Tim Alby
f5513f36ca
add param to skip affiliation creation on user create
2018-08-17 17:48:00 +02:00
Alasdair Smith
9bc3fa2df0
Pass req to preDoPassportLogin module hook
2018-08-17 12:04:05 +01:00
hugh-obrien
96ffeef73d
send fixed confirmed date to v1 for affiliations
2018-08-16 13:50:34 +01:00
hugh-obrien
55597b9279
inform v1 when confirming affiliation emails
2018-08-16 13:50:34 +01:00
Paulo Reis
713a39171a
Fix history frontend tests.
2018-08-16 13:44:48 +01:00
Henry Oswald
5ed95694da
Merge pull request #801 from sharelatex/ho-mailchimp
...
Add non checked checkbox for newsletter subscription on signup and use mailchimp as newsletter provider.
2018-08-16 11:40:39 +01:00
Brian Gough
c2828c8ca5
add unit tests
2018-08-13 10:53:43 +01:00
Tim Alby
197e7ce8ab
refactor institutions getter
2018-08-10 13:40:25 +02:00
James Allen
69e8eddff0
Merge pull request #796 from sharelatex/pr-history-labels-ui
...
History labels UI
2018-08-09 10:50:28 +01:00
James Allen
9cbb51bbbc
Merge pull request #793 from sharelatex/sk-sl-login-v2
...
If we're creating v1 accounts, don't allow login for users already linked up
2018-08-08 15:51:25 +01:00
Henry Oswald
687637eec7
change email address in newsletter when changing default email
...
put mongo_id into mailchimp merge fields
2018-08-08 13:50:03 +01:00
Henry Oswald
6cf1f71604
add newsletter checkbox to user register forms
2018-08-06 17:43:03 +01:00
Brian Gough
efcd3577ce
avoid clobbering imported image names
2018-08-06 16:56:44 +01:00
Shane Kilkelly
05df55c89e
Add a unit test for the preDoPassportLogin
module hook.
2018-08-03 16:10:50 +01:00
Shane Kilkelly
d8c9a96619
If we're creating v1 accounts, don't allow login for users already linked up
2018-08-03 14:58:29 +01:00
Paulo Reis
80eeaaaaea
Update web acceptance tests.
2018-08-02 17:19:16 +01:00
Hugh O'Brien
22b664da1a
Merge pull request #792 from sharelatex/hb-fetch-export-zips
...
Fetch export zips
2018-08-02 13:50:11 +01:00
hugh-obrien
395406407e
add test for export fetch zip
2018-07-30 19:39:35 +01:00
Ersun Warncke
426c391153
set options and method for request, pass cookies and form body
2018-07-27 10:43:03 -04:00
Michael Mazour
ddbe1a5b22
Add compiler and imageName to export API request
2018-07-27 15:42:37 +01:00
Tim Alby
66bcdbcac9
institution upgrade
2018-07-26 13:01:44 +02:00
Tim Alby
63c7f756ce
refactor into InstitutionsAPI
2018-07-26 13:01:42 +02:00
James Allen
7dc82597e1
Merge pull request #765 from sharelatex/ja-update-email-in-v1
...
Update email in v1 when setting as default in v2
2018-07-26 10:58:57 +01:00