github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-30 07:05:19 -05:00
Code Issues Projects Releases Packages Wiki Activity
6975 commits 3 branches 7 tags 206 MiB
Commit graph

6711 commits

Author SHA1 Message Date
Jessica Lawshe
484ee9ad61 Should not AB test when signed up before 2018-06-06 2018-06-07 10:30:21 -05:00
Alberto Fernández Capel
a3bb99d755 Honour invited_emails for the team being 
We'll remove them soon, but we want to keep them for a while so
recent invites can join their teams.
 2018-06-07 16:22:38 +01:00
Alberto Fernández Capel
670f24ef6f Simplify method name 2018-06-07 16:12:02 +01:00
Alberto Fernández Capel
30b935befd Prevent double rendering error 2018-06-07 16:12:02 +01:00
Alberto Fernández Capel
d1b1e6c299 Do not include the Licence ending in domain invites 
So the message reads like "University of Notre Dame has invited
you to join a team on Overleaf" instead of ""University of Notre
Dame licence..."
 2018-06-07 16:12:02 +01:00
Alberto Fernández Capel
88d12b43ac Make CTA message match regular message 2018-06-07 16:12:02 +01:00
Alberto Fernández Capel
5e70825c94 Rename view variable to invite 
Makes the meaning more explicit
 2018-06-07 16:12:02 +01:00
Hugh O'Brien
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 Alby
0516a7ed79 Merge pull request #630 from sharelatex/ta-multi-emails-script 
Script to Backfill Secondary Emails
 2018-06-07 15:40:55 +02:00
Timothée Alby
f422b7242d Merge pull request #603 from sharelatex/ta-use-multi-emails 
Use Multiple Emails
 2018-06-07 15:40:43 +02:00
Alasdair Smith
c4c9441995 Adjust caret down 2018-06-07 14:13:19 +01:00
Alasdair Smith
ad13eccfa7 Flatten rules for readability 2018-06-07 14:13:19 +01:00
Alasdair Smith
9ae92dbeef Small icon & math icon styling 2018-06-07 14:13:19 +01:00
Alasdair Smith
ea18d606c4 Nicer v2 styles 2018-06-07 14:13:19 +01:00
Alasdair Smith
12d7eb8a46 Adjust styling to work with wrapper 2018-06-07 14:13:19 +01:00
Alasdair Smith
611a6f9c0b Reduce width of overflowed button menu 2018-06-07 14:13:19 +01:00
Alasdair Smith
c5f62d3aa3 Style dropdown & clean up naming 2018-06-07 14:13:19 +01:00
Alasdair Smith
aaf5da877e Style different buttons 2018-06-07 14:10:33 +01:00
Alasdair Smith
7384cfba1a Style wrapped buttons so the toolbar can be resized 2018-06-07 14:09:02 +01:00
Alasdair Smith
bfaa6d8dcc Improve styling of buttons 2018-06-07 14:05:21 +01:00
Alberto Fernández Capel
6639f61a43 Remove extra space between rows 2018-06-07 14:05:10 +01:00
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
Nate Stemen
26385718e6 only suggest thebibliography once 2018-06-05 11:02:03 -04: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
Nate Stemen
863128a030 only suggest one document environment in project 2018-06-05 10:08:27 -04: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
Alberto Fernández Capel
b0b2546e43 Remove dead code 2018-06-01 16:45:36 +01:00
Alberto Fernández Capel
a73a869d03 I can haz some grammar 2018-06-01 16:17:11 +01:00
Alberto Fernández Capel
7fcdf68296 Remove dead code 2018-06-01 16:05:44 +01:00
Alberto Fernández Capel
3bd18715db Add some tests 2018-06-01 15:37:09 +01:00
Alberto Fernández Capel
89735f4b8e Keep method name for compatibility 2018-06-01 15:36:00 +01:00
James Allen
cfbb5c8f24 Remove some dead code 2018-06-01 14:55:07 +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
9b18e58b68 Choose a better method name 
This method is now only notifying users about a potential domain
licence
 2018-06-01 11:28:06 +01:00
Alberto Fernández Capel
385fec1914 Clean up code that uses invited_emails 2018-06-01 11:23:25 +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
1c485c1884 Improve error handling 2018-05-31 16:42:09 +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
Brian Gough
c4f3a12ce5 add missing locking to copyFileFromExistingProject 2018-05-31 14:51:32 +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
hugh-obrien
d47e845367 add v1 template tests 2018-05-31 13:26:54 +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
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
00808dfc9a Merge pull request #599 from sharelatex/sk-less-border-radius-on-selects-v2 
On v2, use smaller (default) border radius on select inputs
 2018-05-31 10:10:49 +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
