Commit Graph

6073 Commits

Author SHA1 Message Date
Alberto Fernández Capel fef7601433 Early return only applies to fault tolerant request
We need to return the data to other requests like getLastOccurrence.
2018-03-23 10:02:11 +00:00
James Allen b1ca81bf2d Merge pull request #430 from sharelatex/ja-hide-v2-notification
Allow dismissing/hiding v2 and v1 banners
2018-03-22 16:33:02 +00:00
James Allen 363ab86b24 Merge pull request #375 from sharelatex/as-clean-up-sharejs
Clean up ShareJS
2018-03-22 16:32:52 +00:00
Alasdair Smith 3e4b8cd409 Clean up change listeners on sharejs 2018-03-22 16:32:25 +00:00
Jessica Lawshe ffbdb760c6 Merge pull request #417 from sharelatex/subscription-analytics
Subscription analytics
2018-03-22 08:47:42 -05:00
Henry Oswald 01d66ec208 Merge pull request #418 from sharelatex/ho-recaptcha-muli-email
validate captcha on every email addition
2018-03-21 14:09:05 +00:00
Shane Kilkelly 135854a0e0 Merge branch 'master' into ta-add-publisher-hub-analytics-proxy 2018-03-21 10:32:04 +00:00
Tim Alby 643f687640 Add recentV1TemplateIdsActivity proxy to AnalyticRouter 2018-03-20 17:32:45 -05: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
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