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
6fb6119ca8
Merge remote-tracking branch 'origin' into afc-email-tokens
2018-06-05 15:42:17 +01: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 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
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
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
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
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
Paulo Reis
637c492e6e
Merge branch 'master' into pr-v2-history-ui
2018-05-30 11:24:33 +01:00
Paulo Reis
8d2189f843
Support using both point-in-time and compare modes.
2018-05-29 16:50:15 +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
Paulo Reis
fb33fc6c30
Add loading indicators; handle binary files; keep selected file across points in time.
2018-05-23 12:14:27 +01:00
James Allen
2ff5ecb342
Use intelligent /user/trial v2 URL for v2 trials
2018-05-22 16:59:59 +01:00
Paulo Reis
f4f3a4375b
Add history toolbar (just scaffolding); show files at point in time.
2018-05-22 15:40:57 +01:00
Shane Kilkelly
691eec48ba
Merge branch 'master' into sk-linked-files-from-project
2018-05-22 15:39:09 +01:00
Paulo Reis
81c93e11d0
History file tree integration with the backend.
2018-05-21 15:13:34 +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
