github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity
6612 commits 3 branches 7 tags 201 MiB
Commit graph

6368 commits

Author SHA1 Message Date
Paulo Reis
78eb56a262 Increase resizer width; decrease hit area. 2018-03-20 16:11:09 +00:00
James Allen
27fac4029c Make margins consistent with col margins 2018-03-20 14:46:15 +00:00
James Allen
01343b8419 Remove console.log line 2018-03-20 14:21:34 +00:00
Henry Oswald
a4c6cd208c validate captcha on every email addition 2018-03-20 13:53:16 +00:00
James Allen
a023512872 Collapse panel with v1 info 2018-03-20 13:50:51 +00:00
Jessica Lawshe
5cc6fb8843 Send analytics event after submitting group inquiry form 2018-03-20 08:31:35 -05:00
Jessica Lawshe
89cfd98af3 Add details to analytics label 2018-03-20 08:31:35 -05:00
Jessica Lawshe
d7756ea2de Add event tracking for upgrade button 2018-03-20 08:31:34 -05:00
Jessica Lawshe
47696ea3f1 Correct analytics label and send event when group modal opened 2018-03-20 08:31:34 -05:00
Shane Kilkelly
e50fef151f Add uniExternalCollaboration proxy to AnalyticRouter 2018-03-20 13:19:51 +00:00
James Allen
3551f1453b Use flexible height v2 message panel 2018-03-20 12:15:18 +00:00
James Allen
d8ed0e5277 Allow v2 notification banner to be dismissed 2018-03-20 12:15:18 +00:00
James Allen
161d7b1d9d Disable beta program pages 2018-03-20 12:03:48 +00:00
James Allen
10aa4a29ca Set ga cookie domain to same as site 2018-03-20 11:54:03 +00:00
Alasdair Smith
c6fd5daf02 Remove rich text from OSS 2018-03-20 11:23:15 +00:00
Alberto Fernández-Capel
f73c3c6e1d Merge pull request #413 from sharelatex/afc-npm-shrinkwrap 
Clean up npm-shrinkwrap.json
 2018-03-20 09:56:28 +00:00
Alberto Fernández-Capel
f9ba4ea467 Merge pull request #414 from sharelatex/afc-retries-with-exp-backoff 
Use exponential backoff in request retries to analytics
 2018-03-20 09:55:07 +00:00
