Commit graph

7180 commits

Author SHA1 Message Date
Henry Oswald
e79501340c fix router issue where ClsiCookieManager isn't calling a function to set
the backend
2018-07-23 16:05:26 +01:00
Alberto Fernández-Capel
13950e12f6 Merge pull request #774 from sharelatex/revert-750-hof-labels
Revert "add v2 history labels endpoints"
2018-07-20 15:35:17 +01:00
Alberto Fernández-Capel
f260f42466 Revert "add v2 history labels endpoints" 2018-07-20 12:39:01 +01:00
Alberto Fernández-Capel
da632c3117 Merge pull request #750 from sharelatex/hof-labels
add v2 history labels endpoints
2018-07-20 11:07:29 +01:00
Hugh O'Brien
37a7d24d77 Merge pull request #773 from sharelatex/hb-submit-button-wrap
Fixing button wrapping in the publish modal
2018-07-19 11:40:07 +01:00
Henry Oswald
413721ebf9 look at more chars for if the server is in dark mode
v2-dark.overleaf.com also needs to be marked as dark
2018-07-18 13:49:53 +01:00
Alasdair Smith
dec103d582 Merge pull request #761 from sharelatex/as-remove-rt-feature-flag
Prepare rich text for deploy
2018-07-18 11:08:53 +01:00
hugh-obrien
ef0532a54b replace wrapping button with new class name 2018-07-18 10:47:39 +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
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
e7e391392c Merge pull request #753 from sharelatex/jel-blog-mathjax
Add MathJax support to blog
2018-07-17 09:37:08 -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
Alberto Fernández Capel
93a9a98858 Merge remote-tracking branch 'origin/afc-multiple-managers' 2018-07-17 10:12:12 +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
Alberto Fernández-Capel
4fbf0be161 Merge pull request #718 from sharelatex/afc-multiple-managers-queries
Use the manager_ids array to query for subscriptions
2018-07-17 10:04:56 +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
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
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
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