Commit graph

1877 commits

Author SHA1 Message Date
Alberto Fernández Capel
25d7196570 Merge remote-tracking branch 'origin/master' into afc-email-tokens 2018-06-01 16:49:47 +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
d262de14d6 Use team invites to join domain licensed teams 2018-05-31 16:15:47 +01:00
Brian Gough
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
Alberto Fernández Capel
39c8595c27 Split SubscriptionGroupInvites and rename to DomainSubscriptionJoin
To not cause confusion with team invites.
They are not really an invite because they are user initiated, but
more of a user choosing to join a team.
2018-05-31 14:25:47 +01:00
James Allen
f5367985c3 Don't allow read-only users to restore 2018-05-31 13:44:37 +01:00
Alberto Fernández Capel
11edfde153 Accept & revoke team invites 2018-05-31 11:54:50 +01:00
hugh-obrien
7f86ddc72c extract v1 templates code to web 2018-05-31 11:12:31 +01:00
Shane Kilkelly
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 Smith
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 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
Alberto Fernández Capel
9aa95cb0d5 Show team invites 2018-05-30 13:06:27 +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
Alberto Fernández Capel
7e09c0e0b1 First stab at email token invites (WIP) 2018-05-30 11:29:21 +01:00
Jessica Lawshe
868083676f Move contact form 2018-05-25 08:50:38 -05:00
Shane Kilkelly
0cb5beb689 Merge branch 'master' into sk-linked-files-from-project 2018-05-24 13:47:28 +01:00
Shane Kilkelly
b2a68cb911 Merge pull request #582 from sharelatex/sk-add-test-controls-panel
Add a "Test Controls" section to the left-panel
2018-05-24 11:41:10 +01:00
Shane Kilkelly
578d667efa Disable the 'select a project/file' options in project-linked-file modal 2018-05-24 11:30:53 +01:00
Shane Kilkelly
561b62f7db Add a hidden 'Test Controls' section to the left-menu.
This is to be used for hidden features that are not yet ready to ship,
and would otherwise be hidden behind a console command.
Append `?tc=true` to the project url to reveal this panel.
2018-05-23 12:37:42 +01:00
James Allen
2ff5ecb342 Use intelligent /user/trial v2 URL for v2 trials 2018-05-22 16:59:59 +01:00
Shane Kilkelly
691eec48ba Merge branch 'master' into sk-linked-files-from-project 2018-05-22 15:39:09 +01:00
Shane Kilkelly
1f2ee4e3fc Show error if refresh fails 2018-05-21 11:02:12 +01:00
James Allen
8b533841d4 Merge pull request #563 from sharelatex/ja-hide-timeout-upgrade
Put the compile timeout upgrade behind an enableSubscriptions flag
2018-05-17 11:55:28 +01:00
James Allen
e7a4aeaf79 Merge pull request #560 from sharelatex/ja-enable-v2-for-all
Enable the v2 banner for everyone if showV2Banner is set
2018-05-17 11:55:21 +01:00
James Allen
3724edfc10 Fix translation string interpolation 2018-05-17 11:25:14 +01:00
Shane Kilkelly
c626446aad Tidy up the project/file display in project-linked-file 2018-05-16 13:52:54 +01:00
Shane Kilkelly
9624e2a290 Record the source project display name, to render with the file 2018-05-16 13:44:21 +01:00
Shane Kilkelly
f533674dbd Clean up 2018-05-16 13:26:59 +01:00
Shane Kilkelly
7292602167 More fine-grained loading spinners 2018-05-16 11:49:10 +01:00
Shane Kilkelly
74d8e67a05 Remove leading slash from path names, for display 2018-05-16 10:58:56 +01:00
Shane Kilkelly
f2702c7b0a Show the linked-files UI for project-linked-files 2018-05-16 10:41:21 +01:00
Shane Kilkelly
103832af7d Functioning project-linked-file importer 2018-05-16 10:29:51 +01:00
Shane Kilkelly
9c33f3f8bc WIP: Project Linked File modal 2018-05-15 16:22:47 +01:00
James Allen
66846cc68c Put the compile timeout upgrade behind an enableSubscriptions flag 2018-05-15 10:17:04 +01:00
James Allen
58b5d67bdd Enable the v2 banner for everyone if showV2Banner is set 2018-05-14 10:29:42 +01:00
James Allen
35dc518d05 Merge pull request #553 from sharelatex/ja-configurable-fonts
Allow font family and line height to be user configurable
2018-05-11 13:50:03 +01:00
Alasdair Smith
df9294816e Show archive or leave icon based on selected projects 2018-05-11 13:46:15 +01:00
Alasdair Smith
64061f0079 Switch name of deleted projects to archived projects to reduce confusion 2018-05-11 13:45:33 +01:00
James Allen
331f9ea9df Translate default 2018-05-10 18:04:30 +01:00
James Allen
dee96920b0 Allow font family and line height to be user configurable 2018-05-10 18:03:54 +01:00
James Allen
78aefc2871 Merge pull request #542 from sharelatex/ja-match-front-to-v1
Update font and line spacing in Ace to match OL v1
2018-05-09 12:24:37 +01:00
James Allen
1aadd7d369 Configure line height and font family separately for v2 2018-05-04 14:05:20 +01:00
James Allen
42ac8faaae Add dependency mapping for vim keybindings 2018-05-03 17:01:34 +01:00