2d1bcda9ff Style action buttons, and hide on smaller screens 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
Jessica Lawshe
be35e37d29 Style for CMS pages 2018-05-30 15:54:10 -05: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
7cb4280a4d Remove commented-out code. 2018-05-30 15:18:15 +01:00
Paulo Reis
66d7bdb26b Change buttons copy. 2018-05-30 15:03:22 +01:00
Paulo Reis
aec4ea79ad Make history file tree more like the editor file tree in SL. 2018-05-30 15:00:20 +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
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
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
James Allen
c5b553d4a6 Notify v1 by default 2018-05-29 17:31:15 +01:00
James Allen
301ae80f99 Allow refreshFeatures to notify v1 to update its features 2018-05-29 17:21:42 +01:00
Timothée Alby
6db3bf59a6 Merge pull request #586 from sharelatex/ta-refactor-user-getter 
Canonical Way to Get Users by Email
 2018-05-29 17:56:59 +02:00
Timothée Alby
eeff32bf4f Merge pull request #584 from sharelatex/ta-remove-deprecated-method 
Remove getUserOrCreateHoldingAccount Function
 2018-05-29 17:56:42 +02:00
Paulo Reis
8d2189f843 Support using both point-in-time and compare modes. 2018-05-29 16:50:15 +01:00
Alberto Fernández Capel
b52fbdbfa4 Unit test SubscriptionGroupHandler.replaceUserReferencesInGroups 2018-05-29 15:37:04 +01:00
Jessica Lawshe
85ee5a36c8 Merge pull request #587 from sharelatex/jel-contact 
Move contact form to modules
 2018-05-29 09:20:05 -05:00
Alberto Fernández Capel
259d690f7c Add method to update user references 2018-05-29 12:00:22 +01:00
Shane Kilkelly
9e65e5e813 Fix loading of Rich Text page in Test Controls 2018-05-29 10:46:22 +01:00
Shane Kilkelly
14898acd7f Update linked-file acceptance tests 2018-05-29 10:40:38 +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
92fb83e665 Use the correct linkedFileData var 2018-05-29 10:05:50 +01:00
Tim Alby
5fbe5c5537 remove UserLocator 
Use UserGetter instead
 2018-05-28 14:11:13 +02:00
Tim Alby
bbaca91e57 add UserGetter#getUserByMainEmail 
Use only that method to find users by email.
 2018-05-28 14:11:09 +02:00
Tim Alby
5a590aa021 remove getUserOrCreateHoldingAccount function 
The function is deprecated
 2018-05-28 14:09:13 +02:00
Shane Kilkelly
ce147b012f Cleaner unpacking of data from scope 2018-05-25 16:03:45 +01:00
Shane Kilkelly
bc7d6a64ed Add a trailing comma 2018-05-25 16:01:37 +01:00
Shane Kilkelly
c8a8fe6af7 Use Agent.handleError in case checkAuth produces an error 2018-05-25 16:01:11 +01:00
Jessica Lawshe
868083676f Move contact form 2018-05-25 08:50:38 -05:00
Shane Kilkelly
2a11a70cd3 Use smaller border-radius on textarea inputs, on v2 2018-05-25 14:48:37 +01:00
Shane Kilkelly
c4da8701c8 On v2, use smaller (default) border radius on select inputs 2018-05-25 13:38:19 +01:00
Hayden Faulds
09ddc75126 Merge pull request #583 from sharelatex/ta-create-unit-test-app-task 
Add test_unit_app task
 2018-05-25 13:22:25 +01:00
Hayden Faulds
29f7ce0bbf Merge pull request #576 from sharelatex/mm-handle-export-error 
Handle error in ExportsController
 2018-05-25 13:22:18 +01: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
578d667efa Disable the 'select a project/file' options in project-linked-file modal 2018-05-24 11:30:53 +01:00
Shane Kilkelly
8766b5d487 DRY up writing to dump-folder in FileWriter 2018-05-24 11:30:29 +01:00
Shane Kilkelly
b5e8ed81b9 Better sanitization and validation for project-linked-file 2018-05-24 11:30:03 +01:00
Shane Kilkelly
1cbc901492 Add a checkAuth function to linked-file agents 2018-05-24 11:29:37 +01:00
Alasdair Smith
81fdca91c1 Fix failing test 2018-05-24 10:27:36 +01:00
Shane Kilkelly
3181f624a7 Remove obsolete auth check 2018-05-24 10:22:17 +01:00
Alasdair Smith
1849fcb70a Merge pull request #588 from sharelatex/ja-restrict-front-widget 
Add Dropbox test for Front widget too
 2018-05-24 10:09:18 +01:00
