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
8e5032fb34
Merge branch 'master' into pr-v2-history-ui
2018-06-05 10:55:42 +01:00
Paulo Reis
f858786f2d
Add i18n.
2018-06-05 10:14:16 +01: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
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
25d7196570
Merge remote-tracking branch 'origin/master' into afc-email-tokens
2018-06-01 16:49:47 +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
d262de14d6
Use team invites to join domain licensed teams
2018-05-31 16:15:47 +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
Alberto Fernández Capel
11edfde153
Accept & revoke team invites
2018-05-31 11:54:50 +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
Paulo Reis
7cb4280a4d
Remove commented-out code.
2018-05-30 15:18:15 +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
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
Shane Kilkelly
9e65e5e813
Fix loading of Rich Text page in Test Controls
2018-05-29 10:46:22 +01:00
Shane Kilkelly
dccac6302e
Use a decorateLinkedFileData function on server to add project name
2018-05-29 10:07:31 +01:00
Shane Kilkelly
ce147b012f
Cleaner unpacking of data from scope
2018-05-25 16:03:45 +01:00
Jessica Lawshe
868083676f
Move contact form
2018-05-25 08:50:38 -05:00
Shane Kilkelly
105d858155
Move waitFor into an angular service
2018-05-25 13:02:58 +01:00
Shane Kilkelly
cfc17d56e8
Use a promise (with Angular's $q) in waitFor
2018-05-25 11:42:13 +01:00
Shane Kilkelly
8be4279165
Fix a broken if-else-if statement
2018-05-25 10:56:32 +01:00
Shane Kilkelly
f5f253ad01
Add an optional pollInterval parameter to waitFor
2018-05-25 10:56:08 +01:00
Shane Kilkelly
e33b7b1a49
Use waitFor when restoring a file in v2 history
2018-05-25 10:37:04 +01:00
Shane Kilkelly
19d8700947
Use waitFor when refreshing the binary file view
2018-05-25 10:36:39 +01:00
Shane Kilkelly
3849bcfb40
Add a waitFor helper to the ide object
2018-05-25 10:36:20 +01: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
73a45b15ce
Make string replace op safer
2018-05-24 11:35:55 +01:00
Shane Kilkelly
de1f33a720
Remove 'private' methods from the controller scope
2018-05-24 11:32:44 +01:00
Shane Kilkelly
16419847ae
Fix linked-file-types check when opening modal
2018-05-24 11:32:20 +01:00
Shane Kilkelly
656d40ac39
Better view refresh after refreshing linked file
2018-05-24 11:31:50 +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
Shane Kilkelly
f5dd94ca1d
Remove test code from FileTreeManager
2018-05-23 11:46:37 +01:00
James Allen
103ddd79ef
Merge pull request #580 from sharelatex/ja-fix-trials
...
Use intelligent /user/trial v2 URL for v2 trials
2018-05-23 11:46:17 +01:00
James Allen
2ff5ecb342
Use intelligent /user/trial v2 URL for v2 trials
2018-05-22 16:59:59 +01:00
Jessica Lawshe
6a84fb374f
Merge pull request #567 from sharelatex/jel-remove-wiki-page-btn
...
Remove suggest new wiki doc
2018-05-22 10:07:47 -05: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
