James Allen
140f97eb20
Merge pull request #1107 from sharelatex/ja-purchase-groups
...
Purchase group/team accounts directly via app
GitOrigin-RevId: 1a502878753de77758fb431f45a6366f199f1cb0
2018-11-13 13:50:46 +00:00
Chrystal Maria Griffiths
f1c8dcdf1e
Merge pull request #1127 from sharelatex/as-keep-tags-archive
...
Keep tags when archiving project
GitOrigin-RevId: 40b23895ef27a69500194cfc149a236ae615f271
2018-11-13 10:54:18 +00:00
Chrystal Maria Griffiths
afbeec3b02
Merge pull request #1099 from sharelatex/ta-management-ui-title
...
Management UI Wording Tweaks
GitOrigin-RevId: 9e1a8990f226e1fda423f6fa6efa25cf3b924544
2018-11-13 10:53:56 +00:00
Chrystal Maria Griffiths
6ea0b9cf46
Merge pull request #1097 from sharelatex/hb-fix-institutions-callbacks
...
Fix multiple callback and silent failures on institutions controller
GitOrigin-RevId: 2883445a4d960e7aca2dfbab45b8e268437e4769
2018-11-13 10:53:50 +00:00
Ersun Warncke
de4f1a5abd
Merge pull request #1126 from sharelatex/mm-ensure-valid-rootdoc
...
Ensure project's root doc is valid before exporting
GitOrigin-RevId: 6f15955015097df9464267f458b8dbb126c22173
2018-11-09 08:26:24 +00:00
Jessica Lawshe
a18176b2fa
Merge pull request #1128 from sharelatex/jel-add-user-to-team-db-op
...
Change database operator to add user to team
GitOrigin-RevId: 0bf23c1f8958f74fa00a97559ebbf03e4edadfa6
2018-11-08 16:11:58 +00:00
Paulo Jorge Reis
49388c868b
Merge pull request #1093 from sharelatex/pr-editor-cobranding-ui
...
Editor cobranding UI
GitOrigin-RevId: c6d5fabc23f9105388faeb037d96545bf574f4d5
2018-11-07 11:43:31 +00:00
Brian Gough
2ea0644cfa
Merge pull request #1082 from sharelatex/bg-fix-backslash-on-v1-and-template-import
...
fix backslash on v1 and template import
GitOrigin-RevId: 8410a80a06ef48610f7b18f4556bd073253d4eb7
2018-11-06 08:33:00 +00:00
Jessica Lawshe
49acb719db
Merge pull request #1102 from sharelatex/mm-ensure-history-before-export
...
Ensure project has history before exporting
GitOrigin-RevId: 688131fbbca1cd339433d3b9be57a03a32303b3e
2018-11-01 17:48:09 +00:00
Ersun Warncke
365158f283
Merge pull request #1047 from sharelatex/ew-oauth-authorization
...
add oauth middlewear
GitOrigin-RevId: b68360763e1060fdbcbb4348d3d691a803fbfa41
2018-10-30 18:31:47 +00:00
Timothée Alby
c32a891cc8
Merge pull request #1077 from sharelatex/ta-create-institution
...
Create Institution When Confirming New Domain
GitOrigin-RevId: c0f5f0edde558eed744e813d6edccfc1f5acf8f0
2018-10-30 14:38:11 +00:00
Timothée Alby
92582fdc38
Merge pull request #1076 from sharelatex/ta-ui-error-handling
...
Management UI Error Handling
GitOrigin-RevId: a0567b5d54af3a8ca31f7e124c0c2d2d8d26b647
2018-10-30 14:37:59 +00:00
Simon Detheridge
1a9bb5f4eb
Merge pull request #1088 from sharelatex/ta-fix-entity-id-scope
...
Fix Scope Bug in Group Access Control
GitOrigin-RevId: 7d2cb5fc08e0c7e4bd1b70c03b62620bb7dd8d41
2018-10-30 10:16:25 +00:00
Douglas Lovell
b1bda995a6
Merge branch 'deploy-20181029a'
...
GitOrigin-RevId: c51d4da706319564bd31514370fe13413655b6cf
2018-10-29 15:01:41 +00:00
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