Alberto Fernández Capel
0bf807fa9f
Remove SubscriptionLocator.getManagedSubscription
...
It was used as a kind of access control check, but it's clearer
if the check is in the only controller that actually needs it.
2018-07-13 11:47:26 +01:00
Alberto Fernández Capel
46a1cdc510
Use the admin_ids array to query for subscriptions
2018-07-13 09:38:58 +01:00
Alberto Fernández Capel
abcfa0b0d2
Store manager ids in an array
2018-07-12 16:35:27 +01:00
Hayden Faulds
71351476f7
Merge pull request #743 from sharelatex/hof-github-jenkins
...
Update github commit status in Jenkins pipeline
2018-07-12 16:18:39 +01:00
Hayden Faulds
99ec132a1f
update commit statuses in Jenkins pipeline
2018-07-12 15:40:42 +01:00
Alasdair Smith
2100633ea1
Merge pull request #748 from sharelatex/as-rt-review-panel-warning
...
Show warning in review panel when using rich text mode
2018-07-12 11:30:29 +01:00
Alasdair Smith
5b7ad8f8d8
Merge pull request #740 from sharelatex/as-save-editor-mode
...
Initialise editor mode from localStorage
2018-07-12 11:30:10 +01:00
Alasdair Smith
d33c7f0149
Use string key to initialise editor mode instead of boolean
2018-07-12 10:55:27 +01:00
Alasdair Smith
25b995d3b8
Initialise editor mode from localStorage
2018-07-12 10:55:27 +01:00
Alasdair Smith
dc56ffb8a6
Improve copy
2018-07-11 15:22:20 +01:00
Alasdair Smith
3806d2bda7
Add right margin to toolbar if review panel open
...
This fixes bug where the toolbar would be measured incorrectly if the
review panel was open
2018-07-11 15:15:23 +01:00
Alasdair Smith
b1a47ddae4
Improve copy
2018-07-11 15:15:22 +01:00
Alasdair Smith
b4dd047371
Fix unnecessary right marging being applied to review panel when rich text is open
2018-07-11 15:15:22 +01:00
Alasdair Smith
538aba323a
Add first pass at unsupported message and style
2018-07-11 15:15:22 +01:00
Alasdair Smith
00c089448e
Add review panel unsupported message
2018-07-11 15:15:22 +01:00
Alasdair Smith
9d81cf20f9
Add new unsupported class to control visibility while rich text is open
2018-07-11 15:15:22 +01:00
Hayden Faulds
5616a91a9b
strip whitespace
2018-07-11 13:58:18 +01:00
Alberto Fernández-Capel
27ef84eb1e
Merge pull request #741 from sharelatex/ja-speed-up-acceptance-tests
...
Speed up acceptance tests and run tests in parallel in CI
2018-07-11 13:50:07 +01:00
Alberto Fernández-Capel
14dd6e12fc
Merge pull request #742 from sharelatex/afc-use-subscription-id
...
Pass the subscription id in methods that modify a subscription
2018-07-11 13:46:02 +01:00
Alberto Fernández Capel
40c1f67561
Check that the subscription is a group before exporting it to csv
...
I removed this check by mistake, just taking it back.
2018-07-11 12:10:43 +01:00
Alberto Fernández Capel
3586fe8406
Update var name
2018-07-11 11:50:14 +01:00
Alberto Fernández Capel
4e8185d369
Use the id in methods that modify a subscription
...
This will make it easier to allow a user to manage multiple
groups.
2018-07-11 09:56:36 +01:00
Timothée Alby
05bc4cc9e9
Merge pull request #729 from sharelatex/as-cursor-position
...
Abstract cursor position tracking so that it is not bound to Ace
2018-07-11 10:21:42 +02:00
Timothée Alby
0f7c0de05d
Merge pull request #738 from sharelatex/as-fix-memory-leak
...
Fix memory leak setting up spell check
2018-07-11 10:21:26 +02:00
Timothée Alby
467a910d74
Merge pull request #737 from sharelatex/ta-affiliation-features
...
Check Institution Licence on Features Update
2018-07-11 10:20:29 +02:00
Tim Alby
791dc0df5b
check institution features on features update
2018-07-10 17:53:37 +02:00
James Allen
dc724eae92
Try with parallel tests
2018-07-10 16:42:52 +01:00
James Allen
ba17c1da14
Cache pug templates and modules, by using production environment
2018-07-10 16:15:50 +01:00
Alasdair Smith
5806101bd0
Trigger events instead of calling cursor manager
...
This improves readability and prevents race conditions in compat
between Ace/CM
2018-07-10 16:05:01 +01:00
Alasdair Smith
da77c06774
Refactor saving cursor position to not use Ace event
...
This is will help with triggering CM correctly
2018-07-10 16:05:01 +01:00
Alasdair Smith
ba9fa9a0be
Store first visible line instead of scrollTop
...
scrollTop is affected by changing viewport size and switching between
Ace and CM
2018-07-10 16:05:01 +01:00
Alasdair Smith
6c7e942470
Unbind unload listener when destroying editor
2018-07-10 16:05:01 +01:00
Alasdair Smith
e5ad2a8724
Abstract Ace-specific code to adapter
2018-07-10 16:05:01 +01:00
Alasdair Smith
2dc509f43d
Fix memory leak setting up spell check
...
Switching docs would set up event listeners on Ace without tearing down
any old listeners, which could lead to a memory leak. This tears down
old listeners when detaching from the "old" doc
2018-07-10 12:25:13 +01:00
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
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
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
Tim Alby
b78212290a
handle dynamic Proxy URLs
2018-07-06 12:03:47 +02: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
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
