Paulo Reis
a15706ce24
Merge branch 'master' into pr-v2-light-theme
2018-08-22 11:19:01 +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
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
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
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
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
Alasdair Smith
db16fad6c9
Fix
2018-08-13 14:25:38 +01:00
Alasdair Smith
085c2529d9
Inject isOverleaf setting globally
2018-08-13 14:25:38 +01:00
Tim Alby
bfb2f636cd
enable affiliations UI
2018-08-13 14:59:39 +02:00
Paulo Reis
2ee42af1de
Change strategy to store selected label; improve the history toolbar layout to accomodate larger labels; fix issues with layout not being updated when changing history view modes.
2018-08-13 13:39:25 +01:00
Brian Gough
19dfe5fc8b
intial version of user setting for texlive imageName
2018-08-13 10:53:43 +01:00
Alasdair Smith
d7a341f59b
Merge pull request #808 from sharelatex/ta-import-affiliations
...
Allow confirmed_at date to be specified
2018-08-13 09:47:10 +01:00
Alasdair Smith
4e484912bb
Merge pull request #804 from sharelatex/as-update-project-import-modal
...
Update copy in v1 import modal now that more features are supported
2018-08-13 09:46:18 +01:00
James Allen
0f8fe53bc9
Allow confirmed_at date to be specified
2018-08-10 17:48:43 +02:00
Paulo Reis
a5c6f81573
Merge branch 'master' into pr-history-labels-part-2
2018-08-10 15:57:32 +01:00
Tim Alby
197e7ce8ab
refactor institutions getter
2018-08-10 13:40:25 +02:00
Paulo Reis
7e86218b21
Allow multiple events to trigger layout external resizes.
2018-08-10 11:28:17 +01:00
Alasdair Smith
7830a5f69d
Update copy in v1 import modal now that more features are supported
2018-08-09 13:21:11 +01:00
Paulo Reis
4f4ab57958
Use controller binding in the label tooltip.
2018-08-09 12:05:00 +01:00
Paulo Reis
d6ab993519
Dont hide history entries while loading.
2018-08-09 12:00:53 +01:00
Paulo Reis
d59fe61a83
Handle sorting of labels; keep selection between view changes.
2018-08-09 11:03:00 +01:00
James Allen
69e8eddff0
Merge pull request #796 from sharelatex/pr-history-labels-ui
...
History labels UI
2018-08-09 10:50:28 +01:00
Hugh O'Brien
0af23718ba
Merge pull request #749 from sharelatex/hb-activate-submit-modal
...
Activate publish modal
2018-08-09 09:44:41 +01:00
James Allen
9cbb51bbbc
Merge pull request #793 from sharelatex/sk-sl-login-v2
...
If we're creating v1 accounts, don't allow login for users already linked up
2018-08-08 15:51:25 +01:00
Henry Oswald
df161d3ece
change newsletter log to info on process boot
2018-08-08 14:32:36 +01:00
Henry Oswald
c68366155e
remove sanitize = require('sanitizer') not used anywhere
2018-08-08 14:14:56 +01:00
Henry Oswald
687637eec7
change email address in newsletter when changing default email
...
put mongo_id into mailchimp merge fields
2018-08-08 13:50:03 +01:00
Paulo Reis
f2b957e5b3
Add history labels view.
2018-08-08 13:46:43 +01:00
