Commit graph

6949 commits

Author SHA1 Message Date
Shane Kilkelly
943bfe98aa Unit test for _loginAsyncHandlers 2018-07-18 11:13:42 +01:00
hugh-obrien
ef0532a54b replace wrapping button with new class name 2018-07-18 10:47:39 +01:00
Shane Kilkelly
dae9506f84 Un-break unit tests 2018-07-18 09:57:05 +01:00
hugh-obrien
00bf50906d fixing button wrapping in the publish modal 2018-07-18 09:54:52 +01:00
Alasdair Smith
d36d3f2a0e Actually enable rich text 2018-07-18 09:26:03 +01:00
Alasdair Smith
ffe3bc2977 Switch review panel to use richTextEnabled variable 2018-07-18 09:26:03 +01:00
Alasdair Smith
62f69a4bcd Fix case sensitivity 2018-07-18 09:26:03 +01:00
Alasdair Smith
823e12e4a8 Fix tests to add new Features dependency 2018-07-18 09:26:03 +01:00
Alasdair Smith
9cd3f32365 Use hasFeature function instead of new standalone function 2018-07-18 09:26:03 +01:00
Alasdair Smith
85313f1b5a Check if rich text is enabled before using stored mode 2018-07-18 09:26:03 +01:00
Alasdair Smith
4202b9c717 Use hard-coded feature flag for rich text 2018-07-18 09:26:03 +01:00
Alasdair Smith
fff8e37bc7 Merge pull request #772 from sharelatex/as-fix-review-panel-style
Fix rich text toolbar throwing off track changes underlines
2018-07-18 08:43:11 +01:00
Alasdair Smith
1e7911adaf Merge pull request #767 from sharelatex/as-fix-rt-delete-itemize
Fix left padding on empty nested list environments
2018-07-18 08:43:01 +01:00
Alasdair Smith
fba0cd04f5 Fix TC underlines being offset because review panel above editor toolbar 2018-07-17 17:34:09 +01:00
Shane Kilkelly
299de369e5 Refactor the way logins are finished off and sessions established 2018-07-17 16:27:24 +01:00
Jessica Lawshe
b9a63fe216 Merge pull request #768 from sharelatex/jel-mathjax-wiki
Add MathJax to wiki pages and max-width for images
2018-07-17 09:37:28 -05:00
Jessica Lawshe
fa2f703c44 Define CMS module controller 2018-07-17 09:36:21 -05:00
Jessica Lawshe
6c9403df0f Merge pull request #758 from sharelatex/jel-mathjax-delimiter
Optional $ MathJax delimiter
2018-07-17 09:32:43 -05:00
Jessica Lawshe
64a257dae2 Merge pull request #708 from sharelatex/jel-mathjax
MathJax - library path, directive, and use `Safe` extension
2018-07-17 09:32:06 -05:00
Jessica Lawshe
83b3904fca Set max-width on Wiki images
Fixes images expanding outside of parent container
2018-07-17 09:10:03 -05:00
Jessica Lawshe
ddca090cd7 Add Wiki controller with MathJax directive 2018-07-17 09:09:07 -05:00
Alasdair Smith
8f4c5d6122 Fix left padding on empty nested list environments 2018-07-17 11:53:42 +01:00
James Allen
c2777918fa Add some missing unit test mocks 2018-07-17 11:26:07 +01:00
James Allen
4435eab423 Update affiliations UI to show specific errors for conflicting emails 2018-07-17 11:12:47 +01:00
James Allen
2c25cbaf25 Update error handling on backend 2018-07-17 11:12:09 +01:00
Alberto Fernández-Capel
e7738b851d Merge pull request #764 from sharelatex/afc-import-managers
Import managers
2018-07-17 10:10:51 +01:00
Alberto Fernández-Capel
5821d2c981 Merge pull request #755 from sharelatex/afc-import-team-names
Import team names
2018-07-17 10:05:38 +01:00
James Allen
ca97698724 Handle v1 response when email is already in use 2018-07-16 17:27:01 +01:00
Hayden Faulds
f6def039bf code review feedback 2018-07-16 16:06:17 +01:00
Hayden Faulds
04bb83f3de add v2 history labels endpoints 2018-07-16 16:06:17 +01:00
James Allen
1bb266c6dc Merge pull request #760 from sharelatex/as-fix-rt-indent
Fix list envs not indented correctly
2018-07-16 15:18:10 +01:00
Alberto Fernández Capel
66b492ba5f Use id to find subscription
It's the new method signature.
2018-07-16 14:42:41 +01:00
Alberto Fernández Capel
ae440f2ee6 Better variable name in test
It should be a subscription id, instead of an admin id. The test passes
anyway because the db calls are mocked, but the wrong variable name
can cause confusion.
2018-07-16 14:40:53 +01:00
James Allen
d0f77abc70 Update email in v1 when setting default in v2 2018-07-16 13:26:52 +01:00
Alasdair Smith
ea2a229050 Add line padding to indented padding
Fixes bug where itemize and enumerate envs weren't correctly indented
2018-07-16 11:28:53 +01:00
Alberto Fernández-Capel
f08b64eeac Merge pull request #757 from sharelatex/as-rt-styling
Rich text styling
2018-07-16 10:10:49 +01:00
James Allen
b150a7b4ae Merge pull request #735 from sharelatex/pr-affiliations-ui-adjustments
Affiliations UI, second round
2018-07-16 10:08:47 +01:00
Alberto Fernández Capel
a72dec4b6e Merge remote-tracking branch 'origin/master' into afc-multiple-managers 2018-07-16 09:45:11 +01:00
Jessica Lawshe
120acf4918 Optional $ MathJax delimiter 2018-07-13 15:02:52 -05:00
Alasdair Smith
5013d13587 Reduce box-shadow slightly to look better with horizontal padding 2018-07-13 16:30:42 +01:00
Alasdair Smith
304eac3024 Deemphasise line numbers in rich text 2018-07-13 15:57:43 +01:00
Alasdair Smith
4d611ca399 Add horizontal padding to RT lines
This is to emulate a manusript better
2018-07-13 15:57:18 +01:00
Alasdair Smith
f95fb38056 Switch to serif font for rich text
Makes rich text ressemble a manuscript more closely
2018-07-13 15:13:22 +01:00
Shane Kilkelly
b4f8108277 Move the pre-login async code into a helper function 2018-07-13 11:51:11 +01:00
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
James Allen
a238c74440 Remove inline style 2018-07-13 11:19:49 +01:00
Alasdair Smith
b00cad19ff Merge pull request #751 from sharelatex/as-fix-loading-toolbar
Fix bug where loading panel was showing over toolbar
2018-07-13 11:17:46 +01:00
Alasdair Smith
ca31914719 Merge pull request #754 from sharelatex/as-fix-missing-key-binds
Add event to trigger syncToPdf so can be triggered by key bind
2018-07-13 11:17:17 +01:00
James Allen
452d698a47 ng-show -> ng-if 2018-07-13 11:17:05 +01:00
Alberto Fernández Capel
79ada88b13 Add team name to subscription model 2018-07-13 11:15:58 +01:00
James Allen
476f4e55c3 Just generate a new token on resending confirmation email 2018-07-13 10:42:31 +01:00
Alberto Fernández Capel
46a1cdc510 Use the admin_ids array to query for subscriptions 2018-07-13 09:38:58 +01:00
Alasdair Smith
5eb2410f5d Add event to trigger syncToPdf so can be triggered by key bind 2018-07-13 09:18:28 +01:00
James Allen
d7e0b8c369 Show unconfirmed email status in UI and add link to resend confirmation 2018-07-12 17:13:26 +01:00
James Allen
33b28db061 Add backend endpoint for resending confirmation email 2018-07-12 16:39:04 +01:00
Paulo Reis
67e2f6f942 Better handling of affiliation change submission. 2018-07-12 16:37:09 +01:00
Paulo Reis
59008b4a51 Show university custom departments when changing affiliations; fix Features typo. 2018-07-12 16:37:09 +01:00
Paulo Reis
a759828ece Update feature flag for affiliations; use it in the router; minor style adjustments. 2018-07-12 16:37:09 +01:00
Paulo Reis
85cf518457 Avoid showing the email input when viewing the full affiliations UI; disable affiliations when using SAML and LDAP authentication strategies. 2018-07-12 16:37:09 +01:00
Paulo Reis
c817094a2d Add i18n keys; minor style adjustments. 2018-07-12 16:37:09 +01:00
Paulo Reis
4d1b6c6ba8 Add error handling. 2018-07-12 16:37:09 +01:00
Paulo Reis
c630c5d952 Preemptively remove front-end data when removing user emails. 2018-07-12 16:37:09 +01:00
Paulo Reis
19b57571bf Basic affiliation change implementation. 2018-07-12 16:37:08 +01:00
Paulo Reis
a64910d409 Make sure to specify which email to set as default. 2018-07-12 16:37:08 +01:00
Paulo Reis
1514e5e071 Isolate affiliations form in a component. 2018-07-12 16:37:08 +01:00
Paulo Reis
3517db8348 SL styling adjustments. 2018-07-12 16:37:08 +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
ba6560ce04 Fix bug where loading panel was showing over toolbar 2018-07-12 11:18:09 +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
Tim Alby
35cb3924e2 refresh features after confirming email 2018-07-11 14:57:35 +02: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
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
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
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