Commit graph

7605 commits

Author SHA1 Message Date
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
85999bbbec Merge pull request #762 from sharelatex/afc-fix-domain-team-invites
Fix domain licences invites
2018-07-16 15:16:24 +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
2d43de20bf Merge pull request #715 from sharelatex/afc-multiple-managers
Store team managers in an array
2018-07-16 09:59:29 +01:00
James Allen
a5b943d5b6 Merge pull request #752 from sharelatex/ja-confirmation-ui-and-reconfirm
Show confirmation status in email UI, with button to resend confirmation
2018-07-16 09:58:11 +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
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
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
hugh-obrien
367b16a3ab removes checking params for submit modal 2018-07-11 16:36:03 +01:00