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
Paulo Reis
c82f4481e4
Show search results.
2016-06-24 17:10:18 +01:00
Paulo Reis
f427ce88d9
Better Jade syntax.
2016-06-24 16:37:35 +01:00
Paulo Reis
dfc375adf8
Add more feedback on :hover.
2016-06-24 15:55:19 +01:00
Henry Oswald
9888d6631a
don't error if references is not enabled
2016-06-24 15:46:37 +01:00
Henry Oswald
6e59a10fb3
added more null checks for potential undefined notifications
2016-06-24 15:23:57 +01:00
Paulo Reis
c376c807d7
Forgotten href attribute.
2016-06-24 15:22:34 +01:00
Henry Oswald
51df3825e5
add null check on notifications handler
2016-06-24 15:11:22 +01:00
Henry Oswald
8d79b37651
return from _doIndexOperation if referneces is not setup eailer
2016-06-24 15:07:28 +01:00
Shane Kilkelly
026e9f46c8
WIP: process appears to work, setting address correctly
2016-06-24 15:03:46 +01:00
Shane Kilkelly
56bc840b88
WIP: fix up error handling and account for possibility of account already existing.
2016-06-24 14:11:28 +01:00
Paulo Reis
a33aeca9c3
Merge branch 'pr-latex-hints-improvements'
2016-06-24 14:07:57 +01:00
Henry Oswald
3887db8898
don't call notifications if notifications has no url
2016-06-24 14:06:04 +01:00
Paulo Reis
b4de353828
Merge branch 'master' into pr-latex-hints-improvements
2016-06-24 14:02:55 +01:00
Henry Oswald
9a3e621c9c
stripe off errors and kb from page titles
2016-06-24 13:15:22 +01:00
Paulo Reis
5f7ffb5a8c
Make hint card area non-clickable.
2016-06-24 12:12:45 +01:00
Paulo Reis
e4a1443d1d
Better handling of whitespace.
2016-06-24 12:07:02 +01:00
Shane Kilkelly
249381b6a8
WIP: initial work on sending address to recurly for paypal subscriptions
2016-06-24 11:42:58 +01:00
Paulo Reis
a587d5ddba
Set up model options.
2016-06-24 11:02:29 +01:00
Henry Oswald
d294117286
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2016-06-23 16:40:22 +01:00
Henry Oswald
5371669f89
if references has no url don't send post, silently return
2016-06-23 16:39:54 +01:00
Paulo Reis
f62a45444d
Prototype mark-up and styles.
2016-06-23 12:08:13 +01:00
Shane Kilkelly
cbdcc874e3
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2016-06-22 11:03:32 +01:00
James Allen
b693ced843
Merge pull request #263 from sharelatex/pr-human-readable-logs
...
Human readable logs
2016-06-21 14:28:06 +01:00
Paulo Reis
ed659fd973
Minor UI improvements.
2016-06-21 14:20:23 +01:00
Shane Kilkelly
6f07ea513e
Remove DataJoy link from the project page.
2016-06-21 13:28:08 +01:00
Henry Oswald
5800c88d80
Merge branch 'ha_custom_image_logo'
2016-06-21 12:07:49 +01:00
Paulo Reis
e607de0b91
Safety checks for non-existing values; avoid rendering the hint template when there is no hint.
2016-06-21 12:07:47 +01:00
Paulo Reis
d8e0026bc6
Add class to enable per-hint feedback tracking.
2016-06-20 17:32:57 +01:00
Paulo Reis
fe53083afd
Show thank you note after receiving feedback.
2016-06-20 15:04:47 +01:00
Paulo Reis
baea017adb
Better mark-up for analytics tracking.
2016-06-20 14:59:30 +01:00
Paulo Reis
a8976fd4dc
Use plain links instead of buttons.
2016-06-20 14:42:36 +01:00
Paulo Reis
ada018263a
Merge branch 'master' into pr-human-readable-logs
2016-06-20 11:54:56 +01:00
Paulo Reis
1893ae68a9
Add feedback widget for log hints.
2016-06-20 11:53:10 +01:00
Paulo Reis
605bb07ba3
Hint card styling.
2016-06-20 09:45:14 +01:00
Henry Oswald
fe11a4d835
include sentry below the fold
2016-06-18 12:29:52 +01:00
Henry Oswald
d2e4e22511
health checks should be on api router with no sessions
2016-06-18 11:58:26 +01:00
Henry Oswald
d27d19e02a
added override for navbar background image
2016-06-17 14:18:52 +01:00
Paulo Reis
2bfe0d0ba9
Basic mark-up for hint card.
2016-06-17 14:16:38 +01:00
Brian Gough
98a0c54004
use parameter for bcrypt rounds, rehash passwords on login if necessary
2016-06-17 12:22:03 +01:00
Paulo Reis
54d48ce0ea
Support extra info URL in human readable hints.
2016-06-17 11:42:32 +01:00
Paulo Reis
40fda6e361
Support HTML in human readable log messages.
2016-06-16 16:29:19 +01:00
Paulo Reis
9b8d695e43
Match logs against ruleset; show human readable message when appropriate.
2016-06-16 15:53:39 +01:00
Brian Gough
fcd5582e6e
Merge pull request #259 from sharelatex/fix-per-user-containers
...
Fix per user containers
2016-06-16 14:12:57 +01:00
Brian Gough
8a0fa1321d
add comments to router, downcase route
...
express has case-insensitive routes
2016-06-16 13:59:56 +01:00
Brian Gough
6873c1d972
fix download methods in CompileController
2016-06-16 13:59:24 +01:00
Shane Kilkelly
3e3dd199a0
Add id's to buttons on beta program page
2016-06-16 10:56:16 +01:00
Shane Kilkelly
241d3bfc14
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2016-06-16 10:17:47 +01:00
Shane Kilkelly
9919f5f44a
Refactor heap analytics
2016-06-16 10:17:36 +01:00
Henry Oswald
101e98ed83
simpliyfied dashboard & fixed error with leave group shown to group owner
...
- always show the manage button if you are the group owne
- only show the recurly subscription part if you are the subscription owner
- always try and loop through groups you can leave
2016-06-16 09:17:43 +01:00
Shane Kilkelly
5ce0100371
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2016-06-16 08:50:15 +01:00
Henry Oswald
7dad0427e8
fixed logger in notifications builder
2016-06-15 17:40:54 +01:00
Shane Kilkelly
c8302e090f
Merge branch 'master' into sk-heap-analytics
2016-06-15 15:35:47 +01:00
Shane Kilkelly
522ac8b59b
initial port of heap code from DJ into sharelatex.
2016-06-15 15:35:03 +01:00
Paulo Reis
e891a47a9e
Better support for larger text in keyboard tooltips.
2016-06-15 15:27:30 +01:00
Henry Oswald
a5abc7392d
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2016-06-15 14:45:28 +01:00
Henry Oswald
8a9a65a80a
fix the download and compile endpoint used by zip
2016-06-15 14:45:05 +01:00
Paulo Reis
d7e4009504
Small styling enhancements.
2016-06-15 10:48:40 +01:00
Paulo Reis
3310a3ea3f
Change tooltip copy; get it from i18n catalogue.
2016-06-14 17:20:16 +01:00
Paulo Reis
a9e0185098
Added tooltip with keyboard shortcut in the recompile button.
2016-06-14 17:02:22 +01:00
Brian Gough
830d15136d
fix missing variables in pdf sync
2016-06-14 08:49:08 +01:00
Henry Oswald
f9fdec8a15
whitelist /user/activate for non public access
2016-06-13 15:24:41 +01:00
Henry Oswald
84db5ec23a
added logging and default calback
2016-06-13 13:38:30 +01:00
Henry Oswald
f3e48e332b
explicit call to UserCreator.createNewUser
2016-06-13 13:38:17 +01:00
Henry Oswald
3bc3153490
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2016-06-13 13:24:04 +01:00
Henry Oswald
c52af1393e
should be able to set first and last name via user details on registration
2016-06-13 13:21:44 +01:00
Brian Gough
49a7c3c27b
Merge branch 'per-user-containers-part-2'
...
Conflicts:
app/coffee/Features/Compile/ClsiManager.coffee
app/coffee/Features/Compile/CompileController.coffee
app/coffee/Features/Compile/CompileManager.coffee
2016-06-13 12:24:48 +01:00
Brian Gough
e6dcce21fd
use build_id and user_id instead of build and user
2016-06-10 12:11:47 +01:00
Brian Gough
8bc5f53562
Merge pull request #253 from sharelatex/per-user-containers-part-1
...
Per user containers part 1
2016-06-10 09:40:00 +01:00
Brian Gough
47574d7c7e
Merge pull request #252 from sharelatex/per-user-containers-part-0
...
Per user containers part 0
2016-06-08 15:55:17 +01:00
Shane Kilkelly
ad6e9e039d
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2016-06-08 15:31:24 +01:00
Shane Kilkelly
6ca2e2204b
If user is in beta program, show link to opt-out page on the settings page.
2016-06-08 15:31:14 +01:00
Shane Kilkelly
8f1fec8c4f
Add opt-out action to beta page
2016-06-08 15:11:39 +01:00
Brian Gough
6c244eb2f4
Merge pull request #251 from sharelatex/fix-download-urls
...
fix filename of downloaded pdf files
2016-06-08 14:33:12 +01:00
Shane Kilkelly
58d7d7bf74
Re-work wording of beta opt-in page.
2016-06-08 11:38:14 +01:00
Shane Kilkelly
90dac348ff
refine beta opt-in workflow.
2016-06-08 11:04:44 +01:00
Shane Kilkelly
20485cbfed
Merge branch 'sk-beta-program'
2016-06-08 10:34:03 +01:00
Shane Kilkelly
009fa79589
remove trailing parens.
2016-06-08 10:33:21 +01:00
Shane Kilkelly
0dfd80d307
Use css to add the beta symbol to the beta-label
2016-06-07 14:04:02 +01:00
Shane Kilkelly
2598661c4c
Use correct title for Beta Opt-in page
2016-06-07 13:42:06 +01:00
Shane Kilkelly
618d3ee269
fix missing require
2016-06-07 13:41:50 +01:00
Shane Kilkelly
d8f1e8ec93
Add basic BetaProgram
feature.
2016-06-07 11:15:56 +01:00
Henry Oswald
4029b76d9e
- make system messages default tab in admin panel
...
- add manage site tab to dropdown
2016-06-06 16:11:26 +01:00
Henry Oswald
79929eae73
Merge branch 'clsichecks'
2016-06-06 14:34:22 +01:00
Shane Kilkelly
fdacf13782
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2016-06-06 13:12:31 +01:00
Shane Kilkelly
4e63a3c7bd
Move betaProgram
flag up to top-level of user object
2016-06-06 13:12:24 +01:00
Henry Oswald
829b37cd74
set user email on session again on change email
2016-06-06 10:50:45 +01:00