Commit graph

7398 commits

Author SHA1 Message Date
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
Henry Oswald
7a253e56ef Download all log files from compiles.sharelatex.env (#833)
* add a couple of missing buildPdfDownloadUrl

* only download pdfs from compile server when streaming

* use compiles.env for resonse files

* update config to use clsi_lb
2018-08-21 09:24:48 +01:00
Paulo Reis
4dee3fd5e1 Update frontend unit tests. 2018-08-20 17:02:55 +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
Paulo Jorge Reis
4becf62fad Merge pull request #827 from sharelatex/pr-fix-account-deletion
Explicitly set the user default email for account deletion
2018-08-20 13:49:30 +01:00
Paulo Jorge Reis
96ad0f4aaf Merge pull request #823 from sharelatex/pr-fix-review-icon-image
Fix review icon for Overleaf.
2018-08-20 13:49:10 +01:00
Shane Kilkelly
034586b296 Flush source project to mongo before linked-file create/refresh 2018-08-20 12:19:59 +01:00
Paulo Reis
042c959d3a Move default email checking logic into the data service. 2018-08-20 12:15:15 +01:00
Paulo Reis
47c51257bb Explicitly set the user default email for the delete account modal controller. 2018-08-20 11:51:12 +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
b98abd1787 Merge pull request #820 from sharelatex/jel-plans-variant
Plans and Pricing Analytics
2018-08-17 10:41:38 -05: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
5974afc2e3 Make sure that at least the last update (i.e. the current state) is shown to free users (even if it happened more than 24 hours ago), to allow labelling. 2018-08-17 16:17:53 +01: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
Paulo Reis
27823d3e06 Show history entries for the last 24 hours for free users. 2018-08-17 15:31:15 +01:00
Jessica Lawshe
356e31caec Set variant when sixpack request successful 2018-08-17 09:07:34 -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
Paulo Reis
dfc25a093b Fix review icon for Overleaf. 2018-08-16 16:28:02 +01:00
Paulo Jorge Reis
48655afb8b Merge pull request #822 from sharelatex/ho-clsi-googlebackend
download log files using buildPdfDownloadUrl
2018-08-16 15:06:31 +01:00
Paulo Jorge Reis
31e374d7bf Merge pull request #816 from sharelatex/pr-history-labels-part-2
History labels, part 2
2018-08-16 15:06:12 +01:00
Henry Oswald
c33192b852 download log files using buildPdfDownloadUrl 2018-08-16 14:25:08 +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
713a39171a Fix history frontend tests. 2018-08-16 13:44:48 +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
42426c8fb8 Merge pull request #811 from sharelatex/jel-portals-analytics
Add analytics option to link mixins
2018-08-14 12:08:14 -05: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
6b31268bfa Scroll to selected history update when coming back from the labels view. 2018-08-14 15:27:07 +01:00
Brian Gough
791d395655 Merge pull request #812 from sharelatex/bg-allow-changing-texlive-image
allow changing texlive image (connects to overleaf/sharelatex#756)
2018-08-14 15:00:08 +01:00