James Allen
7bcd285bb1 Add Dropbox test for Front widget too 2018-05-24 09:51:29 +01:00
Alberto Fernández Capel
8a55994f64 Ensure a team overleaf id is unique 2018-05-23 16:11:28 +01:00
Alasdair Smith
5ecb02bd66 Set size of RT when review panel is expanded 2018-05-23 16:11:26 +01:00
Alasdair Smith
0918e7e694 Fix CodeMirror not scrolling correctly 
CM has a hard-coded 300px height in it's stylesheet. Because of the way we
absolutely position the editor (to work with the dividers) we need to work a
bit to set the CM height to 100%
 2018-05-23 16:11:26 +01:00
Alberto Fernández Capel
c8977ab9d6 Add overleaf id to user schema 2018-05-23 15:23:46 +01:00
Shane Kilkelly
78f87c0ecf Add acceptance test for the project-list and project-entities endpoints 2018-05-23 15:02:45 +01:00
Tim Alby
a9f1989eca add test_unit_app task 2018-05-23 15:47:28 +02:00
Shane Kilkelly
ba9143fc3c Show test-controls for admin users by default 2018-05-23 12:55:49 +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
Shane Kilkelly
295425e791 Check that user can read a project on entities-json route 2018-05-23 11:34:55 +01:00
Shane Kilkelly
6a5af88e12 Remove stray comment 2018-05-23 11:32:00 +01:00
Alberto Fernández Capel
a5b608a502 Merge remote-tracking branch 'origin/master' into afc-metrics-spike 2018-05-23 09:38:22 +01:00
James Allen
2ff5ecb342 Use intelligent /user/trial v2 URL for v2 trials 2018-05-22 16:59:59 +01:00
Shane Kilkelly
4daf062be9 Add unit test for ProjectController.projectEntitiesJson 2018-05-22 16:40:39 +01:00
Shane Kilkelly
b1c1cdecef Add unit test for ProjectController.userProjectsJson 2018-05-22 16:17: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
Shane Kilkelly
bc5769cd73 Stub out the ProjectEntityHandler in ProjectController tests 2018-05-22 15:56:01 +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
Shane Kilkelly
e34131ed45 Add acceptance test for project linked files 2018-05-22 15:01:51 +01:00
Shane Kilkelly
73184c063e Be more specific about the source-file-not-found error case 2018-05-22 11:36:35 +01:00
James Allen
701a803da7 Fix ProjectInvite tests since the user no longer had the features 2018-05-22 10:19:47 +01:00
James Allen
1d0be569a6 Fix SubscriptionUpdater -> FeaturesUpdater miscall 2018-05-22 10:05:08 +01:00
James Allen
50bd60dd51 Split FeaturesUpdater out of SubscriptionUpdater 2018-05-22 10:05:08 +01:00
James Allen
0830c473ad Update unit tests and refactor to make more testable 2018-05-22 10:05:08 +01:00
James Allen
4deaf7865d Guard against no apis.v1 setting 2018-05-22 10:05:08 +01:00
James Allen
b1f378208d Properly merge subscriptions from different places 2018-05-22 10:05:08 +01:00
Paulo Reis
81c93e11d0 History file tree integration with the backend. 2018-05-21 15:13:34 +01:00
Paulo Reis
a501e7dc85 History file tree styles. 2018-05-21 15:13:16 +01:00
Paulo Reis
a716f9ccd3 Integrate history file tree in the UI. 2018-05-21 15:12:47 +01:00
Paulo Reis
6701b4413b Add history file tree components. 2018-05-21 15:12:03 +01:00
Paulo Reis
2a52eab8d6 Proxy history filetree requests through web. 2018-05-21 15:10:46 +01:00
Alasdair Smith
5b3fbe47db Merge pull request #528 from sharelatex/as-cm-spelling 
Rich text spelling
 2018-05-21 11:50:30 +01:00
Shane Kilkelly
1f2ee4e3fc Show error if refresh fails 2018-05-21 11:02:12 +01:00
Alasdair Smith
309792401f Re-focus editor after clicking suggestion 2018-05-21 10:35:43 +01:00
Shane Kilkelly
7d8c7bebe2 Remove commented-out code 2018-05-21 10:17:00 +01:00