alois/Verso
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,842 Commits 8 Branches 11 Tags
6e2ec2f982e4bde69ef0955bb09947d044a897cd
Commit Graph
6588 Commits
Author SHA1 Message Date
James Allen c2ef93b212 Merge pull request #610 from sharelatex/ja-sync-from-v2 
Tell v1 when refreshing features in v2
 2018-06-07 13:30:34 +01:00
hugh-obrien c684fc3383 fix first/last name check bug 2018-06-07 12:57:01 +01:00
Alberto Fernández Capel 959db80177 Check all emails to prevent invite duplicates 2018-06-07 12:49:46 +01:00
Alasdair Smith 3fa6f4743d Merge pull request #637 from sharelatex/as-fix-clone-owner 
Set the owner object to the current user when cloning a project
 2018-06-07 11:54:09 +01:00
Hayden Faulds 87f6c65b99 Merge pull request #625 from sharelatex/hof-container-teardown-timeout 
reduce acceptance test container teardown timeout to 0
 2018-06-07 11:50:16 +01:00
Alasdair Smith f3c871a972 Merge pull request #640 from sharelatex/as-fix-leave-quick-action 
Show leave quick action instead of archive for unowned projects
 2018-06-07 11:44:36 +01:00
Alasdair Smith 89ecb9f01b Merge pull request #641 from sharelatex/as-fix-autocomplete-blur 
Fix blurry autocomplete highlight on Chrome
 2018-06-07 11:44:25 +01:00
Alberto Fernández Capel 566c41cafd Merge remote-tracking branch 'origin/master' into afc-email-tokens 2018-06-07 11:40:03 +01:00
Alasdair Smith 4a1c2cf0e0 Set cloned project's owner to current user 
Fixes a bug where cloning a project then selecting to delete it, the wrong
button for deletion is shown (leave instead of archive/delete). This is
because we are using the owner object (which was undefined after cloning) to
determine which button to show
 2018-06-07 11:19:11 +01:00
Tim Alby 458650d456 create script to backfill secondary emails 2018-06-07 11:26:56 +02:00
Alasdair Smith 0900559579 Fix blurrly autocomplete highlight on Chrome 
The blurrly text shadow is back on Chrome. I suspect it maybe intended, not a
bug, so I've fixed it for all versions of Chrome.

I've replaced with font-weight: bold, which visually has the same appearance
 2018-06-06 17:19:12 +01:00
Alberto Fernández Capel 1fc047d08e Fix invitation resend 2018-06-06 17:11:25 +01:00
Alasdair Smith 8f71b104c5 Fix bug where unowned project would show archive quick action instead of leave 
If the user does not own the project, the project can only be left, not
archived. Previously the quick action button was only showing the archive icon
but clicking the button would correctly leave the project. This is confusing,
so this commit corrects to show the leave icon for projects not owned by the
current user
 2018-06-06 16:59:13 +01:00
Alberto Fernández Capel 4885b70016 Better translation key 2018-06-06 16:33:01 +01:00
Alberto Fernández Capel 06efe1910b Replace hardcoded string 2018-06-06 15:36:53 +01:00
Alberto Fernández Capel b308dcef63 Clean up markup 
- Avoid nested rows without cols in them
- Use .row-spaced instead of empty rows to space content
 2018-06-06 15:36:53 +01:00
Alberto Fernández Capel 553878064b Resend email if the user has already been invited 2018-06-06 15:36:53 +01:00
Alberto Fernández Capel 16cb5e0d35 Propagate the error further up the stack 
Useful for error reporting and metrics.
 2018-06-06 15:36:53 +01:00
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
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
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
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
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
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 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