Commit graph

23625 commits

Author SHA1 Message Date
Shane Kilkelly
4e1df9f476 Fix wording of userHasSubscription to userHasNoSubscription 2016-07-19 11:37:58 +01:00
Shane Kilkelly
3aea3a68d1 Check the truth of subscription.customAccount, rather than definition. 2016-07-19 10:28:43 +01:00
Shane Kilkelly
effc3727be Don’t show upgrade prompts for users with custom subscription accounts.
Set `hasValidSubscription` to true if user subscription is custom.
2016-07-19 10:15:45 +01:00
Henry Oswald
a2a8b7123b created buildCssPath img and js path funcs 2016-07-18 17:18:51 +01:00
Brian Gough
1d74e6750c work around for synctex paths containing /./ 2016-07-18 17:00:34 +01:00
James Allen
62a444082d Add in /dev/csrf endpoint for easy automated testing 2016-07-18 16:47:54 +01:00
Henry Oswald
715ffcfbf2 changed ordering on static assets path, just tidying. 2016-07-18 16:24:48 +01:00
Henry Oswald
03bfbe8d44 Update docker-compose.yml 2016-07-18 16:11:04 +01:00
Henry Oswald
e35303decf Update docker-compose.yml 2016-07-18 16:08:33 +01:00
Shane Kilkelly
9f9852a1dd Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-07-18 16:07:24 +01:00
Shane Kilkelly
57079fc986 fix styling of the import modal 2016-07-18 16:07:00 +01:00
Brian Gough
a3c97533ae Merge pull request #281 from sharelatex/stop-compile
add support for stopping compile
2016-07-18 15:01:26 +01:00
Brian Gough
ded9bcaa11 remove unwanted styling on 'stop compile' button 2016-07-18 15:00:16 +01:00
Henry Oswald
c21549220c mvp for cdn 2016-07-18 14:05:07 +01:00
Brian Gough
e4da985753 Merge pull request #43 from sharelatex/stop-compile
add support for stopping compile
2016-07-18 11:16:53 +01:00
Brian Gough
92d41dd74e added comment for per-user route to top-level directory 2016-07-18 11:16:09 +01:00
Shane Kilkelly
39cc9cda6d Remove docker-related config. test:acceptance:docker now depends on acceptance-test-runner-sharelatex. 2016-07-18 11:09:04 +01:00
Brian Gough
bd1e1de504 remove dead code 2016-07-18 11:05:45 +01:00
Shane Kilkelly
02b7b7baf2 Merge branch 'master' of github.com:sharelatex/document-updater-sharelatex 2016-07-18 10:36:12 +01:00
Shane Kilkelly
c446b20375 Add alternative test:acceptance:docker command, using separate docker repo 2016-07-18 10:36:03 +01:00
Brian Gough
5a02e8c656 add support for stopping compile 2016-07-15 16:28:52 +01:00
Henry Oswald
11667b379c added dump folder and template files fix to init script 2016-07-14 16:50:11 +01:00
Brian Gough
9b58621fa8 add support for stopping compile 2016-07-14 16:43:52 +01:00
Henry Oswald
0576380811 allow placeholder for sharing project to be changed 2016-07-14 11:40:32 +01:00
Henry Oswald
4202b4795b fix ordering of deps for contact us 2016-07-14 11:15:44 +01:00
Paulo Reis
c23091da94 Always set feature flags, if available. 2016-07-14 11:07:10 +01:00
Paulo Jorge Reis
e4e6c58423 Merge pull request #280 from sharelatex/pr-user-segmentation
User segmentation
2016-07-14 10:15:16 +01:00
Paulo Jorge Reis
0b21f8f4f1 Merge pull request #279 from sharelatex/pr-track-trial-start
Track trial start and subscription
2016-07-14 10:14:49 +01:00
Paulo Reis
ab995671fc Namespace feature flags. 2016-07-14 10:10:14 +01:00
Paulo Reis
5d5bc57535 Add user name. 2016-07-14 09:55:11 +01:00
Paulo Reis
fee22db567 Refactor user blocks into a single script tag. 2016-07-14 09:47:25 +01:00
Paulo Reis
a261de9eb1 Set feature flags. 2016-07-14 09:37:04 +01:00
Henry Oswald
e1f8ded770 Merge pull request #42 from WaeCo/patch-1
Set default project_cache_length_ms to 1 day
2016-07-13 21:32:02 +01:00
WaeCo
92461742d0 Set default project_cache_length_ms to 1 day
`project_cache_length_ms` was only `60*60*24 = 1.5 min` which is a little bit short. Default of one day seams more reasonable.
2016-07-13 13:26:32 -07:00
Paulo Reis
68906cb0c5 Avoid unneeded change_id event; id can be set as a Countly property, before initializing. 2016-07-13 16:29:53 +01:00
Brian Gough
d53fa5de47 avoid exception in pdf viewer when no visible pages 2016-07-13 14:14:51 +01:00
Brian Gough
d8c11a0824 fix scope for pdf page load error handler 2016-07-13 14:04:58 +01:00
Paulo Reis
688eebf469 Merge branch 'pr-track-trial-start' of github.com:sharelatex/web-sharelatex into pr-track-trial-start 2016-07-13 09:49:57 +01:00
Paulo Reis
4801d8c1c2 Track subscription form page flow. 2016-07-12 17:33:24 +01:00
Paulo Reis
0542d9e05d Track trials starts, with source. 2016-07-12 17:33:00 +01:00
Paulo Reis
b2da63f532 Track trials starts, with source. 2016-07-12 16:41:22 +01:00
Brian Gough
2e646729d1 avoid clobbering file urls in download dropdown 2016-07-12 14:37:08 +01:00
Henry Oswald
713f2110c1 use translations for title and meta description (google) 2016-07-12 14:25:25 +01:00
Paulo Reis
8eae4e4044 Revert "Use custom shrinkwrap to ignore the translations package."
This reverts commit 25a8a7cd9a59f738277ce893318c69db539384d6.
2016-07-12 13:42:46 +01:00
Paulo Reis
112a64ce84 Use custom shrinkwrap to ignore the translations package. 2016-07-12 13:37:26 +01:00
Paulo Jorge Reis
b3acf011ab Merge pull request #276 from sharelatex/pr-contact-form-suggestions
Contact form suggestions
2016-07-12 11:53:05 +01:00
Brian Gough
8c9fcfdd60 remove sentry downsampling on pdf errors
load errors should be less frequent now
2016-07-12 11:51:30 +01:00
Brian Gough
7555382e33 remove the render timeout
pdfjs uses requestAnimationFrame to schedule the rendering, and this
does not fire if the tab is inactive. That causes an unwanted error if
switching tabs for more than the one minute timeout.
2016-07-12 11:51:30 +01:00
Brian Gough
0ae639f1c3 enable per-page pdf downloads by default 2016-07-12 11:51:30 +01:00
James Allen
a1bac9719a Update secondary timeout for multi commands too 2016-07-12 11:45:10 +01:00