Commit Graph
3861 Commits
Author SHA1 Message Date
Alberto Fernández-CapelandGitHub 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-CapelandGitHub 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
Timothée AlbyandGitHub 7cdcd725fd Revert "Use Multiple Emails" 2018-06-07 18:44:59 +02:00
Hugh O'BrienandGitHub 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
Timothée AlbyandGitHub f422b7242d Merge pull request #603 from sharelatex/ta-use-multi-emails
Use Multiple Emails
2018-06-07 15:40:43 +02:00
James AllenandGitHub 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
Alasdair SmithandGitHub 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 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
Tim Alby 3cb499a3c2 add comment 2018-06-06 15:46:41 +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
Tim Alby 613c9193e3 implement multi emails logic 2018-06-05 16:42:12 +02:00
Jessica LawsheandGitHub b63384cbf1 Merge pull request #537 from sharelatex/jel-pricing-plans
Plans and pricing variant
2018-06-05 09:30:43 -05: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
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 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
hugh-obrien 54ce196500 test custom first and last name for exports 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
James Allen cfbb5c8f24 Remove some dead code 2018-06-01 14:55:07 +01:00
Hugh O'BrienandGitHub 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
Brian GoughandGitHub fef667a738 Merge pull request #614 from sharelatex/ja-restrict-restore
Don't allow read-only users to restore
2018-05-31 15:52:40 +01:00
Brian Gough c4f3a12ce5 add missing locking to copyFileFromExistingProject 2018-05-31 14:51:32 +01:00
James Allen f5367985c3 Don't allow read-only users to restore 2018-05-31 13:44:37 +01:00
hugh-obrien d47e845367 add v1 template tests 2018-05-31 13:26:54 +01:00
hugh-obrien 7f86ddc72c extract v1 templates code to web 2018-05-31 11:12:31 +01:00
Shane KilkellyandGitHub d3ae276091 Merge pull request #579 from sharelatex/sk-linked-files-from-project
Linked Files from Project
2018-05-31 11:08:08 +01:00
Alasdair SmithandGitHub 57c56a0853 Merge pull request #565 from sharelatex/as-dash-action-btns
Add action buttons to v2 dash
2018-05-31 10:11:20 +01:00
Alasdair SmithandGitHub cc9d18d991 Merge pull request #600 from sharelatex/as-refactor-rt-load
Refactor loading rich text
2018-05-31 10:11:01 +01:00
Alasdair Smith 5ec238cae8 Switch archive button with restore button for archived projects 2018-05-31 10:05:39 +01:00
Alasdair Smith 7dffc56804 Clone project action button 2018-05-31 10:05:04 +01:00
Alasdair Smith 2354f4156b Download project action button 2018-05-31 10:04:59 +01:00
Alasdair Smith ffc06f2a3b Archive project action button 2018-05-31 10:04:50 +01:00
Alasdair Smith a2dff4bfbb Right align actions header 2018-05-31 09:59:35 +01:00
Alasdair Smith 83c62c8ab1 Only show action buttons on v2 2018-05-31 09:58:39 +01:00
Alasdair Smith 20cca0fcd4 Add action buttons to project list 2018-05-31 09:58:18 +01:00
James Allen 4f5148e668 Wrap text like normal 2018-05-30 17:55:47 +01:00
Paulo Reis 6e7e76a3ce Margin and padding adjustments. 2018-05-30 17:34:46 +01:00
Henry Oswald a747480425 add references host into settings 2018-05-30 15:28:59 +01:00
Paulo Reis 66d7bdb26b Change buttons copy. 2018-05-30 15:03:22 +01:00
Paulo Reis 4c4a4f10c1 Rename history file tree and move it around. 2018-05-30 14:21:01 +01:00
James Allen e0e88b25fe Make agrument checking more robust 2018-05-30 12:48:08 +01:00
Alasdair Smith d0b160d9a2 Rename flag for clarity 2018-05-30 11:55:09 +01:00
Alasdair Smith c6d2b4f1e7 Use single rich text include instead of split toolbar & body includes 2018-05-30 11:44:27 +01:00