Paulo Reis
307a98851d
Nest the overall theme property under ace.
2018-08-28 10:10:16 +01:00
Paulo Reis
64c29787c0
Add i18n; update the review icon image.
2018-08-27 15:57:51 +01:00
Paulo Reis
efc926ffc5
Load theme as a user setting; allow the user to change it; update tests.
2018-08-27 15:25:00 +01:00
Paulo Reis
2491bee38e
Merge branch 'master' into pr-v2-light-theme
2018-08-24 12:11:16 +01:00
Paulo Reis
7c95de29cd
Avoid breaking the page if isnt set.
2018-08-24 12:06:26 +01:00
Hugh O'Brien
29253c5a93
Merge branch 'master' into hb-fetch-licences-graph
2018-08-23 16:11:43 +01:00
hugh-obrien
bd721d52f4
review fixes and moving licences endpoint to module
2018-08-23 14:39:48 +01:00
Tim Alby
753fb02c05
always return an array when getting affiliations
2018-08-23 15:15:53 +02:00
Paulo Jorge Reis
d838f8778a
Merge pull request #832 from sharelatex/pr-change-free-history-limits
...
Change history limits for free users
2018-08-23 14:02:08 +01:00
hugh-obrien
8d72fc78fc
send licences graph request to v1 for data instead of analytics
2018-08-22 18:31:29 +01:00
Henry Oswald
ab1848d0ae
Add a trusted filter for iframe downloads ( #836 )
...
* add trusted helper to iframe downloads
2018-08-22 14:47:15 +01:00
Paulo Reis
a15706ce24
Merge branch 'master' into pr-v2-light-theme
2018-08-22 11:19:01 +01:00
Hugh O'Brien
eeadd1e9bb
Merge pull request #797 from sharelatex/hb-inform-v1-affiliation-confirms
...
Tell v1 confirmation status of affiliation emails
2018-08-22 08:34:33 +01:00
Jessica Lawshe
484d7acbc8
Merge pull request #817 from sharelatex/jel-mixins
...
Add a mixin for FAQ search and move links mixin file
2018-08-21 11:44:30 -05:00
Jessica Lawshe
b145ca5d5c
Merge pull request #791 from sharelatex/jel-pagination
...
Add pagination mixin and color variables
2018-08-21 11:44:15 -05:00
Paulo Reis
54e0a7cfd2
Merge branch 'master' into pr-change-free-history-limits
2018-08-21 11:23:28 +01:00
Henry Oswald
473063cf3d
set rclient.expire for server ttl even when there is no server id
2018-08-21 10:36:18 +01:00
Alasdair Smith
d99a42e678
Merge pull request #824 from sharelatex/as-redirect-sl-login-to-v2-login
...
Allow for redirection of unlinked SL account to /user/login_to_ol_v2
2018-08-21 10:13:52 +01:00
Jessica Lawshe
09efced352
Add pagination mixin and color variables
2018-08-20 09:25:33 -05:00
Paulo Jorge Reis
53a9a174a2
Merge pull request #821 from sharelatex/as-account-deletion-note
...
Add message about deleting SL account affecting v2 account
2018-08-20 13:58:50 +01:00
Jessica Lawshe
45cc278acb
Add FAQ search mixin
2018-08-17 16:31:06 -05:00
Jessica Lawshe
f8b85cb848
Move link mixins to mixins folder
2018-08-17 16:12:24 -05:00
Timothée Alby
9d3e649710
Merge pull request #825 from sharelatex/ta-skip-affiliation-on-create
...
Skip Affiliation on Create
2018-08-17 17:50:17 +02:00
Tim Alby
8d6505b518
log institutions API errors
2018-08-17 17:48:00 +02:00
Tim Alby
f5513f36ca
add param to skip affiliation creation on user create
2018-08-17 17:48:00 +02:00
Jessica Lawshe
5b5ece37a5
Handle sixpack timeouts and include variant in metabase segmentation
...
Render default when sixpack timesout
Only convert when variant exists
Use Angular cookies module to add variant cookie, which is used on the new subscription page.
2018-08-17 10:29:45 -05:00
Paulo Reis
96aa418b94
Show upgrade prompts when the free history limit is hit.
2018-08-17 16:04:31 +01:00
Paulo Reis
fc424aee9e
Adapt styles to avoid layout breaking/showing options that do not make sense when no history entries are loaded.
2018-08-17 15:31:59 +01:00
Alasdair Smith
9bc3fa2df0
Pass req to preDoPassportLogin module hook
2018-08-17 12:04:05 +01:00
Alasdair Smith
b9e63421a8
Merge pull request #814 from sharelatex/as-fix-delete-modal-copy
...
Fix delete wording on archive modal
2018-08-16 16:33:30 +01:00
Alasdair Smith
38689dbb1d
Merge pull request #802 from sharelatex/as-sl-redirect
...
Add feature flag for redirecting SL to v2
2018-08-16 16:32:55 +01:00
Alasdair Smith
3b31125a62
Add message about deleting account affecting v2
...
Only show on SL and if the user has linked accounts
2018-08-16 14:11:43 +01:00
hugh-obrien
96ffeef73d
send fixed confirmed date to v1 for affiliations
2018-08-16 13:50:34 +01:00
hugh-obrien
55597b9279
inform v1 when confirming affiliation emails
2018-08-16 13:50:34 +01:00
Paulo Reis
02701a996d
Merge branch 'master' into pr-history-labels-part-2
2018-08-16 11:56:36 +01:00
Paulo Reis
652be9efe6
Slightly adapt the markup for the generic history error.
2018-08-16 11:41:19 +01:00
Henry Oswald
5ed95694da
Merge pull request #801 from sharelatex/ho-mailchimp
...
Add non checked checkbox for newsletter subscription on signup and use mailchimp as newsletter provider.
2018-08-16 11:40:39 +01:00
Paulo Reis
23bb866988
Show an error message when history fails to load updates.
2018-08-16 11:26:34 +01:00
Henry Oswald
1e1f26b350
Merge pull request #818 from sharelatex/ho-backendgroup-config
...
configure backend group name via config files
2018-08-16 10:37:14 +01:00
Henry Oswald
af6e7758d3
configure backend group name via config files
2018-08-15 15:26:22 +01:00
Alasdair Smith
985344c0d7
Use redirect setting instead of re-using setting that coincidentally would be flipped on the same day
2018-08-15 15:22:06 +01:00
Alasdair Smith
fc0b9df14c
Add feature flag for redirecting SL to v2
2018-08-15 15:22:05 +01:00
Jessica Lawshe
2c9977d26e
Add analytics to link mixins
2018-08-14 12:06:28 -05:00
Jessica Lawshe
cf532b93d8
Merge pull request #784 from sharelatex/jel-portals
...
Add styling and mixins for portals
2018-08-14 12:00:36 -05:00
Timothée Alby
5e488dcab7
Merge pull request #813 from sharelatex/ta-enable-affiliations-ui
...
Enable Affiliations UI
2018-08-14 16:40:35 +02:00
Paulo Reis
663ca275cb
Add i18n.
2018-08-13 17:09:18 +01:00
Alasdair Smith
bd94e55ce9
Handle archive and leave action
2018-08-13 14:25:38 +01:00
Alasdair Smith
009c5c363b
Also fix modal body for archiving projects
2018-08-13 14:25:38 +01:00
Alasdair Smith
5836c029c8
Show archive heading if archiving and on OL
2018-08-13 14:25:38 +01:00
Alasdair Smith
274ac8b1ba
Another fix
2018-08-13 14:25:38 +01:00
