Commit graph

6442 commits

Author SHA1 Message Date
Jessica Lawshe
5d5edb7808 Button text for annual plan
Annual plan users are charged right away but `upgrade_cc_btn`
translates to `Upgrade now, pay after 7 days`.

Update the button for annual plans to use `upgrade_now`, which
translates to `Upgrade Now`
2018-04-23 11:34:34 -05:00
Jessica Lawshe
5365760994 Don't include v1 folders in "Add to folders" list 2018-04-23 11:34:10 -05:00
Jessica Lawshe
b6554fc309 Don't show dropdown for v1 folders 2018-04-23 11:34:10 -05:00
Jessica Lawshe
820f9c7acc Merge pull request #506 from sharelatex/as-document-event-emitter
Add documentation and tests of EventEmitter implementation
2018-04-23 11:33:40 -05:00
Alasdair Smith
152c816b5c Add documentation and tests of EventEmitter implementation 2018-04-23 11:01:19 +01:00
Alberto Fernández-Capel
5fb368d1f2 Merge pull request #505 from sharelatex/afc-travisci
Fix build in travisci
2018-04-23 10:50:59 +01:00
Alasdair Smith
ad1df3532f Merge pull request #490 from sharelatex/hof-deleted-project-history
Pass project history id with updates
2018-04-23 10:05:07 +01:00
Alasdair Smith
b0349af21d Merge pull request #493 from sharelatex/as-editor-toolbar
Add toggle switch directive to editor toolbar
2018-04-23 10:04:12 +01:00
Alasdair Smith
61648e1f19 Merge pull request #497 from sharelatex/as-naming-consistency
Include snake_case named file in frontend tests
2018-04-23 10:03:54 +01:00
Alberto Fernández Capel
4db146dd51 Do not specify node version in .travis.yml
That way, travis uses the version specified in .nvmrc
2018-04-19 12:30:31 +01:00
Alberto Fernández Capel
5d266c7f04 Show export user CSV even if the group has reached max capacity 2018-04-17 16:12:33 +01:00
Alasdair Smith
d524249fc8 Include snake_case named tests 2018-04-17 15:03:52 +01:00
James Allen
d9a7b1248a Re-order compile rate limits to do project/user check before everyone check 2018-04-17 14:43:54 +01:00
Henry Oswald
b5e6181c49 added .capitalised style 2018-04-17 11:26:02 +01:00
James Allen
37f009c3cd Remove blank test causing race condition 2018-04-17 10:00:06 +01:00
James Allen
87cc08569a Fix bad if statement sending doc open into infinite loop 2018-04-16 17:03:18 +01:00
James Allen
d6605610f5 Fix HistoryV2Manager front end tests 2018-04-16 16:31:49 +01:00
James Allen
d1b68ddf7c Fix RestoreManager unit tests 2018-04-16 16:27:24 +01:00
James Allen
9e525702c1 Merge branch 'master' into ja-restore-files 2018-04-16 16:14:31 +01:00
Henry Oswald
45f51c9a27 change country select to proper angular setup so pre population works
it may have been broken from an angular upgrade or similar.
2018-04-16 15:12:03 +01:00
Henry Oswald
e64c398352 capitalise month and year on payment page 2018-04-16 15:11:31 +01:00
Alasdair Smith
3af10733cc Replace hard coded rich text hashed file path with registration system 2018-04-16 14:14:49 +01:00
Henry Oswald
39e41681a0 change to plans[currencyCode]['symbol'] from price.currency.symbol
price.currency.symbol returns bad chars. '£12.00' and '€14.40' for
eur
2018-04-16 12:19:55 +01:00
Alasdair Smith
671a2c9767 Make content wrapper have main role 2018-04-16 11:43:24 +01:00
Alasdair Smith
3482724679 Make ide body have main role 2018-04-16 11:33:53 +01:00
Henry Oswald
086f080ee4 add !isFormValid(simpleCCForm) back in, was used during debugging 2018-04-16 11:01:14 +01:00
Henry Oswald
985d05a297 remove .has-error class, not used 2018-04-16 10:56:03 +01:00
Henry Oswald
c3eeefdc5b only use recurly.js from our public libs folder 2018-04-16 10:52:33 +01:00
Henry Oswald
7940b60144 make a seperate external error class which is used on entire payment form 2018-04-16 10:35:12 +01:00
Henry Oswald
06fb31533f add highlight for bad card/cvv/mmyy number in. 2018-04-16 10:26:39 +01:00
Henry Oswald
903a9db936 upgrade static recurly lib to 4.8.5 for plans page 2018-04-16 10:10:43 +01:00
Henry Oswald
a1be0e95b4 remove the dead validation 2018-04-16 10:10:25 +01:00
Alasdair Smith
4a12754d90 Mark visible toggle switch as hidden from screen readers 2018-04-16 10:07:46 +01:00
Alasdair Smith
0f70d526d9 Remove unused toggleRichText method 2018-04-16 09:42:26 +01:00
Alasdair Smith
a8c6ac1367 Style toggle switch 2018-04-16 09:36:32 +01:00
Alasdair Smith
591f341f5f Add switch-toggle directive 2018-04-16 09:36:10 +01:00
Henry Oswald
b1ee05de3e better styling, close to being deployable 2018-04-13 17:32:20 +01:00
Henry Oswald
e19a118ef4 poorly styled but almost viable 2018-04-13 17:26:05 +01:00
Henry Oswald
c050791905 change ng to use show/hide
ng-if doesn't render html until evaulated to true, need the form
to be there at time of recurly.configure
2018-04-13 16:57:33 +01:00
Henry Oswald
ccef0760ae remove the form control, it just breaks the iframe styling 2018-04-13 16:51:55 +01:00
Henry Oswald
ae3858bcd0 can subscribe using new form. terrible styling 2018-04-13 16:35:32 +01:00
Henry Oswald
7e8b59cbb3 wip form loads as ifram 2018-04-13 16:01:41 +01:00
Paulo Jorge Reis
9e40555c89 Merge pull request #487 from sharelatex/pr-fix-v2-togglers
Control the visibility of the custom toggler
2018-04-13 13:46:55 +01:00
Hayden Faulds
7755a7cc1f add overleaf to projections for project structure updates 2018-04-13 13:45:07 +01:00
Hayden Faulds
9ef40902ca send projectHistoryId with resync requests 2018-04-13 13:45:03 +01:00
Hayden Faulds
3006d018d9 send projectHistoryId with project structure updates 2018-04-13 13:45:03 +01:00
Hayden Faulds
e5f3c472e3 return projectHistoryId in DocumentController.getDoc 2018-04-13 13:45:02 +01:00
Jessica Lawshe
8d2c3ca6a1 Remove undefined controller 2018-04-12 11:53:31 -05:00
Jessica Lawshe
49222f11db Merge pull request #480 from sharelatex/jel-remove-old-exp
Remove old A/B experiments
2018-04-12 11:23:41 -05:00
Paulo Reis
35d7c96d04 Control the visibility of the custom toggler when panes are hidden externally. 2018-04-12 16:41:49 +01:00
Alberto Fernández Capel
1b8f4bff2f Ensure dump folder exists before running LinkedFiles tests
The folder is also created in another test, so it will work the second
time the tests are executed, but it fails the first time.
2018-04-12 10:29:24 -05:00
Jessica Lawshe
f9a56f7b37 Remove unknown experiments 2018-04-12 10:18:15 -05:00
Jessica Lawshe
be5f95ba69 Remove "history-discount" experiment 2018-04-12 10:18:15 -05:00
Jessica Lawshe
2301b83f22 Remove "teaser-dropbox-text" experiment 2018-04-12 10:18:15 -05:00
Jessica Lawshe
55cb5b3c70 Remove "teaser-history" experiment 2018-04-12 10:18:15 -05:00
Jessica Lawshe
5683f48d97 Fix conditional 2018-04-12 10:18:15 -05:00
Jessica Lawshe
f44ddcb928 Remove "plans-1610" experiment
There is 1 place that the variants appear still,
`/web/public/coffee/main/subscription-dashboard.coffee`. This should
remain for users that bought these plans.
2018-04-12 10:18:15 -05:00
Hayden Faulds
50686090c8 push doc pathname logic into DocController 2018-04-12 16:16:44 +01:00
Hugh O'Brien
2d3f169c49 Merge pull request #473 from sharelatex/hob-publish-modal-setup
Publish modal web setup
2018-04-12 14:01:18 +01:00
Alasdair Smith
c87cb1d361 Basic styles for editor toolbar 2018-04-12 13:46:19 +01:00
Brian Gough
4115a35773 Merge pull request #445 from sharelatex/bg-separate-uploads-and-locking
replace files and separate uploads and locking (connects to overleaf/sharelatex#422)
2018-04-12 09:52:02 +01:00
Alasdair Smith
d3d7bde6ef Merge pull request #482 from sharelatex/as-fix-hashed-files
Fix hashed file path for rich text
2018-04-11 12:12:30 +01:00
Alasdair Smith
60a28f7173 Fix hashed file path for rich text 2018-04-11 12:00:36 +01:00
Paulo Jorge Reis
68ee3f7449 Merge pull request #474 from sharelatex/pr-fix-z-index-v2-resizers
Remove forced z-index from v2 splitters
2018-04-11 11:31:05 +01:00
hugh-obrien
6c3482f2a1 add reactDOM, fix publish menu configs 2018-04-10 15:59:39 +01:00
hugh-obrien
39d25fdff9 webpack compiling for publish menu 2018-04-10 15:59:30 +01:00
hugh-obrien
a250004036 initial publish modal setup 2018-04-10 15:59:24 +01:00
Alasdair Smith
35cc5bf19c Add defensive check for req.query, fixing tests 2018-04-10 10:38:40 +01:00
Alasdair Smith
f0bcb332bb Merge pull request #479 from sharelatex/as-rt-feature-flag
Switch to runtime flag for RT instead of feature flag
2018-04-10 10:24:58 +01:00
Brian Gough
882b555433 create new file on replace 2018-04-09 12:05:08 +01:00
Brian Gough
1a68f768d4 rename internal method uploadFile to _uploadFile 2018-04-09 12:05:08 +01:00
Brian Gough
38dab1c82c clean up whitespace 2018-04-09 12:05:08 +01:00
Brian Gough
e29c657c8a preserve original callback signature for addFile 2018-04-09 12:05:08 +01:00
Brian Gough
b551f3c7e9 fix indentation 2018-04-09 12:05:08 +01:00
Brian Gough
61b192fb2c fix indentation of comment 2018-04-09 12:05:07 +01:00
Brian Gough
fe8897d757 refactor addFile and addFileWithOutUpdatingHistory 2018-04-09 12:05:07 +01:00
Brian Gough
d949338ed4 separate out file uploads 2018-04-09 12:05:07 +01:00
Brian Gough
cdfa2de68d add comment about upsert and locking 2018-04-09 12:05:07 +01:00
Brian Gough
baec4eb195 move uploads outside the lock 2018-04-09 12:05:07 +01:00
Alasdair Smith
eb05be6eb3 Remove unused feature flag 2018-04-06 17:00:27 +01:00
Alasdair Smith
c3b2af4345 Instead of checking RT flag at compile time, adjust at run time 2018-04-06 16:59:06 +01:00
Alasdair Smith
d433a88158 Pass rich text flag if query string is set 2018-04-06 16:58:12 +01:00
Alasdair Smith
315b2f24ee Always include RT styles 2018-04-06 16:01:59 +01:00
James Allen
2c0bd94fa7 Use mkdirp when restoring a file if the folder doesn't exist 2018-04-06 15:20:51 +01:00
James Allen
11d47fcc31 Use updated project-history response format 2018-04-06 15:20:18 +01:00
Alasdair Smith
fba5e4f80a Disable webpack source map 2018-04-06 11:28:21 +01:00
James Allen
1e8439a2c6 Fix restore of docs from old deleted docs 2018-04-06 10:30:13 +01:00
James Allen
b4fa47d664 Add unit tests for RestoreManager 2018-04-06 10:30:13 +01:00
James Allen
415be6b4e0 Open file after restoring 2018-04-06 10:30:13 +01:00
James Allen
0a1c543841 Hook up front end to restore documents 2018-04-06 10:30:13 +01:00
James Allen
075db1e5b9 Remove stray console.log 2018-04-06 10:30:13 +01:00
James Allen
3832850be6 Implement restore end point with acceptance tests 2018-04-06 10:30:13 +01:00
James Allen
beee86f1ce First pass at restore end point 2018-04-06 10:30:13 +01:00
Paulo Reis
3fecb4f180 Forcing z-index is not needed anymore. 2018-04-05 11:54:53 +01:00
Alasdair Smith
8ff1492962 Merge pull request #471 from sharelatex/as-karma-css
Serve CSS when running karma tests
2018-04-05 09:27:58 +01:00
Alasdair Smith
1d6dd06b88 Serve underscore in karma tests
Because of the way that we're using underscore in the ES bundle (using the
global), we need to include underscore globally
2018-04-04 13:19:21 +01:00
Paulo Reis
2e898bcf13 Use LESS to conditionally hide SL assets. 2018-04-03 09:01:43 -05:00
Paulo Reis
4ee81b3b44 Undo unintended SL changes. 2018-04-03 09:01:42 -05:00
Paulo Reis
396b29f32d Conditionally load SL assets on error pages; adjust styles for OL v2. 2018-04-03 09:01:42 -05:00
Jessica Lawshe
b2c7bb9d95 Track v2 onboard events
Added events to the v2 banner to track on Metabase and Google
Analytics.
2018-04-03 08:48:11 -05:00
James Allen
216b17ab92 Fill in v2 link 2018-04-03 11:55:19 +01:00
James Allen
0a00dea610 Merge pull request #469 from sharelatex/ja-feature-flag-rename
Split references feature flag into mendeley and referencesSearch
2018-04-03 11:53:58 +01:00
Alasdair Smith
b417516c7f Add CSS to karma
This is useful for rich text tests which rely on DOM structure/CSS layout of
rich text
2018-04-03 11:12:17 +01:00
Alasdair Smith
672305c9c2 Merge pull request #453 from sharelatex/ja-update-import-modal
Tone down and reword v1 import modal
2018-04-03 10:24:39 +01:00
Alasdair Smith
3668912102 Merge pull request #470 from sharelatex/pr-fix-v2-resizers-width
Configure splitter width in v2
2018-04-03 10:24:31 +01:00
Alasdair Smith
fa7e64adbb Wrap RT styles in .rich-text to prevent clashes 2018-04-03 09:47:35 +01:00
Alasdair Smith
4511cfa92f Add RT styles 2018-04-03 09:47:35 +01:00
Paulo Reis
bd3c12cf90 Make sure the layout lib knows about the resizer width in v2. 2018-03-29 10:35:17 +01:00
James Allen
f80962b74b Split references feature flag into mendeley and referencesSearch 2018-03-28 17:11:41 +01:00
Paulo Jorge Reis
bc46044f85 Merge pull request #466 from sharelatex/pr-v2-system-messages
v2 system messages
2018-03-28 15:17:26 +01:00
Paulo Jorge Reis
efee5a88bf Merge pull request #434 from sharelatex/jel-preview-unsupported
Remove expressions used for debugging
2018-03-28 15:16:49 +01:00
Paulo Jorge Reis
ab6abb2a4c Merge pull request #465 from sharelatex/revert-464-as-hotfix-rt
Bring back editor toolbar
2018-03-28 15:15:44 +01:00
Paulo Reis
8d2db3b31e V2 styling for system messages. 2018-03-28 14:46:07 +01:00
Paulo Reis
525deabc2b Move language subdomain message into the projects list too; make the close buttons similar. 2018-03-28 13:54:02 +01:00
James Allen
f13c7fd573 Revert "Replace references feature flag with mendeley and referencesSearch"
This reverts commit 12fdff37f9fd5d47e8446eebc576d8bb9e045aa4.
2018-03-28 13:47:34 +01:00
Paulo Reis
2dde810a1d Adjust styling. 2018-03-28 12:05:47 +01:00
Paulo Reis
b8049f3c46 Move system messages into the project list page (only). 2018-03-28 12:05:32 +01:00
James Allen
28aef4e72b Merge pull request #457 from sharelatex/as-silent-webpack-exit
Exit webpack without error if no entry points found
2018-03-28 11:18:18 +01:00
James Allen
e0facd40da Merge pull request #461 from sharelatex/ja-feature-flag-rename
Replace references feature flag with mendeley and referencesSearch
2018-03-28 11:16:56 +01:00
Alasdair Smith
2e93e0bf23 Revert "Hotfix RT button showing up when it isn't enabled" 2018-03-28 10:13:23 +01:00
Henry Oswald
a998d738ee Merge pull request #460 from sharelatex/ho-null-check-docs
null check map on files and docs inside logger
2018-03-28 10:01:49 +01:00
Alasdair Smith
4217b48a15 Hotfix RT button showing up when it isn't enabled 2018-03-27 20:10:03 +01:00
James Allen
dc2d7a9c7e Replace references feature flag with mendeley and referencesSearch 2018-03-27 16:20:21 +01:00
Henry Oswald
3b3b404288 Update LoggerSerializers.coffee 2018-03-27 14:45:47 +01:00
Henry Oswald
eeb76441c0 null check map on files and docs inside logger 2018-03-27 14:41:56 +01:00
Alasdair Smith
7520174288 Silently exit webpack process if no entry points are found in src or modules
This better supports the community edition which currently has no code or
modules that match and throws an error.
2018-03-27 12:30:40 +01:00
James Allen
21424f6bba Add placeholder read more link 2018-03-27 10:36:57 +01:00
Paulo Jorge Reis
70433e59da Merge pull request #447 from sharelatex/ja-remove-sixpack-from-history
Don't show history teaser image since it refers to SL
2018-03-27 10:10:27 +01:00
Paulo Jorge Reis
9a1a0794f3 Merge pull request #450 from sharelatex/pr-v2-favicons
V2 favicons and related assets
2018-03-27 10:09:34 +01:00
Paulo Jorge Reis
8f7228d26e Merge pull request #437 from sharelatex/pr-v2-splitters
Improve v2 splitters
2018-03-27 10:08:05 +01:00
Paulo Jorge Reis
f633276570 Merge pull request #438 from sharelatex/ja-panel-style-tweaks
Focus and spacing tweaks
2018-03-27 10:07:17 +01:00
James Allen
dc1b30dc8e Update import modal to be less scary 2018-03-26 15:11:17 +01:00
Paulo Reis
b7a11ff766 Add Overleaf favicon-related assets; configure layout.pug to show the Overleaf green when tinting the SVG favicon. 2018-03-26 14:24:53 +01:00
Alasdair Smith
19e0aab49c Fix module compile_full failing if module don't have app/coffee 2018-03-26 14:15:02 +01:00
James Allen
d2ba1c7266 Don't show history teaser image since it refers to SL 2018-03-26 11:43:48 +01:00
Alasdair Smith
f544cebb0a Compile modules ES code with webpack
Allows for bundling of third-party modules and prevents error when using
import/export syntax outside of type="module" script
2018-03-26 11:31:15 +01:00
Alasdair Smith
5e2f838af4 Instead of loading script directly use requirejs config so it can be lazy loaded 2018-03-23 13:52:48 +00:00
Alasdair Smith
e9de83789a Rename tests to match their purpose better 2018-03-23 12:37:47 +00:00
Alasdair Smith
4ad0416f24 Extract cmEditor tests to RT module 2018-03-23 12:37:47 +00:00
Alasdair Smith
96b1d8c812 Compile frontend tests into web test directory and include module ES tests in karma 2018-03-23 12:37:47 +00:00
Alasdair Smith
3f8eda2223 Extract rich text code to module 2018-03-23 12:37:16 +00:00
Alasdair Smith
1a0154c9ea Load rich text code from module view include instead of hard coding 2018-03-23 12:37:16 +00:00
Alasdair Smith
74099440f3 Generate webpack entry points including modules 2018-03-23 12:37:16 +00:00
Alasdair Smith
fe65137c05 Check app/coffee existence before compiling 2018-03-23 12:34:11 +00:00
James Allen
0c89f488bd Merge pull request #440 from sharelatex/afc-fix-read-announcements-count
Fix read announcements count
2018-03-23 12:06:49 +00:00
Paulo Reis
6c8ffcd055 Remove extra hit area. 2018-03-23 11:54:17 +00:00
James Allen
d517bae95c Merge pull request #423 from sharelatex/ja-set-google-analytics-cookie-domain
Set ga cookie domain to same as site
2018-03-23 11:52:00 +00:00
James Allen
1893eb297e Merge pull request #433 from sharelatex/ja-v2-references-app
Add in default config for third-party-references service
2018-03-23 11:51:54 +00:00
James Allen
45c853d30a Merge pull request #425 from sharelatex/ja-disable-beta-program
Disable beta program pages
2018-03-23 11:51:46 +00:00
James Allen
d04107ddcd Merge pull request #435 from sharelatex/as-fix-modules-ignore
Remove unnecessary gitignore
2018-03-23 11:51:38 +00:00
Alasdair Smith
98e2e3ada1 Ignore everything in modules except gitkeep, to ensure directory exists 2018-03-23 11:39:46 +00:00
Paulo Reis
a1545a688e Make resizers lighter; make chevron smaller; hide ellipsis when panes are collapsed. 2018-03-23 11:16:41 +00:00
Paulo Reis
89d9a43652 Make resizer bar larger; add a chevron inside the toggler; make the toggler itself darker. 2018-03-23 10:16:03 +00:00
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
be3306aa0b Focus and spacing tweaks 2018-03-22 17:18:47 +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
Paulo Reis
2447e85f3f Remove stray console.log(). 2018-03-22 14:08:16 +00:00
Paulo Reis
9ddd4543e1 More style adjustments; remove commented code. 2018-03-22 13:50:48 +00:00
Jessica Lawshe
ffbdb760c6 Merge pull request #417 from sharelatex/subscription-analytics
Subscription analytics
2018-03-22 08:47:42 -05:00
Paulo Reis
906f4899aa Only use custom togglers in v2. 2018-03-22 12:10:34 +00:00
Paulo Reis
38f95359e1 Style adjustments. 2018-03-22 11:48:34 +00:00
Paulo Reis
db68134f81 Add i18n. 2018-03-22 11:48:14 +00:00
Alasdair Smith
b74e5dbf04 Remove unnecessary gitignore 2018-03-22 10:59:29 +00:00
Jessica Lawshe
f37c34db19 Remove expressions used for debugging 2018-03-21 16:50:37 -05:00
James Allen
c5b29bd1c7 Add in default config for third-party-references service 2018-03-21 15:27:47 +00: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
Paulo Reis
3f073c2341 Rename attributes and vars for clarity 2018-03-20 16:11:09 +00:00
Paulo Reis
fb7d902038 Make custom togglers react to opening and closing panes. Dynamically add CSS classes. 2018-03-20 16:11:09 +00:00
Paulo Reis
a3034fc79f Enable custom togglers. 2018-03-20 16:11:09 +00:00
Paulo Reis
fc0be22c6d Extend layout directive to support custom togglers. 2018-03-20 16:11:09 +00:00
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