Alasdair Smith
e9ba73138e Fix webpack config so that it's more consistent 2018-03-19 14:47:25 +00:00
Alberto Fernández Capel
132b31c39f Increase timeout 2018-03-19 14:46:18 +00:00
Alberto Fernández Capel
f2fc999ce4 Extract method to add common params 2018-03-19 10:30:06 +00:00
Alberto Fernández Capel
07b0f37579 Log errors in requests to analytics 2018-03-19 09:56:44 +00:00
Hayden Faulds
57de597e60 404 when resyncing deleting projects 2018-03-16 15:26:19 +00:00
Hayden Faulds
482d140716 add overleaf to projection 2018-03-16 13:29:22 +00:00
Alberto Fernández Capel
6609c10d36 Use exponential backoff to retry request to analytics 2018-03-15 17:14:50 +00:00
Hayden Faulds
d22d8324af disable history resync when project-history is not enabled 2018-03-15 16:57:39 +00:00
Alberto Fernández Capel
a2ec6849dd Clean up npm-shrinkwrap.json 
I followed these steps (from master, in the docker dev env):

 - rm -rf node_modules/*
 - npm install
 - npm shrinkwrap --dev
 2018-03-15 12:23:40 +00:00
Alasdair Smith
2e0804c728 Fix opts not passed to buildJsPath 2018-03-15 12:15:00 +00:00
Alasdair Smith
4d79c68f41 Rename webpack prod compile to minify_es and run as part of minify step 
Fixes issue where webpack prod files were wiped after running minify on CI
 2018-03-15 11:29:36 +00:00
Alasdair Smith
7e990dc67e Use global var for underscore 
This is simpler than extracting as an external, though less explicit, as
getting webpack & AMD to play nice is hard
 2018-03-15 09:42:26 +00:00
Alasdair Smith
fe3636c714 Ignore compiled es directory 2018-03-15 09:42:26 +00:00
Alasdair Smith
44998c05df Prod webpack outputs to minjs dir 2018-03-15 09:42:26 +00:00
Alasdair Smith
408c195c6a Instead of using webpack chunk hashing, use existing system 2018-03-15 09:42:26 +00:00
Alasdair Smith
8537c7b9b6 Add production webpack npm script 2018-03-15 09:42:26 +00:00
Alasdair Smith
4a801d266e Copy paste some prod webpack config from v1 2018-03-15 09:42:26 +00:00
James Allen
de94e33b5d Merge pull request #397 from sharelatex/ja-fix-project-upload 
Add files to project in series to avoid lock contention
 2018-03-13 13:33:16 +00:00
James Allen
371caa41ca Merge pull request #378 from sharelatex/hof-history-resync 
resync project history endpoint
 2018-03-13 13:33:08 +00:00
James Allen
d9b301023a Use eachSeries rather than a job array 2018-03-13 13:30:06 +00:00
James Allen
33904fe7be Add files to project in series to avoid lock contention 2018-03-13 13:21:48 +00:00
Alasdair Smith
1f7ef3ad6e Merge pull request #393 from sharelatex/as-fix-cm-sharejs 
Fix CM/ShareJS adapter from throwing error when deleting
 2018-03-13 11:21:52 +00:00
Alasdair Smith
458506ff66 Merge pull request #394 from sharelatex/as-karma-fake-img 
Handle fake images in karma, preventing 404 warnings
 2018-03-13 11:21:22 +00:00
Alasdair Smith
41d8a50a8e Merge pull request #385 from sharelatex/sk-add-recent-team-activity-proxy 
Add a proxy to `AnalyticsRouter` for `/recentTeamActivity`
 2018-03-13 11:20:55 +00:00
Alasdair Smith
8abf3593fb Prevent CM/Sharejs adapter from overwriting value in editor 2018-03-13 11:16:56 +00:00
Alasdair Smith
9cf9a7e4fc Fix CM/ShareJS adapter using old CM api 
Fixes bug where deleting text in CM would throw an error in some
circumstances
 2018-03-13 11:16:49 +00:00
Alasdair Smith
ef0b550234 Handle fake images in karma, preventing 404 warnings 2018-03-12 15:06:58 +00:00
Shane Kilkelly
2ceb7daa97 Merge pull request #361 from sharelatex/ta-record-new-project-event 
Record New Project Event
 2018-03-12 13:11:20 +00:00
Shane Kilkelly
9dc8600588 Add a unit test for the analytics events sent from project-creation 2018-03-12 10:50:15 +00:00
Hayden Faulds
a7945e9b96 extra logging for DocumentUpdaterHandler 2018-03-09 11:16:35 +00:00
Hayden Faulds
75f5fbcdbf refactor DocumentUpdaterHandler 2018-03-09 11:15:18 +00:00
Hayden Faulds
af9cc28419 additional logging 2018-03-09 11:11:06 +00:00
Hayden Faulds
792e8bbd7e fix route name 2018-03-09 11:11:06 +00:00
Hayden Faulds
9ab0ded8f1 update project history resync url 2018-03-09 11:11:06 +00:00
Hayden Faulds
5b2e7d981a resyncProject -> resyncProjectHistory 2018-03-09 11:11:06 +00:00
Hayden Faulds
50fdfec6e8 add unit tests for project history resync 2018-03-09 11:11:06 +00:00
Hayden Faulds
926f91dd3b wrap project resync in project structure lock 2018-03-09 11:11:06 +00:00
Hayden Faulds
4d2f0218af add resync project history endpoint 2018-03-09 11:11:06 +00:00
Henry Oswald
5b51d190c7 Update navbar.less 2018-03-08 09:56:23 +00:00
Henry Oswald
2abafdbf64 added padding-top for system messages 2018-03-07 17:27:32 +00:00
Alasdair Smith
8bde5120dd Change frontend test commands so its easier to run locally in debug mode 2018-03-07 09:52:08 +00:00
Alasdair Smith
9ed4f121b1 Append fixture el to actual DOM 2018-03-07 09:51:54 +00:00
Tim Alby
d5109d22d2 record both project-created and project-imported events 2018-03-06 18:26:25 -05:00
Tim Alby
4b291fab2a Record new project event 2018-03-06 18:13:24 -05:00
Shane Kilkelly
f6e66b9346 Add a proxy to AnalyticsRouter for /recentTeamActivity 2018-03-06 16:21:28 +00:00
Alasdair Smith
8781023b80 Merge pull request #380 from sharelatex/as-eslint-warning 
Remove eslint from webpack compile
 2018-03-06 14:41:04 +00:00
Shane Kilkelly
84fff5e9b7 Merge pull request #379 from sharelatex/sk-geolocate-user-sessions 
Geolocate user, and pass country-code to editing-sessions
 2018-03-06 11:33:50 +00:00
Alasdair Smith
2453e55ebb Remove eslint loader 
After using the webpack set up a bit more, having linting block compiles in
dev is more annoying than helpful. Linting pre commit is more valuable
 2018-03-06 11:18:40 +00:00
Shane Kilkelly
7d81c42b9c More explicit handling of empty-string country-code 2018-03-06 10:32:28 +00:00
Shane Kilkelly
feee992b43 Reverse an un-necessary re-arrangement of tests 2018-03-06 10:13:39 +00:00
Alasdair Smith
6d9a7e90f5 Add simple fixtures support 2018-03-06 10:11:04 +00:00
Shane Kilkelly
97d181c3f9 Reverse an un-necessary change 2018-03-05 13:24:54 +00:00
James Allen
f94105b1e9 Remove debug lines 2018-03-05 11:31:24 +00:00
James Allen
e77168d791 Don't render URL section if not linked file 2018-03-05 11:21:31 +00:00
Shane Kilkelly
b3f47ea44a Remove obsolete segmentation payload in editing-session request 2018-03-05 11:15:41 +00:00
Shane Kilkelly
f625b22ec5 Move the geolocation out of login, to the editingSession action 2018-03-05 10:46:51 +00:00
James Allen
d92c3e8b55 Logging and error message tweaks 2018-03-05 10:37:53 +00:00
James Allen
d4025908b7 Add in enabledLinkedFileTypes setting 2018-03-05 10:37:53 +00:00
James Allen
a99f55891f Use external proxy 2018-03-05 10:37:53 +00:00
James Allen
cae09028ff Fix tests 2018-03-05 10:37:53 +00:00
James Allen
6848e97a82 Hook up refresh button to backend 2018-03-05 10:37:00 +00:00
James Allen
9733223840 Show linked file status in front end 2018-03-05 10:37:00 +00:00
James Allen
01d84bd983 Handle error cases when downloading URL 2018-03-05 10:37:00 +00:00
James Allen
b1dda931f4 Add in modal for creating linked URL file 2018-03-05 10:37:00 +00:00
James Allen
85f25b810c First pass at URL based linked files 2018-03-05 10:37:00 +00:00
Brian Gough
3bbd49c7eb Merge pull request #377 from sharelatex/bg-add-project-structure-version-number 
add project structure version number
 2018-03-05 08:41:14 +00:00
Shane Kilkelly
bbe15a3ff3 Remove stray log 2018-03-02 12:06:18 +00:00
Shane Kilkelly
1629f68d5e Geolocate user on login, and pass country-code to editing-sessions 2018-03-02 12:02:45 +00:00
Alasdair Smith
87a0942b3c Copy paste LatexMode tests from v1 and switch assertions to chai 2018-03-02 10:43:56 +00:00
Alasdair Smith
68d85f03c2 Clean up frontend stub 2018-03-02 10:41:58 +00:00
Alasdair Smith
40678cd91a Remove erroneous reporter config, missing during merge conflict 2018-03-02 10:41:58 +00:00
Alasdair Smith
ec5b31663f Configure babel to not compile ES6 imports/exports 
Webpack can automatically handle the transpilation of ES6 imports to ES5. It
can also better optimize transpilation as raw ES6 imports can be tree-shaken
better.
 2018-03-02 10:41:58 +00:00
Alasdair Smith
3677dc9a8b Rename to use CM naming consistently 2018-03-02 10:41:58 +00:00
Alasdair Smith
027ab1250a Configure CM with latex parser 2018-03-02 10:41:58 +00:00
Brian Gough
14713aa393 added comment about project version 2018-03-01 15:15:09 +00:00
James Allen
a5480e5f9e Merge pull request #376 from sharelatex/ja-restrict-backslash 
Don't allow backslashes in file names
 2018-03-01 15:10:05 +00:00
Brian Gough
af494dedf2 check project structure version in unit tests 2018-03-01 12:32:09 +00:00
Brian Gough
e6020e2e9b update acceptance tests to include project structure version 
this tests the version sent to the docupdater
 2018-03-01 12:32:09 +00:00
Brian Gough
389f2d64ef prepare tests for versioning 2018-03-01 12:32:09 +00:00
Brian Gough
792c0135a0 update acceptance tests helper to include version 2018-03-01 12:32:09 +00:00
Brian Gough
f7e70e8228 add acceptance tests 2018-03-01 12:32:09 +00:00
Brian Gough
12911598de send current project structure version to docupdater 2018-03-01 12:32:08 +00:00
Brian Gough
98f50919e8 comment about file replacements 2018-03-01 12:32:08 +00:00
Brian Gough
67d784a74a increment project version on every structure change 2018-03-01 12:32:08 +00:00
Brian Gough
470d67a3aa avoid exception in error message when project undefined 2018-03-01 12:31:51 +00:00
Brian Gough
cb35da3cf7 increment a project version number on every change in folder structure 2018-03-01 12:17:33 +00:00
James Allen
becb76d69b Don't allow backslashes in file names 2018-03-01 11:42:44 +00:00
Alasdair Smith
7ea164ef77 Add max line length rule, defaults to 80 chars 2018-02-28 12:15:53 +00:00
Alasdair Smith
6f58c60026 Configure eslint to be more friendly to chai assertions 2018-02-28 12:15:53 +00:00
Alasdair Smith
45e7482335 Install chai-expect and chai-friendly eslint plugins 2018-02-28 11:45:10 +00:00
Alasdair Smith
1f450085e9 Fix mocha complaining about returning Promise-like object 2018-02-27 15:57:40 +00:00
Alasdair Smith
f11f208772 Revert "Revert "Upgrade to mocha 5.0.1"" 2018-02-27 15:03:21 +00:00
Alasdair Smith
315587605c Revert "Upgrade to mocha 5.0.1" 2018-02-27 12:25:42 +00:00
Alasdair Smith
4524b3c9f6 Use mocha environment and expect global to fix linting in tests 2018-02-27 11:34:02 +00:00
Alasdair Smith
4c2790a71b Merge pull request #366 from sharelatex/as-upgrade-mocha 
Upgrade to mocha 5.0.1
 2018-02-27 11:06:34 +00:00
Alasdair Smith
864bf771a4 Merge pull request #362 from sharelatex/as-linting 
Linting new ES code
 2018-02-27 11:06:11 +00:00
Alasdair Smith
2a2eb23c78 Fix bug where tests from new ES code being included in requirejs wrapped code 2018-02-26 16:56:04 +00:00
Alasdair Smith
19cec9451d Switch to using scoped variable instead of variables on context 
Changes to mocha mean that a new context is passed to each describe block
instead of it persisting between them.

This means that this test cannot be parallelised, however this was the case
beforehand (subsequent tests are dependent on earlier tests).
 2018-02-26 15:31:41 +00:00
Alasdair Smith
3217a3fbf0 Fix mocha complaining about returning Promise-like object 2018-02-26 15:31:34 +00:00
Alasdair Smith
bd7e4908a2 Force mocha to exit after tests run 2018-02-26 15:30:56 +00:00
Alasdair Smith
46ac74a160 Fix incorrectly scoped variable 2018-02-26 14:26:04 +00:00
Alasdair Smith
2247e4d465 Fix scoping issues where stubs were defined in wrong describe blocks 2018-02-26 14:21:14 +00:00
Alasdair Smith
abf53625fe Fix scope not being applied through callback 2018-02-26 14:02:08 +00:00
Alasdair Smith
136fd84810 Fix module stub in incorrect scope 2018-02-26 13:52:58 +00:00
Alasdair Smith
be6fa346d5 Fix bug where incorrect variable was used 2018-02-26 13:37:17 +00:00
Alasdair Smith
ec7237b7e8 Fix callback stub being defined in wrong scope 2018-02-26 12:33:48 +00:00
Alasdair Smith
2529ed756a Fix callback being defined in wrong describe block 2018-02-26 12:27:54 +00:00
Alasdair Smith
fd8c61985f Fix bug where stubs were attached to undefined variables 2018-02-26 12:19:56 +00:00
Alasdair Smith
5d017beac5 Fix stub incorrectly overriding top level beforeEach 2018-02-26 11:46:06 +00:00
Brian Gough
38cb2885d8 Merge pull request #364 from sharelatex/bg-support-debug-mode 
add support for debugging
 2018-02-26 11:34:29 +00:00
Alasdair Smith
cfc9dbdbb3 Fix bad scoping of user agent 2018-02-26 11:34:08 +00:00
Alasdair Smith
34b53726d4 Fix error not being defined in wrong describe block 2018-02-26 11:19:52 +00:00
Alasdair Smith
192eb8b44f Fix error not being defined in wrong describe block 2018-02-26 11:16:04 +00:00
Alasdair Smith
d79e226a20 Fix callback defined in wrong describe block scope 2018-02-26 10:58:20 +00:00
Brian Gough
18cd5a5e54 ignore sourcemap for app.js 2018-02-26 09:51:37 +00:00
Brian Gough
bc37003769 use COFFEE_OPTIONS by default 2018-02-26 09:50:23 +00:00
Alasdair Smith
e6f624c7a0 Make sure mocha exits 2018-02-23 17:16:46 +00:00
Alasdair Smith
22b8c114a2 Upgrade mocha to latest 2018-02-23 17:00:29 +00:00
James Allen
1f62df17c8 Merge pull request #363 from sharelatex/ja-guest-track-changes 
Tidy up logic (a bit) around guest track changes
 2018-02-23 14:41:12 +00:00
Alasdair Smith
cba07f79ee Run linting on CI 2018-02-23 11:44:43 +00:00
Brian Gough
42b701fd34 use the make automatic variable @D for the target directory name 2018-02-23 11:43:10 +00:00
Alasdair Smith
325f91ed2e Add scripts for running linting 2018-02-23 11:41:21 +00:00
Brian Gough
d364bfc353 add support for debugging 2018-02-23 11:36:08 +00:00
Alasdair Smith
3b3f967198 Ignore some top level files 2018-02-23 11:31:47 +00:00
Alasdair Smith
94b7cdcae0 Fix linting 2018-02-23 11:29:54 +00:00
Alasdair Smith
61a60c04a6 Webpack uses eslint on compile 2018-02-23 11:25:01 +00:00
Alasdair Smith
24ddb46b95 Configure eslint 2018-02-23 11:25:01 +00:00
Alasdair Smith
45bcbf9eb1 Install eslint & standard 2018-02-23 11:25:01 +00:00
Alasdair Smith
4e4d9aee89 Configure karma to use webpack for new ES file 2018-02-23 11:09:24 +00:00
Alasdair Smith
6b0b96a357 Install karma-webpack 2018-02-23 11:06:12 +00:00
Alasdair Smith
85ceab5310 Tear down Ace session when aceEditor is destroyed 
This cleans up the Ace worker that parses syntax, preventing a memory leak
 2018-02-23 10:13:24 +00:00
Alasdair Smith
5e39e61c9b Merge pull request #348 from sharelatex/as-fix-cm-share 
Fix CodeMirror/ShareJS binding when switching docs
 2018-02-23 10:12:12 +00:00
Alasdair Smith
92260e7b52 Merge pull request #340 from sharelatex/ja-remove-brand 
Remove the public/brand folder
 2018-02-23 10:11:47 +00:00
Alasdair Smith
25488456a5 Merge pull request #359 from sharelatex/as-mocha-reporter 
Switch to karma-mocha-reporter
 2018-02-23 10:11:23 +00:00
James Allen
1d3db923f0 Tidy up logic (a bit) around guest track changes 2018-02-23 09:55:57 +00:00
Paulo Jorge Reis
70da6ad89a Merge pull request #355 from sharelatex/pr-fix-front-chat-widget-config 
Update Front chat widget according to latest config changes.
 2018-02-22 15:49:32 +00:00
Alasdair Smith
8fa343bc94 Uninstall unused karma-tap-reporter dependency 2018-02-22 14:04:39 +00:00
Alasdair Smith
71e17460b7 Switch to mocha reporter 2018-02-22 14:04:22 +00:00
Alasdair Smith
27bfb1f02d Install karma-mocha-reporter 2018-02-22 14:02:14 +00:00
Alasdair Smith
29410b7aab Fix applyAsync from not evaluating expression in tests 
See https://github.com/angular/angular.js/issues/10788#issuecomment-70376834
which explains that applyAsync is scheduled to evaluate in the next tick, but
this is managed by $browser. Therefore we can manually flush the trigger
 2018-02-22 13:28:16 +00:00
Alasdair Smith
791c126df6 Fix test to match implementation 2018-02-22 12:09:51 +00:00
Alasdair Smith
2be37795bd TODO for cleaning up sharejs callbacks 2018-02-22 11:44:09 +00:00
Alasdair Smith
598837e17c Use applyAsync to prevent issue when switching docs 2018-02-22 11:44:09 +00:00
Alasdair Smith
c5735a31df Remove unused listener 2018-02-22 11:44:09 +00:00
Alasdair Smith
e1187f3d8a Listen for changes to the CodeMirror Doc, instead of all changes to the editor 
This prevents an issue where switching docs (i.e. files) would cause the newly
opened doc from being inserted into the old doc.

This approach is similar to Ace's sessions.
 2018-02-22 11:44:09 +00:00
Alasdair Smith
c85e9ba3b1 Instead of setting value of CM, swap Docs 
This allows for tracking changes on individual docs (i.e. files), instead of
just changes to the editor. This is similar to how Ace works with sessions
 2018-02-22 11:44:09 +00:00
Alasdair Smith
eae8b5a592 Merge pull request #330 from sharelatex/as-karma-tests 
Karma tests
 2018-02-22 11:06:56 +00:00
Paulo Reis
1b7d3917ed Update Front chat widget according to latest config changes. 2018-02-21 14:58:00 +00:00
James Allen
0371aaaf05 Merge pull request #352 from sharelatex/hof-lock-metrics 
Improve lock metrics
 2018-02-21 13:52:08 +00:00
Paulo Reis
12233a23c9 Avoid erroring if the front object is undefined. 2018-02-21 13:39:39 +00:00
Paulo Reis
f1a36919f9 Make sure the widget does not overlap the footer. 2018-02-21 13:39:39 +00:00
Paulo Reis
978a8eae59 Move files around. 2018-02-21 13:39:39 +00:00
Paulo Reis
ef119402cf Add Front chat widget. 2018-02-21 13:39:39 +00:00
Hayden Faulds
adc90b68e7 use gauge not inc 2018-02-21 13:25:25 +00:00
Shane Kilkelly
b19f7a6ea3 Re-add template id fields to Project model. 
The original pull request (/web-sharelatex-internal/pull/324) had to be reverted
because of a failing test. This just re-adds the fields
 2018-02-20 14:19:54 +00:00
Hayden Faulds
584cd71173 fix exceeded lock timeout logging 
we were logging this after failing to get the lock, this stops that
 2018-02-20 14:03:45 +00:00
Alasdair Smith
f529137db0 Clean frontend tests 2018-02-20 14:01:50 +00:00
Alasdair Smith
8da5c535ec Run frontend unit tests in separate unit tests as they spawn their own docker containers 2018-02-20 14:01:50 +00:00
Alasdair Smith
00f1450b94 Rename test files to match source directory and name 2018-02-20 14:01:50 +00:00
Alasdair Smith
c7957b8ad4 Convert existing frontend tests to run in karma 2018-02-20 14:01:50 +00:00
Alasdair Smith
3faa0556e8 Add test for cmEditor directive 2018-02-20 14:01:50 +00:00
Alasdair Smith
24ec7b77ab Convert frontend test runs to use Docker/karma 2018-02-20 14:01:50 +00:00
Alasdair Smith
ff7e016227 Add frontend test docker config 
Adds Dockerfile to make headless Chrome image
 2018-02-20 14:01:02 +00:00
Alasdair Smith
89c9475d29 Configure karma to load angular, requirejs and test/source files 
Use test-main.js file to configure requirejs so that AMD loader can be
used
 2018-02-20 14:01:02 +00:00
Alasdair Smith
0b77e97df2 Added angular mocks for testing and stub out globals 2018-02-20 14:01:02 +00:00
Alasdair Smith
d37b238c9e Add karma config 2018-02-20 14:01:02 +00:00
Alasdair Smith
289500082a Install karma & it's dependencies 2018-02-20 14:00:57 +00:00
Hayden Faulds
d924dbd1ed improve metrics 2018-02-20 13:58:09 +00:00
Shane Kilkelly
05faf06f59 Revert "Add template id fields to project model" 2018-02-20 13:51:30 +00:00
Shane Kilkelly
57d50a68f8 Merge pull request #324 from sharelatex/hob-add-template-fields-to-project 
Add template id fields to project model
 2018-02-20 13:40:11 +00:00
Alasdair Smith
ff88b0adaf Merge pull request #346 from sharelatex/as-fix-cursor 
Fix bug where cursor position wouldn't be saved when switching documents
 2018-02-20 12:01:58 +00:00
Hayden Faulds
d750f942de fix: stop pass milis not seconds into setTimeout 2018-02-20 10:26:24 +00:00
Hayden Faulds
e50c3837bc add extra metrics around locking 2018-02-19 12:15:02 +00:00
Alasdair Smith
fafbbfef87 Fix bug where cursor position wouldn't be saved when switching documents 
This was caused by an underlying bug/poor optimisation where the aceEditor
directive would be reconstructed every time when switching between documents.
This wiped instances like CursorPositionManager which relies on keeping state
between doc changes.

Now the directive is only removed when switching between Ace and CM. This
prevents other potential bugs and improves performance.
 2018-02-19 11:45:00 +00:00
Hayden Faulds
23c7ab0529 add locking tests 2018-02-16 16:57:12 +00:00
Hayden Faulds
dd582d1b2e type-check ProjectGetter.getProject and getProjectWithoutLock arguments 2018-02-16 14:44:21 +00:00
Hayden Faulds
693c8e8c60 move where lock keys are defined 2018-02-16 14:44:21 +00:00
Hayden Faulds
a05d172052 clean up variable names in ProjectGetter.getProject 2018-02-16 14:44:21 +00:00
Hayden Faulds
66cd5cd24b use ProjectGetter.getProject in other ProjectGetter methods 2018-02-16 14:44:21 +00:00
Hayden Faulds
95b82a3c9d use ProjectGetter in ProjectLocator.findElementByPath 2018-02-16 14:44:21 +00:00
Hayden Faulds
cbc6fb232d add mongo transaction lock when getting or updating projects 2018-02-16 14:44:21 +00:00
Brian Gough
fc1e94b14a Merge pull request #343 from sharelatex/bg-block-javascript-property-names 
block javascript property names being used as file names
 2018-02-16 14:07:12 +00:00
Brian Gough
2ba7db603f Merge pull request #337 from sharelatex/ja-allow-javascript-property-names 
Use bare objects without prototypes for tracking filenames
 2018-02-16 14:05:21 +00:00
Hayden Faulds
eb198cd8c3 make getSafePathname a method in CompileController rather than Project 2018-02-16 13:10:48 +00:00
Hayden Faulds
5456f4224c Merge pull request #339 from sharelatex/hof-project-getter 
use ProjectGetter rather than Project directly
 2018-02-16 11:34:21 +00:00
Brian Gough
8a10e98b56 block javascript property names being used as file names 2018-02-16 10:31:47 +00:00
Paulo Reis
3f14a727e3 Make sure the hamburger menu plays well with the brand. 2018-02-16 10:26:26 +00:00
Hayden Faulds
304a6bc332 use ProjectGetter rather than Project directly 2018-02-16 08:55:09 +00:00
James Allen
20347da44d Ignore public/brand 2018-02-15 14:54:58 +00:00
James Allen
6f143603a3 Remove unused brand folder 2018-02-15 14:54:34 +00:00
Paulo Reis
51b14e412f Increase hamburguer menu max-height; 340px was less than SL menu fully expanded. 2018-02-15 11:51:45 +00:00
Paulo Reis
e2874998b3 Improve hamburguer menu in v2, still not perfect. 2018-02-15 11:46:40 +00:00
Paulo Reis
f01b027da0 Make sure the menu behaviour does not change in desktop resolutions. 2018-02-15 11:29:29 +00:00
Paulo Reis
058a58d099 Only apply horizontal paddings (to align with the header). 2018-02-15 11:12:32 +00:00
Paulo Reis
ebad9091c7 Create class to scope main header changes (avoids overriding too much Bootstrap stuff); apply styles. 2018-02-15 11:08:12 +00:00
James Allen
4754f1e78a Use bare objects without prototypes for tracking filenames 2018-02-15 11:06:40 +00:00
Paulo Reis
f1717bfa1f Allow header content to be on top of main content. 2018-02-15 10:58:36 +00:00
Hayden Faulds
aa89b7e70b Merge pull request #327 from sharelatex/hof-entity-refactoring 
Refactor ProjectEntityHandler
 2018-02-14 13:28:41 +00:00
hugh-obrien
5d1c2a9cf6 rename v1 template fields on project module 2018-02-14 11:07:38 +00:00
James Allen
a7fabb8e43 Merge pull request #321 from sharelatex/ja-recompile-tweaks 
Animate toolbar for auto-compile and consolidate trigger logic
 2018-02-14 09:34:16 +00:00
Hayden Faulds
9ed2d7f971 fix excess argument pass into UpdateMerger.p.processFile 2018-02-13 14:39:38 +00:00
Hayden Faulds
e9b218fe5f allow the updating of doc lines for deleted docs 2018-02-13 14:39:38 +00:00
James Allen
a427414920 Merge pull request #331 from sharelatex/ja-autocomplete-fix 
Potential fix for the auto-complete bug
 2018-02-13 09:41:00 +00:00
Shane Kilkelly
9c83ff5353 Merge pull request #316 from sharelatex/afc-fix-typo-in-path 
Update analytics manager to use new path
 2018-02-13 09:39:09 +00:00
Shane Kilkelly
9a7b3c2b23 Merge pull request #320 from sharelatex/sk-retry-analytics-requests 
Add a retry to analytics requests
 2018-02-13 09:38:56 +00:00
James Allen
29d2b408ad Don't error when detaching from history with no sharejsDoc 2018-02-13 08:43:00 +00:00
James Allen
5d3ecdb924 Add explicit editor init event 2018-02-13 08:27:48 +00:00
James Allen
3802df5cfa Use popup instance variable like Ace autocompleter does 2018-02-13 08:27:41 +00:00
Hayden Faulds
2f9f26eae2 fix logging 2018-02-12 16:05:34 +00:00
Shane Kilkelly
0efc8136cb Use requestretry node package 2018-02-12 15:16:21 +00:00
Hayden Faulds
29018d5af6 run make clean before compile_full on CI 2018-02-12 13:34:00 +00:00
Hayden Faulds
458bbc7cfd refactor ProjectEntityHandler 
- moves project locking into ProjectEntityHandler
- splits ProjectEntityHandler into ProjectEntityHandler,
  ProjectEntityUpdateHandler and ProjectEntityMongoUpdateHandler
- adds upsertDoc/upsertFile and upsertDocWithPath/upsertFileWithPath to
  EditorController and ProjectEntiyUpdateHandler
 2018-02-12 13:33:59 +00:00
James Allen
5d6925921c Fix read only links 2018-02-12 10:42:57 +00:00
Brian Gough
5fef846a6c Merge pull request #323 from sharelatex/bg-translate-error-message-for-duplicate-names 
add translation for new doc/folder  "already exists" error
 2018-02-12 10:08:46 +00:00
Brian Gough
3c9eb07848 Merge pull request #322 from sharelatex/bg-validate-filename-length-client 
validate filename length client
 2018-02-12 10:08:03 +00:00
hugh-obrien
ea736390a1 add template id fields to project model 2018-02-11 16:58:45 +00:00
James Allen
92e59f7008 Remove unneeded apply 2018-02-09 17:58:19 +00:00
James Allen
ab940fb462 Fix typo in comment 2018-02-09 17:54:58 +00:00
James Allen
9e86abbb04 Remove unneeded webkit prefix in css 2018-02-09 17:54:42 +00:00
Brian Gough
8e048bcf67 add translation for new doc/folder "already exists" error 2018-02-09 16:37:38 +00:00
Brian Gough
ecea3dd1be add an extra test for invalid element names 2018-02-09 15:13:58 +00:00
Brian Gough
2c2b6e5f36 fix filename length check 2018-02-09 15:05:52 +00:00
Alasdair Smith
6088fcf82b Merge pull request #310 from sharelatex/ja-link-sharing-tweaks 
Link sharing UX improvments
 2018-02-09 11:23:28 +00:00
Alasdair Smith
f109d5a56c Merge pull request #311 from sharelatex/ja-fix-template 
Fix typo and file extension in example tex template
 2018-02-09 11:23:20 +00:00
Alasdair Smith
7ff0f40477 Merge pull request #266 from sharelatex/as-cm 
CodeMirror
 2018-02-09 11:23:11 +00:00
Alasdair Smith
b7200066e9 Inject rich text variable to conditionally show rich text styles 2018-02-09 10:42:11 +00:00
Alasdair Smith
bfda9c595b Hide rich text behind feature flag 2018-02-09 10:42:11 +00:00
Alasdair Smith
4c23a3c8f0 Fix bug where spell check cache would error when toggling between ace & cm 2018-02-09 10:42:11 +00:00
Alasdair Smith
d15efc6fb6 Create cmEditor directive to connect to ShareJS 2018-02-09 10:42:11 +00:00
Alasdair Smith
b9327cb2d4 Add toolbar with button to toggle rich text 2018-02-09 10:42:00 +00:00
Alasdair Smith
7783e18a50 Allow Documents to be attached to CM 2018-02-09 10:38:51 +00:00
Alasdair Smith
09fbafa1f6 Include ShareJS CM adapter in compiled lib and fix bug with CM adapter 
Because the CM & Ace scripts are naively concat-ed together, the Ace
applyToShareJS function would be overwritten by the CM version.

Also fixes bugs where adapter was calling old version of ShareJS api
and the old CM api
 2018-02-09 10:38:51 +00:00
Alasdair Smith
f5b6d3ff3e Load basic CM instance with dummy content 2018-02-09 10:38:51 +00:00
Henry Oswald
ba1e45d12c Merge pull request #317 from sharelatex/ho-nice-recaptcha-message 
improved recaptcha error message
 2018-02-09 10:26:33 +00:00
Alasdair Smith
d8e87997c1 Install codemirror 2018-02-09 10:02:36 +00:00
Henry Oswald
ccffdc3265 added blog url to config 2018-02-08 14:47:54 +00:00
James Allen
bd9f30d858 Adjust icon spacing in PDF toolbar 2018-02-08 14:41:39 +00:00
James Allen
7866a91d21 Refactor auto-compile trigger logic 2018-02-08 13:39:59 +00:00
James Allen
5bf2ff0a47 Show animated bar while auto-compile is pending 2018-02-08 13:39:56 +00:00
Shane Kilkelly
8117061674 Make the retry-on-fail behaviour optional 2018-02-08 13:04:47 +00:00
Shane Kilkelly
1c15e0966c Add a retry to analytics requests 2018-02-08 11:42:48 +00:00
Henry Oswald
696e9d27d6 send invalid_email error type down when sharing project 2018-02-08 10:35:18 +00:00
Brian Gough
14ef9a2c49 comment out broken length check 2018-02-08 10:08:22 +00:00
Brian Gough
cba4a391a9 Merge pull request #314 from sharelatex/bg-validate-filenames-server 
server side check for valid filenames
 2018-02-08 09:16:31 +00:00
Brian Gough
9224e164fe Merge pull request #315 from sharelatex/bg-validate-filenames-client 
validate filenames on the client
 2018-02-08 09:16:05 +00:00
Brian Gough
b083e4bc5f remove redundant MAX_PATH definition 2018-02-07 16:14:56 +00:00
Brian Gough
c14380d563 use the SafePath.coffee file in the client too 2018-02-07 15:50:29 +00:00
Brian Gough
9c36b38e2c make SafePath.coffee shareable between client and server code 2018-02-07 15:43:56 +00:00
Brian Gough
57549d32be remove unused path module 2018-02-07 15:28:26 +00:00
Brian Gough
2a5ed0caf5 use Errors.InvalidName instead of plain Error object 2018-02-07 15:22:00 +00:00
Brian Gough
c6f74d24f1 add missing SafePath.clean function 2018-02-07 15:21:04 +00:00
Henry Oswald
df9b866bee remove 'script blocker' from recaptcha message 2018-02-07 14:24:15 +00:00
Henry Oswald
b387ca3b2a change wording on recaptcha to JLM's option 2018-02-07 14:19:33 +00:00
Henry Oswald
a52aed9070 improved recaptcha error message 
- works on register and share project
- decided not to go down i18n for register, would be scope creep on async form
 2018-02-07 14:15:13 +00:00
Shane Kilkelly
a06c4003f9 Merge pull request #312 from sharelatex/sk-add-from-v2-flag-to-analytics 
Add a `fromV2` flag to Analytics events, when coming from V2 instance
 2018-02-07 09:48:11 +00:00
Alberto Fernández Capel
413e81f29a Update analytics manager to use new path 
It fixes a typo in the path.

Related to https://github.com/sharelatex/analytics-sharelatex/pull/43
 2018-02-07 09:39:00 +00:00
James Allen
5edeff36b6 Vertically center caret 2018-02-06 16:22:20 +00:00
Brian Gough
76281a3d79 use extended file validation rules in frontend 2018-02-06 11:46:50 +00:00
Brian Gough
ddf1d6e65e add valid-file directive for front-end 2018-02-06 11:46:50 +00:00
Brian Gough
7f727d434e server side check for valid filenames 2018-02-06 10:44:58 +00:00
Alasdair Smith
e93e055b13 Merge pull request #309 from sharelatex/ja-tags-folders-tweaks 
UX tweaks to tags/folders side bar entry
 2018-02-06 10:36:15 +00:00
Alasdair Smith
e3811d33e9 Merge pull request #302 from sharelatex/msw-history-failure 
Bail out if history API request fails
 2018-02-06 10:35:57 +00:00
Shane Kilkelly
6d8b50efc4 Add a fromV2 flag to Analytics events, when coming from V2 instance 2018-02-06 10:35:15 +00:00
James Allen
fc4ffc3905 Fix typo and file extension in example tex template 2018-02-06 10:27:10 +00:00
Alasdair Smith
0c2d7e250f Merge pull request #308 from sharelatex/as-upgrade-less 
Update Less/grunt-contrib-less to latest version
 2018-02-06 10:21:14 +00:00
James Allen
6a1597560e Remove unused modal templates 2018-02-06 10:16:06 +00:00
James Allen
4f89506afc Make link sharing more prominant 2018-02-06 10:06:32 +00:00
James Allen
37115b8408 Add loading indicator while server returns links 2018-02-06 10:00:59 +00:00
James Allen
e7ba75c2e5 Don't show pop-up when changing link sharing status 2018-02-06 09:56:46 +00:00
James Allen
3e5527b826 UX tweaks to tags/folders side bar entry 2018-02-05 17:04:56 +00:00
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
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
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
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