Paulo Reis
3c3bb0a892
Use globalVars strategy to do v2-specific styling.
2018-02-05 16:20:33 +00:00
Alasdair Smith
ed5f31b248
Update grunt-contrib-less to latest version
...
Note that this also updates less to 2.7.
This change is required so that variables can be injected by the Less
compiler. This is useful for allowing feature flags.
2018-02-05 15:52:56 +00:00
Alberto Fernández-Capel
c1b20a38dd
Merge pull request #307 from sharelatex/afc-fix-heartbeat-event
...
Ignore heartbeat event handler params
2018-02-05 14:04:21 +00:00
Alberto Fernández Capel
ae33b84289
Ignore heartbeat event handler params
...
They are not used for anything and the cause an error when
the handler is called from a scroll event.
2018-02-05 13:48:52 +00:00
James Allen
f20d36044b
Merge pull request #298 from sharelatex/as-fix-npm
...
Fix installation of babel
2018-02-02 11:04:22 +00:00
James Allen
799fe9eb8c
Merge pull request #301 from sharelatex/ja-fix-scope-issue
...
Fix undefined $scope error
2018-02-02 11:04:14 +00:00
James Allen
c89bbd7588
Merge pull request #296 from sharelatex/ja-show-v2-message
...
Show v2 message if awareOfV2 flag set
2018-02-02 11:04:06 +00:00
Michael Walker
5987d6d79c
Add unit tests for failing history API
2018-02-02 10:12:57 +00:00
Michael Walker
217940d76f
Fix failing unit tests
2018-02-02 10:12:57 +00:00
Michael Walker
e886217b85
Bail out if history API request fails
2018-02-02 10:12:54 +00:00
Hayden Faulds
9955fd570c
Merge pull request #299 from sharelatex/hof-tpds-locking
...
Project Locking: TPDS locking
2018-02-02 09:20:07 +00:00
James Allen
9e5c98dd07
Use local references to variable
2018-02-01 16:52:43 +00:00
Shane Kilkelly
5ff4493d6b
Merge pull request #300 from sharelatex/revert-295-msw-history-failure
...
Revert "Bail out if history API request fails"
2018-02-01 12:50:42 +00:00
Shane Kilkelly
6e2af763ec
Revert "Bail out if history API request fails"
2018-02-01 12:49:25 +00:00
Shane Kilkelly
19c97cb15b
Merge pull request #289 from sharelatex/afc-track-edit-sessions
...
Send editing session heartbeat to the analytics service
2018-02-01 12:31:38 +00:00
Shane Kilkelly
ba31df3dae
Merge pull request #295 from sharelatex/msw-history-failure
...
Bail out if history API request fails
2018-02-01 12:31:30 +00:00
Shane Kilkelly
b7226e6985
Add the metrics-web-module
2018-02-01 12:18:54 +00:00
Hayden Faulds
a9be50ebcd
stream request to file outside of project lock
2018-02-01 10:44:53 +00:00
Hayden Faulds
9496480a29
test project lock is taken
2018-02-01 10:44:53 +00:00
Hayden Faulds
22737e8bd6
group together tests
2018-02-01 10:44:53 +00:00
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
