Shane Kilkelly
|
c3e51dd773
|
Revert "copy helper functions from CollaboratorsHandler"
This reverts commit 0d5acd7bade584e4ff119dc22e5d5d3b3175dae2.
|
2016-07-21 09:50:52 +01:00 |
|
Shane Kilkelly
|
049cced4fd
|
copy helper functions from CollaboratorsHandler
|
2016-07-21 09:42:37 +01:00 |
|
Shane Kilkelly
|
0f2600b198
|
finish out skeleton of invite controller
|
2016-07-21 09:32:14 +01:00 |
|
Shane Kilkelly
|
f7c2fa37ab
|
Fill out getInviteByToken
|
2016-07-20 16:44:22 +01:00 |
|
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 |
|
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 |
|
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 |
|
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
|
92d41dd74e
|
added comment for per-user route to top-level directory
|
2016-07-18 11:16:09 +01:00 |
|
Brian Gough
|
5a02e8c656
|
add support for stopping compile
|
2016-07-15 16:28:52 +01:00 |
|
Henry Oswald
|
0576380811
|
allow placeholder for sharing project to be changed
|
2016-07-14 11:40:32 +01:00 |
|
Paulo Reis
|
c23091da94
|
Always set feature flags, if available.
|
2016-07-14 11:07:10 +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 |
|
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 |
|
Henry Oswald
|
713f2110c1
|
use translations for title and meta description (google)
|
2016-07-12 14:25:25 +01:00 |
|
Paulo Reis
|
1e62ce679b
|
Make 'knowledge base' a link to the KB index page.
|
2016-07-12 11:44:48 +01:00 |
|
Paulo Reis
|
785bf1b5a2
|
New key for the message label.
|
2016-07-11 16:24:06 +01:00 |
|
Paulo Reis
|
af93ac4413
|
Track suggestions usage.
|
2016-07-11 14:27:07 +01:00 |
|
Paulo Reis
|
9ef78b4bc2
|
Merge branch 'master' into pr-contact-form-suggestions
|
2016-07-11 13:54:06 +01:00 |
|
Paulo Reis
|
7eafa5ca3f
|
Make Countly server configurable via settings.
|
2016-07-11 11:02:52 +01:00 |
|
Henry Oswald
|
94d760e32d
|
import bootstrap font awseome via less not html
|
2016-07-10 11:10:43 +01:00 |
|
Paulo Reis
|
444120f8b1
|
Merge branch 'master' into pr-contact-form-suggestions
|
2016-07-08 13:55:08 +01:00 |
|
Shane Kilkelly
|
0e9beb5653
|
remove daft redundancy.
|
2016-07-07 09:42:01 +01:00 |
|
Shane Kilkelly
|
896cbb5f4c
|
Merge branch 'master' of github.com:sharelatex/web-sharelatex
|
2016-07-07 09:35:53 +01:00 |
|
Shane Kilkelly
|
9e35bdcaea
|
Refactor: add ? suffix to truth tests.
|
2016-07-07 09:35:44 +01:00 |
|
Paulo Jorge Reis
|
efacd9e7f2
|
Merge pull request #267 from sharelatex/pr-log-dropdown
"Other logs & files" dropdown / dropup
|
2016-07-06 16:06:10 +01:00 |
|
Shane Kilkelly
|
21eb104928
|
Merge branch 'master' of github.com:sharelatex/web-sharelatex
|
2016-07-06 15:39:12 +01:00 |
|
Shane Kilkelly
|
dda0841af3
|
Return early if there are no keys to delete
|
2016-07-06 15:39:03 +01:00 |
|
Paulo Reis
|
b867c37d49
|
Merge branch 'master' into pr-log-dropdown
|
2016-07-06 15:35:28 +01:00 |
|
Paulo Jorge Reis
|
59065395ef
|
Merge pull request #273 from sharelatex/pr-countly-integration
Countly integration
|
2016-07-06 15:00:47 +01:00 |
|