Commit graph

7368 commits

Author SHA1 Message Date
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
2fbcaebac7 More adjustments; style the dashboard. 2018-08-27 12:39:53 +01:00
Paulo Reis
2491bee38e Merge branch 'master' into pr-v2-light-theme 2018-08-24 12:11:16 +01:00
Paulo Reis
e88b840da7 Update gitignore with the light theme generated CSS file. 2018-08-24 12:07:14 +01:00
Paulo Reis
d527249833 Style the editor. 2018-08-24 12:06:56 +01:00
Paulo Reis
7c95de29cd Avoid breaking the page if isnt set. 2018-08-24 12:06:26 +01:00
Paulo Reis
128c825bbf Create flag for light theme. 2018-08-24 12:05:37 +01:00
Timothée Alby
740571475c Merge pull request #839 from sharelatex/hb-fetch-licences-graph
Fetch licences graph data from v1
2018-08-23 17:13:25 +02:00
Hugh O'Brien
29253c5a93 Merge branch 'master' into hb-fetch-licences-graph 2018-08-23 16:11:43 +01:00
Timothée Alby
ed1dd85663 Merge pull request #829 from sharelatex/ta-affiliation-empty
Always return an Array when Getting Affiliations
2018-08-23 17:04:48 +02: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
cfaa8444db null check path when building a pdf download url
if there is an error just the domain is currently returned, empty string
is better for us
2018-08-22 16:45:59 +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
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
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