Commit graph

17886 commits

Author SHA1 Message Date
James Allen
91079f3af2 Fix unit tests 2018-07-10 11:32:19 +01:00
James Allen
5bdaf8fb5a Merge pull request #736 from sharelatex/ja-delete-sub-on-expiry
Delete a subscription on expiry, rather than set personal plan code
2018-07-10 11:27:51 +01:00
James Allen
cb449f4b75 Delete a subscription on expiry, rather than set personal plan code 2018-07-10 10:31:25 +01:00
Paulo Reis
2ef1b4904d Bootstrap the light theme. 2018-07-09 15:45:09 +01:00
Michael Mazour
836ff145b8 Populate S3 settings from environment variable 2018-07-06 16:09:27 +01:00
Michael Mazour
c14476c0c1 Add endpoint for arbitrary bucket fetch
Add `/bucket/:bucket/key/*`, which fetches the file from the given bucket at the given path. Uses auth stored at `settings.filestore.s3.{{bucketName}}` if present, and otherwise default auth.
2018-07-06 16:09:27 +01:00
Hayden Faulds
158cb58e29 Merge pull request #734 from sharelatex/sk-handle-403-linked-files
When refreshing or creating linked files, exempt from 403-error-catcher
2018-07-06 15:09:28 +01:00
Christopher Hoskin
12bfe122b9 Use our experimental metrics 2018-07-06 15:08:38 +01:00
Christopher Hoskin
06e8450694 Allow remote statsd to be specified by environment variable 2018-07-06 13:57:52 +01:00
Shane Kilkelly
b6880550d5 When refreshing or creating linked files, exempt from 403-error-catcher 2018-07-06 11:29:21 +01:00
James Allen
2ba78179f5 fix linting 2018-07-06 11:17:57 +01:00
James Allen
f5ea7f2d77 Merge pull request #730 from sharelatex/sk-handle-orphaned-mendeley-linked-files
Add a new error type to LinkedFiles: FileCannotRefreshError
2018-07-06 11:06:51 +01:00
James Allen
7a1bb30952 Merge pull request #699 from sharelatex/ja-fix-bonus-feature-allocation
Don't consider current features when assigning bonus
2018-07-06 11:06:34 +01:00
James Allen
2016be6be4 Merge pull request #691 from sharelatex/ja-resync-subscriptions-script
Add script that refreshes all v1 users' features in v2
2018-07-06 11:06:23 +01:00
James Allen
dad4bad9eb Merge pull request #700 from sharelatex/ew-fix-undefined-last-name
fix undefined last name
2018-07-06 11:06:12 +01:00
James Allen
f756ea5944 Merge pull request #727 from sharelatex/ta-proxy-trailing-id
Proxy Dynamic Paths
2018-07-06 11:06:04 +01:00
Michael Mazour
c4e3f9eb02 Amend: tests for populating S3 settings from environment variable 2018-07-06 11:05:40 +01:00
Michael Mazour
3e1ef3af63 Populate S3 settings from environment variable 2018-07-06 11:05:19 +01:00
Tim Alby
b78212290a handle dynamic Proxy URLs 2018-07-06 12:03:47 +02:00
Michael Mazour
2da15f2eb3 Amend - improve documentation of settings 2018-07-06 10:28:02 +01:00
James Allen
a5a2efd3b3 Merge pull request #32 from sharelatex/hof-fix-tk-in-tests
move tk call to before sandboxed module call
2018-07-06 09:29:37 +01:00
Michael Mazour
7feafccf31 Amend: safely navigate to bucket credentials 2018-07-06 09:28:09 +01:00
Michael Mazour
03033409c6 Amend: remove unused params 2018-07-06 09:12:59 +01:00
James Allen
b902821c07 Return blank features, not default features if no bonuses 2018-07-06 09:09:41 +01:00
James Allen
a54a69159a Revert "Add in option to sync all users" - too dangerous!
This reverts commit 218e042aba6784f32777f496e1706300845c3f44.
2018-07-06 09:07:55 +01:00
Henry Oswald
6825285b02 added maint down endpoint 2018-07-05 15:07:07 +01:00
Timothée Alby
4ffc097804 Merge pull request #726 from sharelatex/ta-affiliate-on-create
Infer Affiliation for New Users
2018-07-05 16:06:06 +02:00
Tim Alby
cfd5c65be4 add affiliation before confirming email 2018-07-05 16:02:55 +02:00
Tim Alby
9d4df4271a try adding affiliation on user creation 2018-07-05 16:01:15 +02:00
Timothée Alby
cc837236b4 Merge pull request #728 from sharelatex/ta-endorse-affiliation
Add Endpoint to Endorse Affiliation
2018-07-05 16:00:47 +02:00
Tim Alby
3e1d61438f add endpoint to endorse affiliation 2018-07-05 15:59:36 +02:00
Timothée Alby
08aab38470 Merge pull request #725 from sharelatex/ta-disable-emails-endpoint
Disable Emails Endpoint when externalAuthenticationSystemUsed is True
2018-07-05 15:57:31 +02:00
Timothée Alby
958012533d Merge pull request #724 from sharelatex/ta-parse-email
parse email in UserUpdater
2018-07-05 15:57:20 +02:00
Shane Kilkelly
f125a755bf Add a new error type to LinkedFiles: FileCannotRefreshError 2018-07-05 12:13:07 +01:00
Hugh O'Brien
a230b5efab Merge pull request #720 from sharelatex/mm-export-v1projectid
Include project's and user's v1 ID in export requests
2018-07-05 12:12:35 +01:00
Hugh O'Brien
3a33fef42c Merge pull request #722 from sharelatex/hb-publish-layout-updates
Add border-radius to overbox on submit modal
2018-07-05 12:12:15 +01:00
Alasdair Smith
cf92783a1b Merge pull request #690 from sharelatex/as-autocomplete
Autocomplete
2018-07-05 09:43:37 +01:00
Michael Mazour
336a38ec1e Amend: scrub secrets from logs
Calls to `getFile` can now include S3 credentials in `opts`, so sanitize before writing to opts to log.
2018-07-04 16:41:31 +01:00
Michael Mazour
600ab3ce67 Amend: remove problematic ampersand 2018-07-04 16:39:41 +01:00
Alasdair Smith
b2abcfc3f2 Extract debounced load to service, so can be injected 2018-07-04 15:14:29 +01:00
Alasdair Smith
1f9c1ca6c6 Extracts envs to separate file so they can be exported to rich text 2018-07-04 15:14:29 +01:00
Alasdair Smith
33742d447d Move top hundred snippets to snippets directory
Allows for more snippets in future. Also makes file name consistent
2018-07-04 15:14:29 +01:00
Alasdair Smith
88dd233624 Add stylesheet for CodeMirror autocomplete 2018-07-04 15:14:29 +01:00
Tim Alby
3581aa3ccb disable emails endpoint when externalAuthenticationSystemUsed is true 2018-07-04 15:19:15 +02:00
Shane Kilkelly
0777e44abf Merge branch 'sk-linked-files-mendeley' 2018-07-04 12:16:39 +01:00
Michael Mazour
cfbf0d81ba Amend: fix params retrieval 2018-07-04 12:11:09 +01:00
Michael Mazour
ece650741a Amend per several review comments
- Removed unused vars
- Label the metric with the bucket name
2018-07-04 12:02:09 +01:00
Michael Mazour
feca8933f1 Add endpoint for arbitrary bucket fetch
Add `/bucket/:bucket/key/*`, which fetches the file from the given bucket at the given path. Uses auth stored at `settings.filestore.s3.{{bucketName}}` if present, and otherwise default auth.
2018-07-04 11:22:36 +01:00
Shane Kilkelly
b32c9be8ca Linked files from Mendeley. 2018-07-04 10:05:03 +01:00
Tim Alby
3a541307b4 parse email in UserUpdater 2018-07-03 20:59:38 +02:00