github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-14 20:40:17 -05:00
Code Issues Projects Releases Packages Wiki Activity
7323 commits 3 branches 7 tags 204 MiB
Commit graph

7323 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alberto Fernández Capel
8a317b5bfe Better wording 2018-06-06 15:36:53 +01:00
Alberto Fernández Capel
e753ef3af5 Invite users in the invited_emails array 
We'll remove that attribute soon, but for the time being we want
users to still be able to join the team.
 2018-06-06 15:36:53 +01:00
Timothée Alby
e6568a26e7 Merge pull request #636 from sharelatex/ta-add-emails-filter 
Add Filter to Query on Emails Attribute
 2018-06-06 16:21:48 +02:00
Tim Alby
3cb499a3c2 add comment 2018-06-06 15:46:41 +02:00
Tim Alby
7726314e7c add test to explicitely check filter 2018-06-06 15:45:12 +02:00
Tim Alby
e4da748257 add filter to query on emails attribute 2018-06-06 14:52:09 +02:00
Tim Alby
813289f5de use multiple emails when relevant 2018-06-06 11:45:01 +02:00
Tim Alby
c5530163f5 add emails attribute on user creation 2018-06-06 11:45:01 +02:00
Timothée Alby
5681a76f4c Merge pull request #634 from sharelatex/ta-remove-emails-default 
Remove Emails Attribute on User Model
 2018-06-06 11:37:17 +02:00
Tim Alby
1f6fcafce6 remove default emails attribute on user model 2018-06-06 11:11:57 +02:00
Jessica Lawshe
679d91c4d2 Update default plans view conditional 
Fixes a flash of unwanted content on Firefox
 2018-06-05 12:58:18 -05:00
Timothée Alby
e64a704341 Merge pull request #602 from sharelatex/ta-add-multi-emails 
Add Multiple Emails
 2018-06-05 17:07:12 +02:00
Nate Stemen
26385718e6 only suggest thebibliography once 2018-06-05 11:02:03 -04:00
Alberto Fernández Capel
6fb6119ca8 Merge remote-tracking branch 'origin' into afc-email-tokens 2018-06-05 15:42:17 +01:00
Tim Alby
613c9193e3 implement multi emails logic 2018-06-05 16:42:12 +02:00
Jessica Lawshe
b63384cbf1 Merge pull request #537 from sharelatex/jel-pricing-plans 
Plans and pricing variant
 2018-06-05 09:30:43 -05:00
Nate Stemen
863128a030 only suggest one document environment in project 2018-06-05 10:08:27 -04:00
Paulo Jorge Reis
1f19e0e7da Merge pull request #627 from sharelatex/hof-fix-tk-in-tests 
move tk call to before sandboxed module call
 2018-06-05 14:15:34 +01:00
Paulo Reis
bfad95ae61 File restore button needs to be smaller to fit the new toolbar height. 2018-06-05 13:59:27 +01:00
Hayden Faulds
0bb37d4991 move tk call to before sandboxed module call 2018-06-05 13:42:26 +01:00
Paulo Jorge Reis
aeefd0752b Merge pull request #612 from sharelatex/pr-v2-history-ui 
V2 history point-in-time-view
 2018-06-05 13:24:21 +01:00
Hayden Faulds
be0fd9a446 reduce container teardown timeout to 0 2018-06-05 11:30:48 +01:00
Paulo Reis
4088c164c9 Update translations; use underscores for keys. 2018-06-05 11:15:39 +01:00
Paulo Reis
8e5032fb34 Merge branch 'master' into pr-v2-history-ui 2018-06-05 10:55:42 +01:00
Paulo Reis
1624639bc8 Merge branch 'pr-v2-history-ui' of github.com:sharelatex/web-sharelatex-internal into pr-v2-history-ui 2018-06-05 10:32:06 +01:00
Paulo Reis
f858786f2d Add i18n. 2018-06-05 10:14:16 +01:00
Jessica Lawshe
8b672dea0d Add unit tests 2018-06-04 14:42:26 -05:00
Jessica Lawshe
b1c988e4c1 Add hover and scroll events 2018-06-04 14:42:26 -05:00
Jessica Lawshe
10cf5825a5 Add plans variant 
Also, fix for multiple quotes. Without a closing quote subsequent quotes are considered nested, and
will use a ‘ instead of “

Also, move repeated elements to partials
 2018-06-04 14:42:26 -05:00
Jessica Lawshe
b4a989f0b7 Add contentful 2018-06-04 09:51:40 -05:00
Jessica Lawshe
64ead238e4 Add meta tags 2018-06-04 09:51:35 -05:00
hugh-obrien
54ce196500 test custom first and last name for exports 2018-06-04 13:16:21 +01:00
hugh-obrien
b02eea1e7e update tests for exports name options 2018-06-04 13:16:21 +01:00
hugh-obrien
4c5f186ca2 take custom first and last names from export UI 2018-06-04 13:16:21 +01:00
Hugh O'Brien
63482e0ea0 Merge pull request #617 from sharelatex/hb-check-for-folders-clientside 
Add function to check for existence of folders
 2018-06-04 12:07:25 +01:00
Alasdair Smith
d83cb63c8d Merge pull request #621 from sharelatex/as-fix-restore 
Fix bug where deleted/archived projects couldn't be restored
 2018-06-04 10:49:08 +01:00
Alasdair Smith
7898a1deca Fix missed snake_case to camelCase, causing bug where projects couldn't be restored 2018-06-04 10:45:23 +01:00
Alberto Fernández Capel
58c4e72b2a Update references to UserLocator 
UserLocator was refactored in another branch: UserLocator -> UserGetter
 2018-06-01 16:53:16 +01:00
Alberto Fernández Capel
25d7196570 Merge remote-tracking branch 'origin/master' into afc-email-tokens 2018-06-01 16:49:47 +01:00
Alberto Fernández Capel
b0b2546e43 Remove dead code 2018-06-01 16:45:36 +01:00
Alberto Fernández Capel
a73a869d03 I can haz some grammar 2018-06-01 16:17:11 +01:00
Alberto Fernández Capel
7fcdf68296 Remove dead code 2018-06-01 16:05:44 +01:00
Alberto Fernández Capel
3bd18715db Add some tests 2018-06-01 15:37:09 +01:00
Alberto Fernández Capel
89735f4b8e Keep method name for compatibility 2018-06-01 15:36:00 +01:00
James Allen
cfbb5c8f24 Remove some dead code 2018-06-01 14:55:07 +01:00
Hugh O'Brien
a79c9b94a8 Merge pull request #613 from sharelatex/hb-extract-v1-templates-to-web 
Extract v1 templates code to web
 2018-06-01 11:29:36 +01:00
Alberto Fernández Capel
9b18e58b68 Choose a better method name 
This method is now only notifying users about a potential domain
licence
 2018-06-01 11:28:06 +01:00
Alberto Fernández Capel
385fec1914 Clean up code that uses invited_emails 2018-06-01 11:23:25 +01:00
hugh-obrien
063187b5fc add function to check for existance of folders 2018-05-31 17:03:41 +01:00
Alberto Fernández Capel
1c485c1884 Improve error handling 2018-05-31 16:42:09 +01:00