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
Henry Oswald
6c78ab4ace
got requirejs working nicely with cdn
2016-07-20 12:58:32 +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
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
Paulo Reis
7a3d3d3ffd
Make Countly track by internal ids.
2016-07-06 14:44:28 +01:00
Paulo Reis
8e2475afdc
Track hints feedback in both GA and Countly; clean-up.
2016-07-06 14:24:50 +01:00
Shane Kilkelly
fc6cf75ad5
Merge branch 'master' into sk-session-revocation
2016-07-06 13:19:15 +01:00
Paulo Reis
5c121a5f05
Track user log in and sign up.
2016-07-06 12:12:54 +01:00
Paulo Reis
7e1c1f7414
Remove heap integration.
2016-07-06 12:12:22 +01:00
Paulo Reis
c9b1faa1a1
Add user info to correlate with events.
2016-07-06 11:59:33 +01:00
Paulo Reis
909f7c15b5
Track log-related actions.
2016-07-05 16:27:14 +01:00
Paulo Reis
d5efe81a46
Track recompiles.
2016-07-05 16:02:46 +01:00
Shane Kilkelly
3f1a47eccb
map the 'retain' values to session ids
2016-07-05 14:54:26 +01:00
Shane Kilkelly
5b9903551a
add an array of session ids to retain.
2016-07-05 14:20:47 +01:00
Shane Kilkelly
6e282ab308
clear sessions on password reset
2016-07-05 14:19:59 +01:00
Paulo Reis
fac3698c40
Better namespacing of sprite CSS classes.
2016-07-05 11:08:58 +01:00
Paulo Reis
7dd1906eaf
Initial Countly integration.
2016-07-04 16:51:31 +01:00
Shane Kilkelly
df0a7bc547
test the _checkSessions
function.
2016-07-04 14:04:10 +01:00
Shane Kilkelly
2ae2e6ed4f
Test trackSession
2016-07-04 10:37:01 +01:00
Shane Kilkelly
a869c99c60
Begin testing UserSessionsManager
.
2016-07-04 10:05:34 +01:00
Shane Kilkelly
5a1af9a5f3
check sessions on login and logout.
2016-07-04 09:27:38 +01:00
Paulo Reis
11f198d970
Merge branch 'master' into sprites
2016-07-01 16:27:09 +01:00
Paulo Reis
4f49a25639
Use a figure element instead of an img, as there is no src attribute.
2016-07-01 16:02:01 +01:00
Shane Kilkelly
6f20f565fe
Add early-return guards
2016-07-01 15:55:50 +01:00
Shane Kilkelly
0ac9b05d02
Add ip_address
and session_created
to the session user object.
2016-07-01 15:49:07 +01:00
Shane Kilkelly
f1653d01b7
Refactor method names in UserSessionsManager
2016-07-01 15:33:59 +01:00
Henry Oswald
6f4a7f4779
mvp for using sprites for flags, needs border removing
2016-07-01 15:04:39 +01:00
Shane Kilkelly
6938f1d055
No need to build extra string
2016-07-01 15:04:13 +01:00
Shane Kilkelly
8855d0fa0f
Clear out sessions
2016-07-01 13:38:13 +01:00
Shane Kilkelly
5ae0aeaf94
Fix logging.
2016-07-01 13:37:56 +01:00
Shane Kilkelly
d8ffa5b4b1
set expiry on the user sessions set.
2016-07-01 11:24:46 +01:00
Shane Kilkelly
88bef5c5ea
Add revokeAllSessions
handler, when password is reset
2016-07-01 09:51:22 +01:00
Brian Gough
ea942fe255
Merge pull request #269 from sharelatex/remove-migration-to-per-user-containers
...
remove scaffolding for per-user compiles so that it is always by default
2016-06-30 15:16:28 +01:00
Brian Gough
c04e00026b
remove scaffolding for per-user compiles so that it is always by default
2016-06-30 14:43:03 +01:00
James Allen
882e28a811
Don't choke on null projects
2016-06-30 14:30:04 +01:00
James Allen
b76cc7e314
Remove a user from being a collaborator when their account is deleted
2016-06-30 14:21:44 +01:00
James Allen
a0fcc7e3ed
Skip null user objects when getting collaborators
2016-06-30 13:56:21 +01:00
Paulo Reis
c5f53ef431
Track log hints feedback.
2016-06-30 11:30:30 +01:00
Henry Oswald
000c862ae1
return 404 if blog returns 403, caused by file not existing
2016-06-29 15:36:33 +01:00
Shane Kilkelly
03fedafaf5
save the session key string, rather than just the id
2016-06-29 15:12:12 +01:00
Paulo Reis
72d498c6c8
Merge branch 'master' into pr-contact-form-suggestions
2016-06-29 11:58:07 +01:00
Shane Kilkelly
db213c0621
Begin keeping record of user sessions in reds.
2016-06-29 11:35:25 +01:00
Henry Oswald
8f14526354
added custom footer in email option
2016-06-28 17:07:27 +01:00
Henry Oswald
88fb955884
hook notifications handler up to make request which doesn't make request if url not set
2016-06-28 16:52:27 +01:00
Paulo Reis
a6d184358f
Avoid inline-styles.
2016-06-28 15:51:50 +01:00
Paulo Reis
88564ea126
Dynamically determine if the files dropdown should drop up or drop down.
2016-06-28 15:48:11 +01:00
Shane Kilkelly
9e16f250f9
Merge branch 'sk-subscription-address'
2016-06-28 14:16:34 +01:00
Shane Kilkelly
6581bc4ecf
set postal_code as zip
2016-06-28 14:15:47 +01:00
Shane Kilkelly
465d09dcfe
Test the createSubscription action (+4 squashed commits)
...
Squashed commits:
[fc9c8f9] Add tests for createBillingInfo
[db9f90e] Test the createSubscription stage
[c17151d] Check that userExists gets set
[1367c96] Act on buddy-check feedback
2016-06-28 13:59:52 +01:00
Paulo Reis
616fd5daf6
Merge branch 'master' into pr-ui-feedback-error-nav
2016-06-28 10:50:23 +01:00
Paulo Reis
d6067b86ac
Merge branch 'master' into pr-ui-feedback-error-nav
2016-06-28 10:49:55 +01:00
Brian Gough
2b23e13619
Merge pull request #261 from sharelatex/use-parameter-for-bcrypt-rounds
...
use parameter for bcrypt rounds, rehash passwords on login if necessary
2016-06-28 10:49:33 +01:00
Henry Oswald
b8b833b753
moved wiki into module
2016-06-28 10:16:02 +01:00
Shane Kilkelly
709f8f2bea
start testing the paypal workflow.
2016-06-27 16:34:00 +01:00
Paulo Reis
3580d8377f
Merge branch 'master' into pr-contact-form-suggestions
2016-06-27 15:39:00 +01:00
Paulo Reis
d7f67e7931
Integrate translations.
2016-06-27 15:38:13 +01:00
Shane Kilkelly
401565ba23
Fix references to the RecurlyWrapper object.
2016-06-27 12:14:43 +01:00
Paulo Reis
81b93ab5a9
Disable links to the docs when the wiki is not available.
2016-06-27 11:34:24 +01:00
Shane Kilkelly
9938787e4a
fix a few silly issues. Appears to work now
2016-06-27 10:38:10 +01:00
Shane Kilkelly
72c73809f6
Generate address xml from object.
2016-06-27 09:44:40 +01:00