Shane Kilkelly
|
0dc4e2c0c1
|
Merge branch 'master' into pr-email-tokens
|
2016-07-20 15:23:37 +01:00 |
|
Shane Kilkelly
|
5b22be8a0b
|
Further scaffolding
|
2016-07-20 15:22:48 +01:00 |
|
Henry Oswald
|
e8aad2abb1
|
don’t fingerprint main.js and ide.js
|
2016-07-20 15:17:01 +01:00 |
|
Henry Oswald
|
596fc2525b
|
simplified buildJSPath
|
2016-07-20 14:48:58 +01:00 |
|
Henry Oswald
|
a3e40adbaf
|
Merge pull request #283 from sharelatex/ho-cdn
Ho cdn
|
2016-07-20 14:19:37 +01:00 |
|
Shane Kilkelly
|
a4c7db5f20
|
skeleton of inviteToProject function
|
2016-07-20 14:14:56 +01:00 |
|
Shane Kilkelly
|
e383e49161
|
Add CollaboratorsInviteController and routes
|
2016-07-20 14:04:14 +01:00 |
|
Henry Oswald
|
6c78ab4ace
|
got requirejs working nicely with cdn
|
2016-07-20 12:58:32 +01:00 |
|
Brian Gough
|
fcfdabd279
|
clean up pdfcontroller query string logic
|
2016-07-20 09:58:47 +01:00 |
|
Brian Gough
|
4e252976c7
|
add missing cache bust on log file
|
2016-07-20 09:58:47 +01:00 |
|
Henry Oswald
|
b589ab388f
|
fix close editor button
- only evaulate close on web router, not api/static assets
- allow /admin pages to still be available
|
2016-07-19 17:15:20 +01:00 |
|
Henry Oswald
|
f8c38f30a8
|
got build js path working with mathjax
|
2016-07-19 15:41:33 +01:00 |
|
Brian Gough
|
13d6448ab8
|
Merge pull request #284 from sharelatex/fix-synctex-subdir-path
work around for synctex paths containing /./
|
2016-07-19 12:24:31 +01:00 |
|
Brian Gough
|
a93efde1ae
|
add file path check on element names
|
2016-07-19 11:58:10 +01:00 |
|
Henry Oswald
|
0cbd9d0ff9
|
use url.resolve to adding https:// part
|
2016-07-19 11:41:36 +01:00 |
|
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 |
|