Hayden Faulds
a6666bee62
group together private in UpdateMerger tests
2018-02-01 10:44:53 +00:00
Hayden Faulds
44d4a1dbe2
replace mocks with stubs in UpdateMerger tests
2018-02-01 10:44:52 +00:00
Hayden Faulds
e214347ede
add locking around project structure updates in TPDS
2018-02-01 10:44:52 +00:00
Alasdair Smith
23de113393
Fix error type assertion
2018-02-01 10:08:10 +00:00
Alasdair Smith
ec8637ead1
Add back webpack script
2018-01-31 17:26:29 +00:00
Alasdair Smith
e01615c174
Install webpack & babel
2018-01-31 17:24:19 +00:00
Alasdair Smith
a51012c96f
Regenerate shrinkwrap after removing contentful dependency
2018-01-31 17:19:42 +00:00
Brian Gough
b7b40faefe
fix unit test
2018-01-31 13:28:11 +00:00
Alasdair Smith
c156187bab
Remove unused contentful dependency
...
This package is unused, and was causing problems with installing babel. Because
it dependended on an older version of babel, and was interpreted by npm first
(as it is a regular dep), the older version of babel would be "hoisted" to the
top level of node_modules
Then when latest versions of babel are installed they would be interpreted second
and thus would nest their dependencies within their own node_modules, filling the
disk with unnecessary copies of core-js.
Removing the unnecessary dep solves these problems
2018-01-31 12:30:39 +00:00
Brian Gough
c19acd82a4
Merge pull request #291 from sharelatex/bg-fix-project-get-exclusion
...
fix typo in project getter exclusions
2018-01-31 11:51:01 +00:00
Brian Gough
5e52ade1ff
Merge pull request #286 from sharelatex/bg-prevent-duplicate-filenames
...
prevent duplicate filenames
2018-01-31 11:50:45 +00:00
James Allen
9a9938083c
Merge pull request #267 from sharelatex/as-remove-rollout
...
Remove rollout logic for auto compile and link sharing
2018-01-31 10:27:09 +00:00
Brian Gough
c652abf739
replace error message with Error object
2018-01-31 10:26:31 +00:00
Brian Gough
21c1ea6687
remove comment in test
2018-01-31 10:26:06 +00:00
James Allen
97c0577d8e
Merge pull request #293 from sharelatex/ja-allow-sl-login-to-v2
...
Show different message if user comes from SL instead of OL v2
2018-01-31 10:23:22 +00:00
James Allen
de7f13aea6
Use hasFeature for message about returning to v1/SL
2018-01-31 10:05:56 +00:00
James Allen
aa6c16593e
Add renamingToName override name for instant apparent renames
2018-01-31 09:42:41 +00:00
James Allen
9721dffbb6
Add missing state reset to error handler
2018-01-31 09:41:58 +00:00
Brian Gough
1c6dc66ed1
prevent double calls to rename
2018-01-29 16:45:59 +00:00
Brian Gough
6ed181d52c
fix check for name in filetree move
2018-01-29 15:27:52 +00:00
Brian Gough
63fa024d98
client-side duplicate check for move/rename/create
2018-01-29 15:24:51 +00:00
Brian Gough
2f52e6c4b4
remove comments
2018-01-29 10:38:25 +00:00
Brian Gough
b30dd22f0e
return a 400 status code for invalid moves
...
was previously returning 500
2018-01-26 17:00:55 +00:00
Brian Gough
cd2688a740
added tests for rename/move
2018-01-26 17:00:33 +00:00
James Allen
12e55fb487
Show v2 message if awareOfV2 flag set
2018-01-26 16:44:14 +00:00
Michael Walker
9303969d7b
Bail out if history API request fails
2018-01-26 15:16:37 +00:00
James Allen
7e829f6944
Fix OL v1 URL
2018-01-26 11:32:17 +00:00
Brian Gough
4bac80dfd5
Merge branch 'bg-prevent-duplicate-filenames' of github.com:sharelatex/web-sharelatex-internal into bg-prevent-duplicate-filenames
2018-01-25 17:09:43 +00:00
Brian Gough
aa5d880902
don't update project structure if file not created
2018-01-25 17:09:32 +00:00
Brian Gough
69bed6dbb2
fix MockFileStoreApi to record uploaded files
2018-01-25 17:09:31 +00:00
Brian Gough
68ac597a93
initial acceptance tests
2018-01-25 17:09:31 +00:00
Brian Gough
302bbe8893
rename checkElementName to checkValidElementName
2018-01-25 17:09:31 +00:00
Brian Gough
7ba17a8875
only need to load rootFolder from project
2018-01-25 17:09:31 +00:00
Brian Gough
8e239e0c64
only update client filetree on success
2018-01-25 17:09:31 +00:00
Brian Gough
9d74a0a2f0
handle errors normally in addFolder modal
2018-01-25 17:09:31 +00:00
Brian Gough
ea9976994a
update unit tests for duplicate checks
2018-01-25 17:09:31 +00:00
Brian Gough
e183956d16
check for duplicates on move
2018-01-25 17:09:31 +00:00
Brian Gough
e421192b5c
check for duplicates on rename
2018-01-25 17:09:31 +00:00
Brian Gough
6e0881f85d
check for duplicates in addFolder
2018-01-25 17:09:31 +00:00
Brian Gough
82a9fc97d9
check for duplicates in putElement
2018-01-25 17:09:30 +00:00
Alberto Fernández Capel
839ea496f1
Track clicks anywhere on the window as activity when the editor is open
2018-01-25 16:32:00 +00:00
Alberto Fernández Capel
a68489a604
Track session activvity if the user scrolls the editor
2018-01-25 16:10:47 +00:00
Alberto Fernández Capel
7d0d18ea5e
Use the cursor:editor:update event to track user activity
...
It is strictly a superset of the change event we were using
before: if there's a change, there will be always a cursor
update, but there can be cursor updates (like when the user
presses the arrow keys) that don't change the document.
This is coherent with what we do to track user activity at
dfb9943521/public/coffee/ide/connection/ConnectionManager.coffee (L49-L50)
2018-01-24 17:20:30 +00:00
James Allen
3ed805a65a
Show different message if user comes from SL rather than OL v2
2018-01-24 16:56:51 +00:00
James Allen
626f652c77
Update User acceptance test helper to expose methods for modules
2018-01-24 16:56:31 +00:00
Alberto Fernández Capel
e42d1f9b13
Change heartbeat backoff logic
...
Send first two heartbeats at 0 and 30 secs, then increase the backoff
interval 1min per call until a maximun of 5min.
2018-01-24 16:05:53 +00:00
Alberto Fernández Capel
dd2e9d7431
Remove unused var
2018-01-24 15:37:16 +00:00
Alberto Fernández Capel
f0777f996c
Space editing sessions heartbeats with an increasing backoff
...
We send the first heartbeat as soon as the session start.
The next ones are sent (if there's any activity)
when the editing session is about 30 and 60 seconds.
Then at 2min, 3min, 4min, 5min and later on every 5min.
The backoff is not reset, so if due to inactivity the
session expires in the server the backoff will still be
the same.
2018-01-24 15:22:41 +00:00
Brian Gough
ec93cedf27
rename checkElementName to checkValidElementName
2018-01-24 10:07:42 +00:00
Brian Gough
2a0b0d3a87
only need to load rootFolder from project
2018-01-24 10:07:42 +00:00
