Commit graph

6588 commits

Author SHA1 Message Date
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
Shane Kilkelly
ee1b32eee1 Check for case where the source file is not found 2018-05-21 10:12:41 +01:00
Hugh O'Brien
346f37011f Merge pull request #546 from sharelatex/ns-allow-latexmkrc
Allow for latexmkrc files in project zip upload
2018-05-21 09:03:40 +01:00
Hugh O'Brien
5474ec3f70 Merge pull request #557 from sharelatex/hb-compile-react-production
Compile react in production mode
2018-05-21 09:03:24 +01:00
Michael Mazour
19e07485bc Handle error in ExportsController 2018-05-18 15:08:33 +01:00
Alasdair Smith
c2d7809e05 Add removeWord so that learning word removes all highlights for given word 2018-05-18 14:23:36 +01:00
Alasdair Smith
a719ac6e6e IE11 doesn't support Array.find so use underscore instead 2018-05-18 13:33:06 +01:00
Alasdair Smith
681e67ecea Be more consistent with naming 2018-05-18 11:29:27 +01:00
Alasdair Smith
846f27f0ad Clear highlights that are "touching" the cursor on change
This means that correcting a mistake won't wait until the request has resolved and that only the word at the end of the line will have it's spelling
highlight removed instead of the entire row
2018-05-18 11:29:27 +01:00
Alasdair Smith
2be023c731 Prevent spell error marker adding newly typed characters 2018-05-18 11:29:27 +01:00
Alasdair Smith
9fa85400b3 HighlightedWordManager is more naive about tracking position
We are relying entirely on Ace's tracking of markers with the anchor trick.
This means that we don't have to apply changes to ensure that the word manager
data structure tracks which row the highlights are on. This is traded off
against slightly less efficient searching/removing
2018-05-18 11:29:27 +01:00
Alasdair Smith
ebf1b7c84c Extract SpellCheckAdapter to separate file 2018-05-18 11:29:27 +01:00
Alasdair Smith
d2bba0eb60 Fix firefox not closing contextmenu correctly 2018-05-18 11:29:27 +01:00
Alasdair Smith
9c56f6c2fc Add init test for SpellCheckManager 2018-05-18 11:29:27 +01:00
Alasdair Smith
034531d323 Replace word with suggestion and learn word 2018-05-18 11:29:27 +01:00
Alasdair Smith
cf123ce857 Extract spellMenu component and use when showing spell suggestions 2018-05-18 11:29:27 +01:00
Alasdair Smith
e6ffaaa489 Handle contextmenu for spelling 2018-05-18 11:29:27 +01:00
Alasdair Smith
abcc2cc11b Style codemirror spelling errors 2018-05-18 11:29:27 +01:00
Alasdair Smith
8de2267824 Adapt aceEditor to use new spell check manager with adapter 2018-05-18 11:29:27 +01:00
Alasdair Smith
22e41cdce7 Simplify word manager to use Range + Anchor to automatically keep marker positions up-to-date
Re-implement highlighted word manager to be simpler
2018-05-18 11:29:16 +01:00
Alasdair Smith
37ca7b54a6 Re-implement spell check manager with adapter to abstract away editor 2018-05-18 11:29:16 +01:00
Shane Kilkelly
2b99080ed3 Fix rendering of long previews, stop cutting off last line in short ones 2018-05-18 11:25:01 +01:00
Shane Kilkelly
4acd55b1c6 More tidy unpacking of data 2018-05-18 11:07:59 +01:00
Shane Kilkelly
16106df2f0 Remove obsolete code 2018-05-18 11:05:20 +01:00