github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-10-31 21:21:03 -04:00
Code Issues Projects Releases Packages Wiki Activity
9304 commits 3 branches 7 tags 199 MiB
Commit graph

9304 commits

This branch
This branch
All branches
Author SHA1 Message Date
Henry Oswald
02110064f7 Merge branch 'master' into ho-clsi-domain 2018-06-13 10:32:51 +01:00
James Allen
f57290382d Explain error if web crashes in acceptance tests 2018-06-13 10:11:38 +01:00
Shane Kilkelly
3baf0836bc Support project-linked-files originating from imported v1 projects 2018-06-13 10:02:54 +01:00
Jessica Lawshe
baa321fa1a Merge pull request #628 from sharelatex/ns-only-one-doc-env 
only suggest one document environment per project
 2018-06-12 08:44:14 -05:00
James Allen
b00a79ff1c Redirect to v1 plans page from v2 2018-06-12 13:52:47 +01:00
James Allen
a417dc8ff4 v1Subscription -> v1Subscriptions 2018-06-12 13:52:47 +01:00
James Allen
6e2ec2f982 Update remaining unit tests 2018-06-12 13:52:47 +01:00
James Allen
28f51cd4b4 Update SubscriptionController unit tests 2018-06-12 13:52:47 +01:00
James Allen
606419476f Update LimitationsManager unit tests 2018-06-12 13:52:47 +01:00
James Allen
034e50760e Add flag that can disable plans page 2018-06-12 13:52:47 +01:00
James Allen
ce60e6941c Check with v1 before allowing a new subscription 2018-06-12 13:52:47 +01:00
James Allen
9d84263463 Fetch subscription details from v1 and display to user 2018-06-12 13:52:46 +01:00
James Allen
ea8f2fc7a3 Merge pull request #653 from sharelatex/ja-group-notification 
Update group notification for new group invite URL
 2018-06-12 10:06:26 +01:00
James Allen
1d7accabdd Update group notification for new group invite URL 2018-06-12 09:54:54 +01:00
James Allen
f7532e5854 Merge pull request #619 from sharelatex/afc-email-tokens 
Use emails with tokens for team invites
 2018-06-12 08:30:23 +01:00
James Allen
d4efdb3ede Fix frontend HistoryV2ManagerTests 2018-06-11 15:47:23 +01:00
James Allen
dbd6ea30e9 Improve robustness of email validation 2018-06-11 15:22:42 +01:00
James Allen
ed5bc70350 Tweak front-end layout 2018-06-11 14:20:46 +01:00
James Allen
155102df64 Use Error classes, and ensure invited_emails is cleared on new invite 2018-06-11 14:20:35 +01:00
James Allen
b716f59442 Remove deprecated removeEmailInviteFromGroup 2018-06-11 14:19:47 +01:00
Tim Alby
97c145433e use EmailHelper.parseEmail on registration 
Also changed EmailHelper to use the regexp already used in
UserRegistrationHandler rather than the `mimelib` package as it is
deprecated.
 2018-06-11 12:31:18 +02:00
Tim Alby
e614ed9248 add emails endpoints 2018-06-11 10:35:23 +02:00
Timothée Alby
bc6a38a4f1 Merge pull request #644 from sharelatex/ta-use-multi-emails-2 
Use Multiple Emails Take 2
 2018-06-11 10:31:25 +02:00
Henry Oswald
75c9489c06 PDF Downloads work, not tested on large pdf's yet 2018-06-08 17:17:00 +01:00
Tim Alby
5438a565b9 use multiple emails when relevant 2018-06-08 17:53:45 +02:00
Tim Alby
31827ae6b5 add emails attribute on user creation 2018-06-08 17:53:45 +02:00
Jessica Lawshe
07aedaa92b Merge pull request #645 from sharelatex/jel-add-cms 
Existence check for data from CMS
 2018-06-08 10:14:23 -05:00
Jessica Lawshe
43da34098e Existence check 2018-06-08 10:07:44 -05:00
Jessica Lawshe
ba5b3bb06a Merge pull request #581 from sharelatex/jel-add-cms 
Add CMS
 2018-06-08 07:18:03 -05:00
Jessica Lawshe
d57660aeb5 Merge pull request #632 from sharelatex/jel-plans-pricing-fix 
Plans and Pricing fixes
 2018-06-08 07:17:28 -05:00
Alberto Fernández Capel
59688efb56 Merge remote-tracking branch 'origin/master' into afc-email-tokens 2018-06-08 12:21:17 +01:00
Alberto Fernández-Capel
e7e429a963 Merge pull request #605 from sharelatex/afc-update-user-references 
Add method to update user references
 2018-06-08 11:29:25 +01:00
Alberto Fernández Capel
57775e60b1 Merge remote-tracking branch 'origin/master' into afc-update-user-references 2018-06-08 11:28:58 +01:00
Alberto Fernández-Capel
10da4fc5f7 Merge pull request #585 from sharelatex/afc-team-overleaf-id 
Add overleaf id to the Subscription (team) schema
 2018-06-08 11:27:15 +01:00
Alasdair Smith
c53ff0fa84 Merge pull request #618 from sharelatex/as-toolbar-btns 
Rich text toolbar styles
 2018-06-08 10:09:27 +01:00
Alberto Fernández Capel
c45b4463bb Fix unit test 2018-06-08 10:05:26 +01:00
Alberto Fernández Capel
5159f6f33d Check the subscription is in a group plan before adding new members 2018-06-08 09:58:51 +01:00
Timothée Alby
27bd7a16b2 Merge pull request #643 from sharelatex/revert-603-ta-use-multi-emails 
Revert "Use Multiple Emails"
 2018-06-07 18:45:49 +02:00
Timothée Alby
7cdcd725fd Revert "Use Multiple Emails" 2018-06-07 18:44:59 +02:00
Alberto Fernández Capel
c4250e601e Minor copy change Registered -> Accepted invite 2018-06-07 16:53:19 +01:00
Alberto Fernández Capel
85f4a31585 Proper coffee syntax 2018-06-07 16:49:17 +01:00
Jessica Lawshe
6c92238f37 Fix analytics event label for when shouldABTestPlans: false 2018-06-07 10:30:21 -05:00
Jessica Lawshe
484ee9ad61 Should not AB test when signed up before 2018-06-06 2018-06-07 10:30:21 -05:00
Alberto Fernández Capel
a3bb99d755 Honour invited_emails for the team being 
We'll remove them soon, but we want to keep them for a while so
recent invites can join their teams.
 2018-06-07 16:22:38 +01:00
Alberto Fernández Capel
670f24ef6f Simplify method name 2018-06-07 16:12:02 +01:00
Alberto Fernández Capel
30b935befd Prevent double rendering error 2018-06-07 16:12:02 +01:00
Alberto Fernández Capel
d1b1e6c299 Do not include the Licence ending in domain invites 
So the message reads like "University of Notre Dame has invited
you to join a team on Overleaf" instead of ""University of Notre
Dame licence..."
 2018-06-07 16:12:02 +01:00
Alberto Fernández Capel
88d12b43ac Make CTA message match regular message 2018-06-07 16:12:02 +01:00
Alberto Fernández Capel
5e70825c94 Rename view variable to invite 
Makes the meaning more explicit
 2018-06-07 16:12:02 +01:00
Hugh O'Brien
6f5c777163 Merge pull request #622 from sharelatex/hb-take-emis-names-as-input 
Take user entered first and last names for EMIS
 2018-06-07 15:52:33 +01:00