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
Henry Oswald
000c862ae1
return 404 if blog returns 403, caused by file not existing
2016-06-29 15:36:33 +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
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
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
Shane Kilkelly
401565ba23
Fix references to the RecurlyWrapper object.
2016-06-27 12:14:43 +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
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
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
Henry Oswald
3887db8898
don't call notifications if notifications has no url
2016-06-24 14:06:04 +01:00
Henry Oswald
9a3e621c9c
stripe off errors and kb from page titles
2016-06-24 13:15:22 +01:00
Shane Kilkelly
249381b6a8
WIP: initial work on sending address to recurly for paypal subscriptions
2016-06-24 11:42:58 +01:00
Henry Oswald
5371669f89
if references has no url don't send post, silently return
2016-06-23 16:39:54 +01:00
Henry Oswald
d2e4e22511
health checks should be on api router with no sessions
2016-06-18 11:58:26 +01:00
Brian Gough
98a0c54004
use parameter for bcrypt rounds, rehash passwords on login if necessary
2016-06-17 12:22:03 +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
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
Henry Oswald
7dad0427e8
fixed logger in notifications builder
2016-06-15 17:40:54 +01:00
Henry Oswald
8a9a65a80a
fix the download and compile endpoint used by zip
2016-06-15 14:45:05 +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
8f1fec8c4f
Add opt-out action to beta page
2016-06-08 15:11:39 +01:00
Shane Kilkelly
90dac348ff
refine beta opt-in workflow.
2016-06-08 11:04:44 +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
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