Tim Alby
48e5c6b523
add UserMembership logic
2018-10-09 12:09:11 +01:00
Jessica Lawshe
d2af2fb630
Merge pull request #927 from sharelatex/jel-plans-updates
...
Plans page updates
2018-09-20 09:00:58 -05:00
Hugh O'Brien
8805447bb9
Revert "Add notification to confirm unconfirmed emails"
2018-09-19 12:28:39 +01:00
Hugh O'Brien
78ad6e7e5c
Merge pull request #915 from sharelatex/hb-affiliation-cta
...
Replace profile completion CTA with affiliations CTA
2018-09-19 11:32:55 +01:00
Hugh O'Brien
18e706c4b2
Merge pull request #917 from sharelatex/hb-confirm-email-notification
...
Add notification to confirm unconfirmed emails
2018-09-19 11:32:44 +01:00
Shane Kilkelly
fc0a4298f1
Move scripts related to account-merge checker to relevant modules
2018-09-19 09:28:59 +01:00
Shane Kilkelly
6cfe68db26
Roughly working account-merge-by-email callback endpoint
2018-09-19 09:28:59 +01:00
Shane Kilkelly
ba221a1135
WIP: add email-based account merge flow to ShareLaTeX
2018-09-19 09:28:59 +01:00
hugh-obrien
277225d8de
use existing left sidebar controller for affiliation cta
2018-09-18 13:06:26 +01:00
hugh-obrien
2d40c3d21a
Use existing notification styling
2018-09-18 11:01:10 +01:00
Jessica Lawshe
4f5c12e9ac
More specific group contact controller name and email subject
...
This form is only used on the group contact modal.
2018-09-17 10:47:57 -05:00
James Allen
ef11161ddb
Revert "Record and show last modified by user for projects"
2018-09-13 14:00:30 +01:00
James Allen
dd4b85b809
Combine v1 and v2 projects into item.pug
2018-09-13 10:38:52 +01:00
James Allen
c072961183
Update project-list list to a table and show last updated user
2018-09-13 10:38:52 +01:00
Shane Kilkelly
3d369b725c
Add another confirmation checkbox to account-delete.
...
This confirms the user understands they will lose both their OL v2 and SL
accounts, and their projects.
2018-09-06 11:35:28 +01:00
Shane Kilkelly
680654f7e7
Account-delete, clarify what happens to v1 account and projects
2018-09-04 13:31:22 +01:00
Paulo Reis
60cbc989e2
Add delete as an inline table action (only when viewing archived projects).
2018-09-02 15:14:45 +01:00
Paulo Reis
f88a3815c6
Add loading spinner when cloning a project.
2018-08-31 16:14:20 +01:00
Timothée Alby
59b137e303
Merge pull request #877 from sharelatex/pr-fill-university-model-as-you-type
...
Update university, role and department value as the user types.
2018-08-31 13:15:01 +02:00
James Allen
52381c8fb7
Merge pull request #851 from sharelatex/jel-remove-a-b-test
...
Remove Plans and Pricing A/B Test
2018-08-30 15:19:56 +01:00
Paulo Jorge Reis
10981f0b4e
Merge pull request #860 from sharelatex/ta-front-end-email-regex
...
Change Email Regex in Affiliations Front-End
2018-08-30 11:28:38 +01:00
Paulo Reis
79f1e7b0ee
Update ui-select value as the user types.
2018-08-29 17:31:47 +01:00
Alasdair Smith
2e0d6ab305
Remove 2 step modal and make copy more friendly
2018-08-29 10:50:07 +01:00
Shane Kilkelly
6ee2a83885
Merge pull request #856 from sharelatex/ns-use-regex-test
...
Use regex test instead of string match
2018-08-29 09:21:40 +01:00
Shane Kilkelly
2c782fee67
Merge pull request #858 from sharelatex/sk-update-v2-migration-banner
...
Update the color and wording of the warning message shown on SL
2018-08-29 09:21:19 +01:00
Shane Kilkelly
6157db1964
Merge pull request #835 from sharelatex/sk-sanitize-system-messages
...
Sanitize display of system messages.
2018-08-29 09:21:07 +01:00
Shane Kilkelly
33a4882bd3
Update the color and wording of the warning message shown on SL
2018-08-29 09:08:44 +01:00
Jessica Lawshe
8889f2aed2
Remove Plans and Pricing A/B Test
...
Remove all layouts, analytics events, and scope related to the A/B test.
The group modal from the default layout of the A/B test should be maintained though for v2.
2018-08-28 12:42:09 -05:00
Tim Alby
5821ac7e54
change email regex used in affiliations front-end
...
Make it consistent with back-end regex
2018-08-28 15:37:20 +02:00
Nate Stemen
4d991aa176
Merge branch 'master' into ns-use-regex-test
2018-08-27 14:26:51 -04:00
Nate Stemen
ebea8a8633
use regex test instead of match when only bool needed
2018-08-27 14:25:01 -04:00
Alasdair Smith
1fb0471327
Don't default to having OL account in account checker
2018-08-24 10:57:03 +01:00
Alasdair Smith
59910320fe
Basic controller for account merge checker
2018-08-24 10:57:03 +01:00
Shane Kilkelly
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
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
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
Jessica Lawshe
356e31caec
Set variant when sixpack request successful
2018-08-17 09:07:34 -05: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
James Allen
7dc82597e1
Merge pull request #765 from sharelatex/ja-update-email-in-v1
...
Update email in v1 when setting as default in v2
2018-07-26 10:58:57 +01:00
Jessica Lawshe
b9a63fe216
Merge pull request #768 from sharelatex/jel-mathjax-wiki
...
Add MathJax to wiki pages and max-width for images
2018-07-17 09:37:28 -05:00
Jessica Lawshe
ddca090cd7
Add Wiki controller with MathJax directive
2018-07-17 09:09:07 -05:00
James Allen
4435eab423
Update affiliations UI to show specific errors for conflicting emails
2018-07-17 11:12:47 +01:00
James Allen
d7e0b8c369
Show unconfirmed email status in UI and add link to resend confirmation
2018-07-12 17:13:26 +01:00
Paulo Reis
67e2f6f942
Better handling of affiliation change submission.
2018-07-12 16:37:09 +01:00
Paulo Reis
59008b4a51
Show university custom departments when changing affiliations; fix Features typo.
2018-07-12 16:37:09 +01:00
Paulo Reis
a759828ece
Update feature flag for affiliations; use it in the router; minor style adjustments.
2018-07-12 16:37:09 +01:00
Paulo Reis
4d1b6c6ba8
Add error handling.
2018-07-12 16:37:09 +01:00