c2ef2326b9
Merge pull request #857 from sharelatex/ho-mailchimp-change-email
...
add error handling for changing email in newsletter of user who has not subscribed
2018-08-28 14:03:44 +02:00
8057f4e74d
Merge pull request #849 from sharelatex/pr-fix-add-new-university
...
Correctly invoke the function to add unknown universities.
2018-08-28 14:03:35 +02:00
946726c898
Merge pull request #853 from sharelatex/ta-institution-features-fix
...
Check Institution Confirmation Status
2018-08-28 14:03:22 +02:00
32749267b8
improve logging on change email in newsletter
2018-08-28 12:46:49 +01:00
423bc9312d
only set status and merge fields if required
...
Not strictly nessaserry but it is a bit safer
also improve error reporting for change email
2018-08-28 12:32:20 +01:00
75521a4c86
add error handling for changing email in newsletter of user who has not subscribed
2018-08-28 10:47:33 +01:00
307a98851d
Nest the overall theme property under ace.
2018-08-28 10:10:16 +01:00
465b9aefc5
use match in one case and remove and operator
2018-08-27 16:48:44 -04:00
4d991aa176
Merge branch 'master' into ns-use-regex-test
2018-08-27 14:26:51 -04:00
ebea8a8633
use regex test instead of match when only bool needed
2018-08-27 14:25:01 -04:00
64c29787c0
Add i18n; update the review icon image.
2018-08-27 15:57:51 +01:00
efc926ffc5
Load theme as a user setting; allow the user to change it; update tests.
2018-08-27 15:25:00 +01:00
ef37902dfc
check institution confirmation status
2018-08-27 15:45:31 +02:00
e19882455a
improve affiliation endorsement button
...
- design as button instead of link
- disable unless role and department are set
2018-08-27 11:32:48 +02:00
7863561bff
display university licence in affiliations UI
2018-08-27 11:26:13 +02:00
4f6f459bfe
Remove debug code.
2018-08-24 15:35:52 +01:00
920c24cacb
Correctly invoke the function to add unknown universities.
2018-08-24 15:29:48 +01:00
c034b0654b
Merge branch 'master' into ns-remove-wufoo-log-links
2018-08-24 09:18:48 -04:00
2491bee38e
Merge branch 'master' into pr-v2-light-theme
2018-08-24 12:11:16 +01:00
7c95de29cd
Avoid breaking the page if isnt set.
2018-08-24 12:06:26 +01:00
6d00f38a71
move typeform survey to google forms
2018-08-23 12:34:13 -04:00
80c74ce07b
add back learn more link
2018-08-23 11:42:00 -04:00
29253c5a93
Merge branch 'master' into hb-fetch-licences-graph
2018-08-23 16:11:43 +01:00
bd721d52f4
review fixes and moving licences endpoint to module
2018-08-23 14:39:48 +01:00
753fb02c05
always return an array when getting affiliations
2018-08-23 15:15:53 +02:00
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
787f0fe239
Add dashboard link mixin
2018-08-22 16:35:06 -05:00
6d3b7cbe7b
remove wufoo latex log responses
2018-08-22 15:45:08 -04:00
8d72fc78fc
send licences graph request to v1 for data instead of analytics
2018-08-22 18:31:29 +01:00
ab1848d0ae
Add a trusted filter for iframe downloads ( #836 )
...
* add trusted helper to iframe downloads
2018-08-22 14:47:15 +01:00
a15706ce24
Merge branch 'master' into pr-v2-light-theme
2018-08-22 11:19:01 +01:00
7f7b10aa09
Sanitize display of system messages.
...
When showing system-messages, use default Angular sanitizer, also,
on the admin panel itself, show the verbatim text of the message.
This solves a mild Stored-XSS vulnerability whereby a user could
put `<script>` tags in a message. We don't want that, but we do want
to be able to use basic html tags.
2018-08-22 10:15:50 +01:00
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
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
b145ca5d5c
Merge pull request #791 from sharelatex/jel-pagination
...
Add pagination mixin and color variables
2018-08-21 11:44:15 -05:00
54e0a7cfd2
Merge branch 'master' into pr-change-free-history-limits
2018-08-21 11:23:28 +01:00
473063cf3d
set rclient.expire for server ttl even when there is no server id
2018-08-21 10:36:18 +01:00
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
09efced352
Add pagination mixin and color variables
2018-08-20 09:25:33 -05:00
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
034586b296
Flush source project to mongo before linked-file create/refresh
2018-08-20 12:19:59 +01:00
45cc278acb
Add FAQ search mixin
2018-08-17 16:31:06 -05:00
f8b85cb848
Move link mixins to mixins folder
2018-08-17 16:12:24 -05:00
9d3e649710
Merge pull request #825 from sharelatex/ta-skip-affiliation-on-create
...
Skip Affiliation on Create
2018-08-17 17:50:17 +02:00
8d6505b518
log institutions API errors
2018-08-17 17:48:00 +02:00
f5513f36ca
add param to skip affiliation creation on user create
2018-08-17 17:48:00 +02:00
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
96aa418b94
Show upgrade prompts when the free history limit is hit.
2018-08-17 16:04:31 +01:00
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
9bc3fa2df0
Pass req to preDoPassportLogin module hook
2018-08-17 12:04:05 +01:00
Timothée Alby