Shane Kilkelly
4a76fcd13b
Change first param of getMemberSubscriptions
to user_or_id
, to match semantics of usage.
...
This function works whether a user object, or an ObjectId is passed, but the `user_id`
param name is confusing.
2016-08-30 14:26:57 +01:00
Henry Oswald
ddc0023c64
make forceCreate the default for creating notifications
2016-08-30 13:07:37 +01:00
Henry Oswald
26a4076c22
add redirect to /i/university for ab test
2016-08-25 10:48:29 +01:00
Henry Oswald
114dbf9f3f
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2016-08-23 15:34:55 +01:00
James Allen
bcc8bfbe6c
Redirect to working update billing details end point that shows a nice message
2016-08-22 17:36:33 +01:00
Shane Kilkelly
11ec486c13
Merge pull request #300 from sharelatex/pr-subscription-improvements
...
Pr subscription improvements
2016-08-22 11:08:18 +01:00
Shane Kilkelly
03aa9b87f1
Add debug query string origin
to invocations of the updateSubscription endpoint.
2016-08-22 10:09:54 +01:00
Henry Oswald
130fece0f6
track when users accept invites
2016-08-19 18:33:03 +01:00
Shane Kilkelly
c02854c9d8
Improve log messages
2016-08-19 11:52:50 +01:00
Shane Kilkelly
07cd75cd64
Add an expect404
option to apiRequest.
...
Suppress error generation when 404 response is encountered.
2016-08-19 11:52:04 +01:00
James Allen
c653f59705
Add error handling to mkdir_p
2016-08-18 17:48:33 +01:00
Shane Kilkelly
4a6df04c21
Merge branch 'master' into pr-subscription-improvements
2016-08-18 12:53:56 +01:00
Shane Kilkelly
ece0491e3d
Refactor. Handle republishing of notifications on resend.
2016-08-17 16:27:15 +01:00
Shane Kilkelly
85f49d6c9c
Make whole 'red button' in email a link
2016-08-17 10:37:44 +01:00
Shane Kilkelly
4805c96584
Merge branch 'master' into pr-email-tokens
2016-08-17 08:52:24 +01:00
Shane Kilkelly
fc068b62a2
defend against undefined plan_code
2016-08-17 08:51:35 +01:00
Shane Kilkelly
81d0edf716
Improve error handling
2016-08-16 15:19:36 +01:00
Shane Kilkelly
ce78b855a3
Add counts to log message
2016-08-16 11:33:14 +01:00
Shane Kilkelly
da40f54d55
Improve logging, add acceptance tests for joinProject json
2016-08-16 11:17:45 +01:00
Shane Kilkelly
b68af254ff
Correct logic for bailing out with no privileges
2016-08-16 09:59:42 +01:00
Brian Gough
7fcae775ee
Merge pull request #297 from sharelatex/roll-out-chktex
...
Roll out chktex
2016-08-16 09:48:01 +01:00
Shane Kilkelly
d2183738c5
Improve logging for debugging
2016-08-16 09:04:11 +01:00
Brian Gough
8d6cdb03e8
restrict compile check options
...
allowed options are validate/error/silent
validate = only run chktex, exit status 0
error = run compilation, exit(1) if chktex fails
silent = run chktex, but always do full compilation
2016-08-15 16:46:53 +01:00
Shane Kilkelly
36d969e6e6
Set invites to be an empty array if missing
2016-08-15 15:22:23 +01:00
Shane Kilkelly
158afbb157
Merge branch 'master' into pr-email-tokens
...
Conflicts:
app/coffee/Features/Notifications/NotificationsBuilder.coffee
public/coffee/ide/share/controllers/ShareController.coffee
2016-08-15 10:29:21 +01:00
Shane Kilkelly
f92767f7b5
Address feedback, add ?
checks where appropriate
2016-08-12 15:26:20 +01:00
Shane Kilkelly
e53394919f
Rework how invite expiry functions.
2016-08-12 14:40:59 +01:00
Shane Kilkelly
a7bc8bffe0
Update markAsReadByKeyOnly
url.
2016-08-12 09:59:25 +01:00
Shane Kilkelly
ce039f8cd3
Remove the email when user id is added to project
2016-08-11 14:17:01 +01:00
Paulo Reis
9bf9df9a4a
Track login events.
2016-08-11 14:09:45 +01:00
Shane Kilkelly
826295167f
Mark Notification as read by key alone
2016-08-11 14:04:11 +01:00
Paulo Reis
6a210978fe
Track registration events.
2016-08-11 12:29:58 +01:00
James Allen
0270d34d0f
Use JSONB not JSON column type
2016-08-11 10:19:07 +01:00
James Allen
4886e8ba0e
Rename metadata -> segmentation in Events table to play well with metabase
2016-08-10 17:22:35 +01:00
James Allen
056bb6b0f4
Use a JSON column for metadata
2016-08-10 17:17:59 +01:00
James Allen
93cd511211
Send events to custom DB backend
2016-08-10 16:42:56 +01:00
Brian Gough
abcfb2dd16
Merge pull request #290 from sharelatex/enable-chktex
...
Enable chktex
2016-08-10 11:49:31 +01:00
Shane Kilkelly
0e0ccb41ff
cancel notification when accepting invite
2016-08-08 13:57:33 +01:00
Shane Kilkelly
110082390e
Test the _trySendInviteNotfification helper
2016-08-08 10:34:54 +01:00
Shane Kilkelly
9b46c1b1f7
WIP: notification when user is sent an invite
2016-08-05 16:11:03 +01:00
Shane Kilkelly
eafd61a90e
Refresh members and invites in client when status changes
2016-08-05 14:01:08 +01:00
Shane Kilkelly
8f7603c324
Add an endpoint to access project members
2016-08-04 16:47:48 +01:00
Shane Kilkelly
092c036406
Rate-limit calls to invite api
2016-08-04 09:50:47 +01:00
Shane Kilkelly
721ea88bd0
If email is already invited, resend the invite
2016-08-03 16:30:34 +01:00
Shane Kilkelly
a5ddcc3df7
Allow resending of invites
2016-08-03 15:42:19 +01:00
Shane Kilkelly
e7251aab53
Small wording changes
2016-08-03 14:06:08 +01:00
Shane Kilkelly
6ea690225f
Refactor view-invite to not use model calls.
2016-08-03 10:23:34 +01:00
Henry Oswald
892511820e
fix logging on groupPlan invite notification
2016-08-02 17:09:42 +01:00
Shane Kilkelly
3a3688d3d0
Include invites count in canAddXCollaborators
2016-08-02 15:42:50 +01:00
Shane Kilkelly
2494026b85
Move Helpers/EmailHelpers to Helpers/EmailHelper
2016-08-02 15:42:26 +01:00
Henry Oswald
418d1c56da
nullcheck qqfile on upload files
2016-08-02 15:36:59 +01:00
Henry Oswald
928777b61c
add null check to redis return value for getValueFromTokenAndExpire
2016-08-02 15:34:44 +01:00
Henry Oswald
2ad0bab976
use underscore.each so it doesn’t blow up on non array.
2016-08-02 15:33:41 +01:00
Shane Kilkelly
13fe000176
Move email parsing code to Helpers/EmailHelpers
2016-08-02 14:30:42 +01:00
Shane Kilkelly
abbd059eae
Refactor to existing addUserIdToProject
function
2016-08-02 13:51:00 +01:00
Shane Kilkelly
63f8fe453a
Use UserGetter rather than User model
2016-08-02 09:48:09 +01:00
Shane Kilkelly
dca1c9be5d
Load invites on project load, rather than asynchronously.
2016-08-01 17:05:37 +01:00
Shane Kilkelly
291a26595c
Remove referal id from invite email link
2016-08-01 15:56:07 +01:00
Brian Gough
5da1b90418
use validate as keyword for syntax checks
2016-07-29 14:59:48 +01:00
Brian Gough
e0d5075fdb
include check option when compiling
2016-07-29 14:59:48 +01:00
Shane Kilkelly
f3a1f32bb1
Test the invalid-invite page
2016-07-29 11:54:08 +01:00
Shane Kilkelly
563247044b
Start testing the invite page
2016-07-29 09:52:55 +01:00
Shane Kilkelly
9c6195fbec
Factor out link builder
2016-07-28 15:59:59 +01:00
Shane Kilkelly
7b18f88145
Merge branch 'master' into pr-email-tokens
2016-07-28 14:53:36 +01:00
Shane Kilkelly
ed65e16e54
If user is member of project, redirect to project.
...
Leave invite in place to expire naturally.
2016-07-28 11:15:11 +01:00
Shane Kilkelly
1cb9c3582d
Don't return early if user is already member.
2016-07-28 09:47:07 +01:00
Shane Kilkelly
62d544ccfc
Redirect to project if user is already member.
...
If invite is missing, and current user is already a member
of the project, then just redirect to the project page
2016-07-27 15:28:22 +01:00
Shane Kilkelly
827629a74a
Invalid-invite page, and re-jigg the share modal
2016-07-27 10:10:44 +01:00
Shane Kilkelly
6162c5ec60
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2016-07-26 14:23:08 +01:00
Shane Kilkelly
e46901a21b
Send an empty keys array when there is no data
2016-07-26 14:23:00 +01:00
Shane Kilkelly
855cc28483
Finish adding project and owner details to the accept-invite page
2016-07-26 14:14:14 +01:00
Shane Kilkelly
2dede5f793
WIP: Working "accept invite" page
2016-07-26 11:46:41 +01:00
Henry Oswald
81744e4301
use cdn for blog
2016-07-26 11:11:28 +01:00
Shane Kilkelly
b898c62e91
Add appropriate query strings to the end of invite link
2016-07-25 16:14:41 +01:00
Shane Kilkelly
16dcbe2cd4
WIP: wire up share-modal frontend to invite system
2016-07-25 15:07:14 +01:00
Shane Kilkelly
73fed8b0bf
Add a getAllInvites
api endpoint
2016-07-25 11:17:47 +01:00
Shane Kilkelly
5438f39f9e
Start testing acceptInvite
2016-07-25 09:58:08 +01:00
Shane Kilkelly
78a410c39d
Remove expiresAt
logic from acceptInvite
2016-07-25 09:07:47 +01:00
Shane Kilkelly
78570817d5
Render a separate template if the invite is not found.
2016-07-22 16:28:00 +01:00
Shane Kilkelly
9e0c44573a
Remove expiresAt
, use mongo TTL instead.
2016-07-22 16:08:56 +01:00
Shane Kilkelly
b201f1a37a
Test getInviteByToken.
2016-07-22 14:21:34 +01:00
Henry Oswald
8492ea7d28
Merge pull request #285 from sharelatex/file-path-checks
...
add file path check on element names
2016-07-22 13:54:05 +01:00
Shane Kilkelly
9fba98cd45
Accept invite, and start testing the invite handler.
2016-07-22 11:38:00 +01:00
Shane Kilkelly
1139444790
add token to body of acceptInvite
action.
2016-07-22 09:27:00 +01:00
Paulo Reis
6a46b46cf4
Expose sign-up date as an user attribute in the editor.
2016-07-21 16:42:22 +01:00
Shane Kilkelly
546517db90
revokeInvite and getInviteByToken functions.
2016-07-21 16:19:15 +01:00
Shane Kilkelly
d9c6df0e47
start adding the ProjectInvite workflow.
2016-07-21 15:56:41 +01:00
Shane Kilkelly
3311b43644
more tests for invite controller
2016-07-21 13:31:54 +01:00
Shane Kilkelly
23a9aadba5
start tests for invite controller
2016-07-21 10:08:22 +01:00
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
5b22be8a0b
Further scaffolding
2016-07-20 15:22:48 +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
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
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
Brian Gough
1d74e6750c
work around for synctex paths containing /./
2016-07-18 17:00:34 +01:00
Brian Gough
5a02e8c656
add support for stopping compile
2016-07-15 16:28:52 +01:00
Shane Kilkelly
0e9beb5653
remove daft redundancy.
2016-07-07 09:42:01 +01:00
Shane Kilkelly
9e35bdcaea
Refactor: add ?
suffix to truth tests.
2016-07-07 09:35:44 +01:00
Shane Kilkelly
dda0841af3
Return early if there are no keys to delete
2016-07-06 15:39:03 +01:00
Shane Kilkelly
fc6cf75ad5
Merge branch 'master' into sk-session-revocation
2016-07-06 13:19:15 +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
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
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
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
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
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
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
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
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
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
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
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
Henry Oswald
2339cda318
added contentful uni pages as fallback
2016-06-06 09:28:53 +01:00
Brian Gough
634c774592
make code clearer when compilation is per-user
2016-06-02 16:54:46 +01:00
Brian Gough
9d7f129b61
add per-user compilation in server
...
when no user is defined, fallback to per-project compilation
2016-06-02 15:48:13 +01:00
Brian Gough
061d4934f1
use url attribute sent back by clsi
2016-06-02 15:46:55 +01:00
Brian Gough
5be1886d43
use path attribute sent back by clsi
2016-06-02 15:43:20 +01:00
Henry Oswald
14cbf4f1c8
removed priority url from proxy to clsi
2016-06-02 13:11:20 +01:00
Henry Oswald
c284465ba5
added clsiformat checker, wired in
2016-06-02 13:09:32 +01:00
Henry Oswald
8a5cb86c31
check _checkRecoursesForErrors before compile
2016-06-01 16:46:41 +01:00
Henry Oswald
1437877b5a
spike to check latex for basic errors before compile
...
Aims to solve following problems which are currently not visible to user:
- project is too big, which files are worst offenders?
- when there are duplicate file names so an 'old' version keeps overrighting a new version
- when a file has the same path as a folder which blows up clsi i.e. images/research images/research/1.png
2016-06-01 12:28:54 +01:00
Brian Gough
b55c469b91
use Url instead for url for "url" module
...
to avoid possible conflicts with use of url as a variable
2016-05-26 16:24:18 +01:00
Brian Gough
d83cd547fb
Merge pull request #247 from sharelatex/add-query-string-to-proxy-and-filter-synctex-requests
...
Add query string to proxy and filter synctex requests
2016-05-25 15:08:49 +01:00
Brian Gough
c7363a9df6
provide separate routes for sync-pdf and sync-code with error checking
2016-05-25 15:00:31 +01:00
James Allen
36ba88297b
Don't hang request in the event of a spelling backend error
2016-05-24 15:11:14 +01:00
James Allen
887631e661
Don't error if the rootDoc_id no longer exists in the project when copying
2016-05-23 14:58:28 +01:00
Henry Oswald
a24f635531
removed uneeded passing of clsiServer to _parseOutputFiles and improve logging
2016-05-21 10:23:17 +01:00
Brian Gough
7f332c0436
support url object with query-string when proxying to clsi
2016-05-20 16:51:19 +01:00
Brian Gough
3c5eb9a730
clean up whitespace
2016-05-20 16:35:00 +01:00
Henry Oswald
c918028d14
removed clsi priorty url
2016-05-20 12:46:14 +01:00
Henry Oswald
61b9a683aa
put clsiCookie vals into subobject in settings
2016-05-19 16:55:58 +01:00
Henry Oswald
04e70735d2
Merge branch 'master' into clsi-dynamic-load
2016-05-19 16:26:54 +01:00
Shane Kilkelly
0ea16f0bcc
Index '.bib' file objects.
2016-05-19 14:58:12 +01:00
Henry Oswald
789257fd4a
use cookie key when setting cookie for jar
2016-05-19 13:52:18 +01:00
Henry Oswald
2abebd850c
Merge branch 'project_url_query' into clsi-dynamic-load
2016-05-19 13:08:20 +01:00
Henry Oswald
dba8d96d11
pass clsiServerId to the client and use it as query stirng for requests
2016-05-18 12:50:50 +01:00
Henry Oswald
b0baea5073
add query string to end of project resources
2016-05-18 10:09:22 +01:00
Shane Kilkelly
4f533147b1
enable range requests on files via ?range=m-n
query string.
2016-05-17 16:59:47 +01:00
Brian Gough
ee15bbeee0
support the direct path to a clsi output file /project/project_id/build/build_id/output/*
...
this avoids use of the query string ?build=... and so we can match the
url directly with the nginx location directive
2016-05-13 10:33:38 +01:00
Henry Oswald
b8510301b6
expire cookie key from setting file length
2016-05-06 12:19:22 +01:00
Henry Oswald
ed4fdd48d7
clsi cookies are given an expire time via settings file
2016-05-05 16:50:18 +01:00
Shane Kilkelly
48b7800c7f
Revert, because mistake.
2016-05-04 10:43:40 +01:00
Shane Kilkelly
aa301dacb9
Return callback with error if an error is emitted on filestore stream.
2016-05-04 09:32:13 +01:00
Henry Oswald
b00bd5cd94
if clsi cookies are not enabled don't call redis, return empty
2016-04-27 17:05:12 +01:00
Henry Oswald
78b08060ab
redis get not multi used for _getServerId
2016-04-27 16:56:21 +01:00
Henry Oswald
1ee94f9bf5
return server id for set server id and _populateServerIdViaRequest
2016-04-27 16:20:10 +01:00
Henry Oswald
616630200a
improve send calls and return correct stuff from _makeRequest
2016-04-20 17:08:11 +01:00
Henry Oswald
18560d8621
set server cookie on every compile response and don't expire on get
2016-04-20 16:17:06 +01:00
Henry Oswald
4d54de8b9a
renamed ClsiRequestManager to ClsiCookieManager and improved logging
2016-04-20 15:06:39 +01:00
Henry Oswald
b37595acf9
persist cookie in redis for compiles.
2016-04-19 16:48:51 +01:00
Henry Oswald
ffa04c7b55
add project url onto query string for compile hashing
2016-04-13 15:38:04 +01:00
Shane Kilkelly
939d7cd042
Merge branch 'master' into sk-tpr
2016-04-11 16:41:34 +01:00
Henry Oswald
424e09ec05
getGroupSubscriptionMemberOf gets plan code
2016-04-05 16:03:46 +01:00
Shane Kilkelly
a686d187ad
Pull refProviders into user model
2016-04-01 11:36:19 +01:00
Henry Oswald
3d719af71e
if subscription is downgraded don't use plan code on subscription, use default instead
2016-03-31 18:04:20 +01:00
Henry Oswald
81cd2adfd3
member_ids != members_id
2016-03-31 17:36:06 +01:00
Henry Oswald
d80191c03b
added more logging and missing err handler in subscription updater
2016-03-31 17:28:03 +01:00
Shane Kilkelly
0ce514a5a6
Add features to the user object in ide.
2016-03-31 17:10:49 +01:00
Henry Oswald
5a201153c7
refactored subscription updater again adding _setUsersMinimumFeatures
...
single place you can call and the users minimum features are set
2016-03-31 16:58:16 +01:00
Henry Oswald
cb3eb88af2
Merge branch 'subscriptionimprovements'
2016-03-31 11:58:56 +01:00
Henry Oswald
db8fb63bb5
fixed change payment details page
...
also increased size of year field for firefox users
and removed unnded options in new plan page
2016-03-31 11:54:52 +01:00
Henry Oswald
1a651b38f4
added sendgrid as email option
2016-03-29 14:15:33 +01:00
James Allen
3fe0674462
Revert "Add error handling in mkdir_p"
...
This reverts commit c2458cd19018fe05199ce3b33fd4e9230d1cf319.
Apparently mkdirp needs errors to be ignored to work...
2016-03-23 15:33:01 +00:00
James Allen
4d0fe3bf5d
Add error handling in mkdir_p
2016-03-23 15:18:10 +00:00
James Allen
ae5467894b
Standardise on one Errors file
2016-03-23 15:14:49 +00:00
James Allen
bad9a0282d
Add missing error handler
2016-03-23 14:38:11 +00:00
James Allen
3d8ac9f292
Add in a few null checks
...
These were discovered by using a project that was messed up with the moving
folder bug where the folder ended up without an id, docs or fileRefs array
2016-03-23 10:54:36 +00:00
Henry Oswald
c554b0630d
if user has subscription before joining group is given option to cancel personal one
2016-03-22 16:59:47 +00:00
Henry Oswald
a6859e22b3
if user is member of group on downgrade use the group subscription
2016-03-22 16:05:46 +00:00
Henry Oswald
7fb0249b2b
null check subscription for custom accounts page
2016-03-22 14:19:46 +00:00
James Allen
f182fbf396
Convert 'anonymous-user' from real-time api in 'null' internally
2016-03-22 09:53:47 +00:00
James Allen
2af2dd694e
Use null to represent anonymous user, as AuthorizationManager expects
2016-03-22 09:39:25 +00:00
James Allen
7791805949
Allow admin access to projects
2016-03-21 17:03:41 +00:00
Henry Oswald
840d3b75bb
listen for close not exit when working with unzip command
...
sometimes the command will fail because stout has not finished yet
2016-03-21 16:37:29 +00:00
Henry Oswald
4d7ed1cb17
improved logging from unzip command
2016-03-21 16:00:12 +00:00
James Allen
9a0ec9c292
Don't throw fatal error when recently compiled
2016-03-21 13:54:45 +00:00
James Allen
6beb29f449
Don't treat no root resource as a fatal error
2016-03-21 13:28:53 +00:00
James Allen
8fb3e629e8
Require logins for all uploads to projects
2016-03-21 13:23:14 +00:00
James Allen
0ba70e7ccc
Remove missing parameter in log lines
2016-03-21 13:15:57 +00:00
James Allen
2a9e451876
Refine error page to in all situations, and don't send sentry errors on not found errors
2016-03-21 11:55:59 +00:00
James Allen
e7d67668e9
Improve error reporting and show 404 when project ids are malformed
2016-03-18 15:59:12 +00:00
Shane Kilkelly
f3db114654
Use the mongojs based apis to get Project and User information.
2016-03-18 11:20:33 +00:00
James Allen
de02928454
Merge branch 'master' into ja_email_tokens
2016-03-17 17:01:26 +00:00
Henry Oswald
c980382196
make calls to learn wiki run in parallel,
...
only saves about 150ms but ever little helps
2016-03-17 12:55:28 +00:00
James Allen
60a39f82c1
Fix off by one bug in moving folders from using an out of date project structure
2016-03-15 15:14:54 +00:00
James Allen
75d9912449
Use _.defaults to simplify assigning default features
2016-03-15 14:44:06 +00:00
James Allen
b7d226f434
Make privilege level check in EditorHttpController more explicit
2016-03-15 14:39:27 +00:00
James Allen
261466b042
Convert privilege levels to an enum
2016-03-15 14:35:01 +00:00
James Allen
398d43e2d1
Add missing ? check
2016-03-15 14:15:25 +00:00
James Allen
fe1f71413e
Use ProjectGetter, not Project, in ProjectController.loadEditor
2016-03-15 14:12:43 +00:00
James Allen
d09705142e
Add in missing error checks
2016-03-15 14:07:34 +00:00
James Allen
5781894453
Do array null check in callback args
2016-03-15 14:05:59 +00:00
Henry Oswald
76b3a78988
added lock around move element
2016-03-15 12:29:41 +00:00
Henry Oswald
ba9bc3a2e8
check that element being inserted has an _id
2016-03-15 11:29:59 +00:00
James Allen
b556d57f40
Remove missed console.log debugging lines in AuthenticationController.coffee
2016-03-14 17:11:23 +00:00
James Allen
71ef045728
Implement authorization guards in Authorization{Manager,Controller}
2016-03-14 17:06:57 +00:00
Henry Oswald
f24bc2c501
log out error when can't send to tpds worker
2016-03-14 14:44:45 +00:00
Henry Oswald
1b39b01114
check err on _putElement for file in project
2016-03-14 14:42:13 +00:00
Henry Oswald
8be55f760f
swallow error if tpdsworker can not be comunicated with on addFile
2016-03-14 10:49:28 +00:00
Henry Oswald
3fc357a343
Merge branch 'master' into projectsizelimit
2016-03-14 10:31:07 +00:00
Henry Oswald
086875d50c
added logging
2016-03-14 10:08:47 +00:00
Henry Oswald
15c6e49d1a
if user changes email then check if they have a site licence
2016-03-13 22:31:14 +00:00
Henry Oswald
8812ff445e
change zip size check to spawn
2016-03-12 15:43:16 +00:00
Henry Oswald
f11ba97389
check stat.isFile and isDirectory rather then symlink
2016-03-12 15:05:29 +00:00
Henry Oswald
6664b67fba
check size of zip files
2016-03-12 12:38:21 +00:00
Henry Oswald
da242d90e6
added extra isSymLink checks into reading files
2016-03-12 12:01:36 +00:00
James Allen
1bd8b8d1a3
Delete SecurityManager and replace with (unwritten) AuthorizationManager
2016-03-10 17:17:26 +00:00
James Allen
3e03164ed4
Remove dead auth_token code
2016-03-10 17:15:14 +00:00
Henry Oswald
347bfe4a79
use cb for internal callbacks
2016-03-10 12:43:36 +00:00
Henry Oswald
3c4e74af4b
project duplicator works and tests pass.
...
not so bad now.
2016-03-10 12:42:21 +00:00
Henry Oswald
d801ab623a
project duplicator works, tests don't
2016-03-10 11:58:05 +00:00
James Allen
e36be96ec9
Move public access setting to its own end point
2016-03-10 11:13:57 +00:00
Henry Oswald
bf8f9f6d41
change key to maxEntitiesPerProject
2016-03-09 15:53:03 +00:00
Henry Oswald
940586f654
sped up unit tests to improve speed
...
also removed some unneeded requires.
2016-03-09 12:51:19 +00:00
James Allen
4f9f255153
Extend acceptance tests to include shared projects
2016-03-09 12:31:46 +00:00
Henry Oswald
a33b480c67
added more logging to subscription group handler
2016-03-09 11:20:17 +00:00
Henry Oswald
5be05a35d8
added WithProject versions of functions
...
rather than project_or_id
2016-03-09 11:16:27 +00:00
Henry Oswald
57f00d76bd
get project name on entity move
2016-03-08 14:46:53 +00:00
Shane Kilkelly
3e423b8a06
Another find->findOne
2016-03-08 14:38:25 +00:00
Henry Oswald
ede159d833
changed logging for archiving projects from delete to archived
2016-03-08 14:38:23 +00:00
James Allen
76af5e5563
Don't call deprecated findPopulatedById in loadEditor
2016-03-08 14:20:00 +00:00
James Allen
359689ffea
find -> findOne
2016-03-08 14:19:38 +00:00
James Allen
0882eb2a99
Don't use deprecated Project.findPopulatedById in ReferencesManager
2016-03-08 14:05:56 +00:00
James Allen
5f5445f625
Use TpdsUpdateSender to use CollaboratorsHandler
2016-03-08 11:54:45 +00:00
James Allen
e814dfa7a8
Proxy .gif files to the blog too
2016-03-07 16:39:16 +00:00
James Allen
a50bdaf5cc
Refactor LimitationsManager to use CollaboratorsHandler
2016-03-07 15:32:04 +00:00
James Allen
bedc8a0492
Remove ProjectGetter.populateProjectWithUsers
2016-03-07 15:25:10 +00:00
James Allen
2ba2b72fd1
Refactor ProjectDeleter to use CollaboratorHandler
2016-03-07 12:27:40 +00:00
James Allen
6d93076d51
Refactor getCollaborators http method to use CollaboratorsHandler
2016-03-07 12:02:48 +00:00
James Allen
1a689aa1fd
Move findAllUsersProjects from Project to ProjectGetter
2016-03-03 17:19:03 +00:00
James Allen
120a142733
Add in required abstracted functions to CollaboratorsHandler
2016-03-03 16:13:19 +00:00
Henry Oswald
4af0341e84
don't stop if add entity doens't make it to tpdsworker
2016-03-02 17:34:21 +00:00
Henry Oswald
39c7010d72
fixed broken tests
2016-02-29 22:51:46 +00:00
Henry Oswald
76591ebb23
made ProjectGetter.getProject more robust
...
it can deal with multiple types of query better, including mongoose ids which are not being matched like mongojs ids.
2016-02-29 19:01:46 +00:00
Henry Oswald
6a7395a287
brought back the project_or_id style
...
Added functionality into project getter, its a big performance improvement for things like cloning projects. Clone a 500 element project, 1 mongo get or 500.
2016-02-29 17:34:38 +00:00
Henry Oswald
b5dd96aa71
fixed some mongo calls in project entity handler
...
need to specify fields you want to not get array back.
2016-02-29 16:03:22 +00:00
Henry Oswald
1e8523c227
don't emmit to room new entities if they errored.
2016-02-29 13:05:37 +00:00
Henry Oswald
8f0d1dc73e
add in the calls to block large projects
2016-02-29 13:05:17 +00:00
Henry Oswald
8aec86af4e
moved count element to project entity handler and added tests
2016-02-26 13:25:09 +00:00
Henry Oswald
d95526bd8b
ProjectGetter.findRootDoc moved to mongojs
2016-02-26 08:35:10 +00:00
Henry Oswald
eedaa43b58
move project duplicator to mongojs
2016-02-26 08:32:00 +00:00
Henry Oswald
6ca69f88ac
Move project locator to mongojs
2016-02-26 08:31:47 +00:00
Henry Oswald
586d4cbae1
replaced all mongoose Project.find with mongojs calls
2016-02-26 08:23:43 +00:00
Henry Oswald
b6d62a677b
ProjectDeleter.archiveProject doesn't need to get entire project
2016-02-26 08:13:41 +00:00
Henry Oswald
447568aa91
ProjectDetailsHandler.getDetails does not need full project
2016-02-26 07:56:26 +00:00
Henry Oswald
43102e0ffc
lowercase and trim add user to group email address
2016-02-25 14:15:56 +00:00
James Allen
155831c3e7
Skip top-level directory if it exists in zip upload
2016-02-24 17:21:20 +00:00
James Allen
c6dcb64b18
Overwrite text files from uploads
2016-02-24 16:37:03 +00:00
Henry Oswald
09ac8f8c7a
move .putElement into ProjectEntityHandler with tests
2016-02-24 15:36:39 +00:00
Henry Oswald
1e6f5997dc
use cb for internal async callbacks and inline call
2016-02-23 15:50:30 +00:00
Henry Oswald
7a28eeeaa0
ProjectEntityHandler.addFolder take only project id and
...
only gets project folder structure
2016-02-23 15:45:40 +00:00
Henry Oswald
1278081b51
mkdirp only needs folder strucutre
2016-02-23 15:36:59 +00:00
Henry Oswald
1d76850ebd
copyFileFromExistingProject does not need the whole project
2016-02-23 15:34:31 +00:00
Henry Oswald
b504732733
fixed calls to addUserToGroup and added more logging
2016-02-22 16:50:41 +00:00
Henry Oswald
103bb1c88f
add more error logging to group handler
2016-02-22 16:01:26 +00:00
Henry Oswald
85a8bc97ed
add leave group button for group subscriptions
2016-02-19 12:27:32 +00:00
Shane Kilkelly
b505f0d455
Merge branch 'sk-references-search'
...
Conflicts:
app/coffee/Features/References/ReferencesController.coffee
2016-02-19 11:30:55 +00:00
Henry Oswald
29e4b324fd
improve calls for invite notifications and auto mark as read
2016-02-18 11:43:43 +00:00
Henry Oswald
f824a3e28a
kill off dead code in group handler
2016-02-18 11:42:26 +00:00
Henry Oswald
bd54cc722a
fixed broken tests in AuthenticationController
2016-02-18 10:16:50 +00:00
Henry Oswald
fc4bd94a6e
don't create notification if user is already part of group
2016-02-18 10:06:21 +00:00
Henry Oswald
c8084406d3
user notifications auto created on login for joinging groups
2016-02-17 16:24:09 +00:00
Henry Oswald
735f7bd51e
change res.send to res.sendStatus for new express
2016-02-16 12:38:27 +00:00
Henry Oswald
f5910762c1
fixed missign translation for when email is already registered
2016-02-16 12:38:27 +00:00
James Allen
b3a2d44937
next -> callback
2016-02-16 11:12:07 +00:00
Henry Oswald
87ef2cc563
Merge branch 'nodemailer2'
2016-02-15 14:52:58 +00:00
Henry Oswald
ef148da7aa
remove un needed require
2016-02-12 17:15:13 +00:00
Henry Oswald
05bf048885
upgrade to nodemailer 2.0 and dynamically use either SES or SMTP depending
...
on what is in settings file
2016-02-12 17:13:45 +00:00
Henry Oswald
8e5907f79e
have null array as default for notifications
2016-02-11 12:10:30 +00:00
Henry Oswald
5c5888b5dc
Merge branch 'pr/221'
2016-02-11 11:44:45 +00:00
Shane Kilkelly
326d9e59f8
Refactor ReferencesSearch*
to just References*
.
2016-02-08 17:04:27 +00:00
James Allen
b978171e0c
Fix "cannot set headers after sent" in setting doc end point
...
If somehow a project ends up with the same doc/file in two locations in the
file tree, then projectLocator.findElement will return the callback for
both entries. This then tries to end the request multiple times. Of course
this should never be a state the project is in, but if it is we should catch it.
2016-02-05 15:39:26 +00:00
Henry Oswald
de0589b051
added notifications calls for sending to api and mark as read
...
not creating it yet
2016-02-05 14:13:38 +00:00
Henry Oswald
f136486f4b
cleanup layout of notifications
2016-02-04 14:28:31 +00:00
James Allen
6143b2218c
Send user_id on Dropbox requests through to doc updater
2016-02-04 14:27:00 +00:00
Henry Oswald
47eebb1840
add null check and default empty object for subscirption dashboard
2016-02-03 17:41:05 +00:00
Henry Oswald
7994528c92
make site licence regex more specific
2016-02-03 16:08:29 +00:00
James Allen
4c626f23e7
Merge pull request #224 from sharelatex/ja_draft_mode
...
Draft mode for compiles
2016-02-02 15:04:21 +00:00
James Allen
425a9b9db2
Add in option to compile in draft mode
2016-02-02 14:50:48 +00:00
Henry Oswald
6cd66c7304
allow rate limiter to work on api router where session does not exist
2016-02-02 12:31:54 +00:00
James Allen
b32178182d
Explicitly create tags and get their id
2016-02-01 10:18:56 +00:00
James Allen
77cc6af35e
Update add tag end point to use tag_id
2016-02-01 10:18:56 +00:00
James Allen
f1e65cc776
Use tag_id for deleting tags from project
2016-02-01 10:18:56 +00:00
James Allen
1bd5aef85f
Allow renaming of tags
2016-02-01 10:18:56 +00:00
James Allen
1a86e69d1f
Allow tags to be deleted
2016-02-01 10:18:56 +00:00
Shane Kilkelly
50a451970b
Merge branch 'master' into sk-references-2
2016-01-28 10:06:41 +00:00
Shane Kilkelly
cc818695ef
Split References.index into index and indexAll.
2016-01-27 16:00:53 +00:00
Shane Kilkelly
ec8a12d445
Flush changes to mongo before sending request to references service
2016-01-27 13:33:42 +00:00
Shane Kilkelly
fed10280ab
Use docstore url rather than going through web api.
2016-01-27 09:58:54 +00:00
Shane Kilkelly
d1e53f0cb8
Test ReferencesSearchHandler.index
2016-01-26 16:14:17 +00:00
Shane Kilkelly
8a991b0d06
Start testing ReferencesSearch feature
2016-01-26 14:29:23 +00:00
Henry Oswald
690b195f1a
move login success to .json as it sends json over
2016-01-25 17:35:57 +00:00
Henrique Santos
9429e49cf8
finishing frontend
2016-01-22 18:08:39 -02:00
Shane Kilkelly
c911b7d6a3
Broadcast references-key changes back to connected clients.
2016-01-22 15:59:43 +00:00
Shane Kilkelly
af75bb8a60
wip: change how indexing of references works.
2016-01-22 14:23:59 +00:00
Henrique Santos
2d11705837
fix issues in first commit
2016-01-22 03:41:22 -02:00
Henrique Santos
476eaa8b84
add notification backend and unit test
...
add notification init frontend
2016-01-21 18:42:50 -02:00
Shane Kilkelly
307f78b831
WIP: send multiple bib files and get back keys
2016-01-21 17:01:24 +00:00
Shane Kilkelly
d5d5ba9066
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2016-01-20 14:02:24 +00:00
Shane Kilkelly
0b28e7e964
send a fullIndex
flag along to references service.
2016-01-20 13:53:28 +00:00
James Allen
bcb9e1180b
Add jobs page
2016-01-20 11:56:08 +00:00
James Allen
ed5872702a
Pass image to wordcount end point in CLSI
2016-01-19 14:17:01 +00:00
James Allen
5125aa0089
Make templates a premium feature
2016-01-19 13:37:22 +00:00
Shane Kilkelly
41aaefc1f6
Enable pre-indexing of references
2016-01-18 11:41:30 +00:00
Shane Kilkelly
2a7894f6e4
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2016-01-15 14:41:12 +00:00
Shane Kilkelly
20757b11b8
Add code to automatically index bib files on project load.
2016-01-15 14:41:05 +00:00
James Allen
03d75944b0
Allow image name to be configured
2016-01-15 10:26:36 +00:00
Shane Kilkelly
b49ed15c14
Fix missing comma
2016-01-14 15:13:19 +00:00
Shane Kilkelly
ca0a625dcc
Begin work on indexing the references when project is opened.
2016-01-14 14:53:08 +00:00
Shane Kilkelly
1e904e6ab7
Merge branch 'master' into sk-references-ac
2016-01-13 11:31:58 +00:00
Henry Oswald
a181905ab8
removed console.log
2016-01-04 11:42:54 +00:00
Shane Kilkelly
a63028bad3
Test the ReferencesSearchHandler
2015-12-31 10:28:19 +00:00
Shane Kilkelly
d9ca9fc06d
Fix comically long lines.
2015-12-31 09:22:35 +00:00
Shane Kilkelly
86d69f3275
Start testing ReferencesSearch.
2015-12-30 15:08:12 +00:00
Shane Kilkelly
8c9c476dd7
Fetch the list of keys from references index.
2015-12-18 16:00:24 +00:00
Shane Kilkelly
c9db11edbe
Change to using project_id rather than user_id in references index.
2015-12-18 14:57:36 +00:00
Shane Kilkelly
e684968a59
Add ability to request the doc as plain text, rather than a json object.
...
This makes it much easier to stream-parse the document.
2015-12-18 13:36:25 +00:00
Shane Kilkelly
1ea13a74dd
Refresh the references when the bib file is closed.
2015-12-17 15:13:02 +00:00
Shane Kilkelly
249dd638ec
experimental: update references index from fronted.
2015-12-17 11:51:14 +00:00
Henry Oswald
501763bb4e
changed add doc to use ligher mongo call (folders only)
2015-12-15 13:27:41 +00:00
Henry Oswald
763f16f43c
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-12-12 11:39:54 +00:00
James Allen
e8f21986dd
Refactor registration so it can be called from modules
2015-12-11 17:11:20 +00:00
James Allen
c0dfdb3bd8
Use translations for activation page
2015-12-11 14:25:17 +00:00
James Allen
1e8ab5357b
Improve pre-registered account activation process
2015-12-11 11:30:06 +00:00
Henry Oswald
13af9b7b56
find project by name should only find active projects
2015-12-10 17:06:00 +00:00
Henry Oswald
aafdeb031e
wip - downgrade options it all works, need unit tests & translations
2015-12-08 18:23:28 +00:00
Henry Oswald
156f646613
increase number of files that can be uploaded & limit 1 concurent
2015-12-07 16:50:09 +00:00
Henry Oswald
8590af3e49
added rate limit on server side for file uploads
2015-12-01 13:08:49 +00:00
Henry Oswald
91a84cb232
increase compile throttle limit
2015-11-25 11:07:53 +00:00
Henry Oswald
61182451f1
removed SubscriptionDomainHandler from user controller
2015-11-23 15:12:30 +00:00
Henry Oswald
ba58509a67
increased length rate limit is in effect for
2015-11-16 12:21:06 +00:00
Henry Oswald
4e8eebb482
increase rate limit threshold on pdf downloads
2015-11-11 09:00:38 +00:00
Henry Oswald
16670cb3e3
only rate limit full pdf downloads
2015-11-10 16:23:55 +00:00
Henry Oswald
23fd12c67d
dropped throttle for full pdf download to 30 over 5 mins
...
1 download every 10 seconds which seems ample
2015-11-10 11:53:11 +00:00
Henry Oswald
c8ba7b72ab
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-11-10 10:36:06 +00:00
James Allen
a153c6682a
Put in client side check for document getting too long
2015-11-06 12:51:43 +00:00
James Allen
16b7bf222a
Merge branch 'contacts'
2015-11-05 10:14:25 +00:00
James Allen
c46f62cfc1
Ensure that a user can only be added to project once
2015-11-02 15:21:41 +00:00
Henry Oswald
cf48c94725
rate limit pdf downloads
2015-10-30 11:56:01 +00:00
Henry Oswald
5e19d710ba
change error handling on spelling
2015-10-22 20:15:50 +01:00
Henry Oswald
1c91de0395
added function to get project with only folders for quicker adding of files to large projects
2015-10-21 16:56:06 +01:00
Henry Oswald
885915916a
check if user exists on recurly callback
2015-10-21 11:27:13 +01:00
Henry Oswald
d9734953a6
don't archive project in track changes for moment
2015-10-20 17:36:37 +01:00
Henry Oswald
79a694b5c8
for spelling attach error handler first
2015-10-20 09:55:12 +01:00
Henry Oswald
2b8dd7248a
added subscription handler null check
2015-10-19 22:29:11 +01:00
Henry Oswald
d80179ecc6
added missing null check in
2015-10-19 22:14:52 +01:00
Henry Oswald
0c74673e04
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-10-19 15:44:54 +01:00
Henry Oswald
2c32126f68
archive in track changes as well as docstore
2015-10-19 15:44:50 +01:00
James Allen
36678301e6
Try to put a new doc in the docstore first so that if it fails it doesn't leave a broken doc_id in the project
2015-10-16 12:34:33 +01:00
James Allen
d996ed6e47
Refactor addUserToProject for better access by groups
2015-10-14 17:29:58 +01:00
James Allen
c4e4f2c77a
Add modules hook for contacts and support groups in auto complete
2015-10-08 18:17:53 +01:00
James Allen
78c5741d06
Add contact when adding collaborator
2015-10-08 16:42:23 +01:00
James Allen
d11d536994
Refactor adding and removing collaborators to not go through EditorController
2015-10-08 14:15:36 +01:00
James Allen
8cc7869b03
Pull in contacts from contacts api and send to tag-input for autocomplete
2015-10-07 17:32:35 +01:00
Henry Oswald
f1d07811df
update the entire users features on assign bonus bu don't update
...
the user features if there is nothing to update when assigning bonus
2015-10-07 13:50:51 +01:00
Henry Oswald
b69ec9768d
bonus allocater does not need to check if user has subscription any more.
2015-10-05 16:50:34 +01:00
Henry Oswald
fae7d431f4
after subscription is updated always check bonus
2015-10-05 16:33:13 +01:00
Henry Oswald
9a60617162
change referral allocated to only upgrade features and to find highest level
...
i.e. user has referred 5 users, there are bonus levels for 3 & 6 shares, auto takes 3 users now.
2015-10-05 12:30:03 +01:00
Henry Oswald
9a72667e91
added word count UI feature.
2015-09-14 15:28:19 +01:00
Henrique Dias
d228fd88ab
add worcount file param
2015-09-11 09:53:06 -03:00
Henrique Dias
77c2162872
add wordcount clsi handler
2015-09-10 12:41:48 -03:00
James Allen
639424f664
Don't error on project clone if not root doc is set
2015-09-02 14:32:21 +01:00
James Allen
40704b486e
Don't lock up on very long lined documents
2015-08-28 16:52:09 +01:00
Shane Kilkelly
0aaeb6671e
Keep password reset token in session, and strip it from reset page url.
...
This fixes an issue where the reset token was leaked in the referrer header
when navigating away from the password reset page to an external site.
Now we get the token from the query string, store it in the session,
then redirect to the bare url of the password reset page, which then
uses the stored token to render the reset form.
2015-08-24 11:53:33 +01:00
Henry Oswald
a53e3b80cf
if blog or universities site is down don't crash, send 500
2015-08-20 16:55:16 +01:00
Shane Kilkelly
aab7a8713e
Catch the case where filename is shorter than the extension length.
2015-08-20 15:56:30 +01:00
Shane Kilkelly
2dd56d0b32
If we're sending a html file to mobile-safari, do so as plain text.
...
This prevents safari from trying to render the page,
which it does because it ignores the "Content-Disposition" header.
2015-08-20 12:02:43 +01:00
Henry Oswald
63580f6a79
remove useClsi2 flag in project collection
2015-08-19 11:58:41 +01:00
Henry Oswald
a777fcc5a6
changed post to deactivate projects to set params via body rather than query params
2015-08-19 11:55:35 +01:00
Henry Oswald
50fc886c94
changed inactive to active as its more effienct query in mongo
2015-08-19 11:54:30 +01:00
Henry Oswald
d3499acd7b
pass options through stating how long ago want to archive from and limit
2015-08-14 14:11:53 +01:00
Henry Oswald
70b825fd2a
fixed call to ProjectUpdateHandler.markAsOpened and made it async
2015-08-14 11:27:11 +01:00
Henry Oswald
66b87df17c
added deactivate project endpoint
2015-08-14 11:26:11 +01:00
Henry Oswald
bec9bf5c87
replace lodash with underscore in this project
2015-08-14 09:42:27 +01:00
Henry Oswald
a0142d4415
added inactive and reactivate project logic
2015-08-13 22:40:28 +01:00
Henry Oswald
417fd4f5f5
add logging to tell us how long since a project that is being opened was last updated
2015-07-22 10:38:48 +01:00
Henry Oswald
c12213b46b
added logging around load editor times
2015-07-22 10:38:28 +01:00
Henry Oswald
a786b623a8
added logging to help debug slow project list page loading
2015-07-22 01:06:23 +01:00
Henry Oswald
3ecf201eda
send -> sendStatus
2015-07-08 16:56:38 +01:00
Henry Oswald
9a49ce4a0e
removed extra req.session.destroy
2015-07-08 12:58:02 +01:00
Henry Oswald
8020cd8f47
removed tpds from settings.defaults.coffee, if not set updates are now not queued
2015-07-02 12:09:08 +01:00
Henry Oswald
7fd29b18a8
destroy users session before creating a new one for them after login
...
session changed to prevent against fixation attacks
2015-07-01 15:29:02 +01:00
Henry Oswald
4f0b922a5d
changed name used when project or file uploaded, this changed when
...
we started using https://github.com/expressjs/multer
* originalname - Name of the file on the user's computer
* name - Renamed file name
2015-07-01 15:28:49 +01:00
Henry Oswald
15a57f5dc4
removed req.session.destorys from endpoints now on the api router which are not needed
2015-07-01 15:26:05 +01:00
Henry Oswald
1cc0cbe8fc
split site into 2 routers, webRouter and apiRouter
...
web router has things like sessions etc added onto it. Api router is minimal, doesn't include things like csrf
2015-07-01 15:23:18 +01:00
Henry Oswald
665bdcf538
v1 of express4 conversion
2015-07-01 15:17:43 +01:00
Henry Oswald
84bf0dd9a3
added timeout and logging for tpdsworker queing via http
2015-06-23 11:19:23 +01:00
Henry Oswald
b83fe4dcf9
put tpdsworker url in from settings
2015-06-23 11:13:05 +01:00
Henry Oswald
2ec925b45e
fairy removed from web, makes http request to tpds worker now
2015-06-22 22:33:04 +01:00
Henry Oswald
33aa5c732f
if a domain licence link has expired render a nice message explaining they need to retry
2015-06-01 12:43:42 +01:00
Henry Oswald
cb48242b74
changed email expire to 1 day for verifying account
2015-06-01 12:22:46 +01:00
Henry Oswald
6727c3ee00
changed ShareLaTeX thoughts to go into type form
2015-05-29 16:27:35 +01:00
Henry Oswald
d3f6c0c614
Merge branch 'user-csv' of git://github.com/heukirne/web-sharelatex into heukirne-user-csv
2015-05-29 12:17:54 +01:00
Henry Oswald
e4011b9ba1
Merge branch 'emailverification'
2015-05-29 12:10:02 +01:00
Henrique Dias
f50eb0398f
add export csv group feature
2015-05-28 16:54:41 -03:00
Henry Oswald
43c4531e51
kill off CollaboratorsHandler. changeUsersPrivilegeLevel as it is not used anywhere
2015-05-28 13:02:08 +01:00
Henry Oswald
22b94e9246
renamed SubscriptionDomainAllocator -> SubscriptionDomainHandler
2015-05-27 20:57:54 +01:00
Henry Oswald
4773d6d22f
added tests around new endpoints for joining groups
2015-05-27 20:50:16 +01:00
Henry Oswald
f27c072ae1
pull logic checking if user is already part of a group out of controller into handler
2015-05-27 16:33:47 +01:00
Henry Oswald
72e528e9d1
if you are alread in the group show the custom group page
2015-05-27 15:50:28 +01:00
Henry Oswald
79fa49a43d
if a user is elelable to be part of a group subscription and they go to
...
/user/subscription it should redirect them to the group subscription invite
2015-05-27 15:35:31 +01:00
Henry Oswald
1d21bddcf5
fix Onetime token handler path
2015-05-27 15:06:36 +01:00
Brian Gough
a5d14f4ffb
handle unexplained case where smokeTestModule is undefined
2015-05-26 16:33:02 +01:00
Henry Oswald
481bd67fbd
changed paths to use hyphens and add succesfull join page
2015-05-26 15:26:45 +01:00
Henry Oswald
841231dbf8
make PasswordResetTokenHandler generic so it can be used for invites
2015-05-26 15:24:09 +01:00
Brian Gough
e51cdb81bd
port leak fixes from smoke-test-sharelatex module
2015-05-26 10:54:55 +01:00
Henry Oswald
cad8d8a23b
v1 basic invite works, not pretty or tested
2015-05-22 13:57:15 +01:00
Henry Oswald
f5c39efcac
patched xss hole with messages not setting the content type correctly
2015-05-19 11:04:52 +01:00
Henry Oswald
9764ab258b
added complex password validation to password resets
2015-04-30 12:05:46 +01:00
Henry Oswald
312c56a24e
allow password resets to be performed when site is not public by adding routes into white list
2015-04-30 11:58:26 +01:00
Henry Oswald
a7640b5bbd
changed authentication controller to use req.parsedUrl.pathname as query strings on req.url were breaking the whitelist
2015-04-30 11:57:40 +01:00
Henry Oswald
6669884f44
Merge branch 'tpds-cleanup'
2015-04-23 10:06:26 +01:00
Brian Gough
396644d314
proposed fix to delete tpds dump files after use
2015-04-15 14:41:38 +01:00
James Allen
5c30a7de67
Add in option for global login requirement (defaults to on)
2015-04-15 11:14:53 +01:00
James Allen
893ff85521
Don't allow password resets for holding accounts
2015-04-14 13:11:49 +01:00
James Allen
8483f249ee
Actually proxy websocket connections
2015-03-20 19:08:48 +00:00
James Allen
393169bc2a
Create a grunt task to create the admin user
2015-03-19 17:36:50 +00:00
James Allen
e2d515f957
Allow public registration module to hook into email system
2015-03-19 17:19:56 +00:00
James Allen
9b8cf7bcfa
Remove public registration and require that a user be registered by an admin
2015-03-19 14:22:48 +00:00
James Allen
93a088618a
Return proper error from registration handler
2015-03-18 16:19:48 +00:00
James Allen
cb948fede2
Move email sending into registration controller
2015-03-18 15:57:01 +00:00
James Allen
0f69ee0f22
Add in proxy for /socket.io so that we don't need to faff with real-time service location
2015-03-09 14:09:09 +00:00
Henry Oswald
97f0fad525
add vat number option to payment form
2015-03-04 18:08:06 +00:00
Henry Oswald
80dc2f9224
send coupon code server side to be applied to users subscription
2015-03-04 17:50:24 +00:00
Henry Oswald
fe3b9bf07a
clients can not rename docs/files/folders to blank name.
...
Client and server side checks added
2015-03-04 11:10:59 +00:00
Brian Gough
c1cde643ef
use send build identifier to clsi only for new pdf viewer
...
old pdf viewer will continue to use the main ouput.pdf file
2015-03-02 14:59:53 +00:00
Brian Gough
0315954b47
Merge branch 'master' into support-cached-pdfs
2015-03-02 09:20:00 +00:00
Brian Gough
5b9f2e8fc1
pass build id through to clsi when requesting pdf
2015-02-26 16:21:44 +00:00
Henry Oswald
161f24ffdf
add flag which requires login for /learn
2015-02-24 22:07:36 +00:00
Henry Oswald
8638b531a5
fire off register to newsletter on user registration as it can be slow
2015-02-23 16:03:45 +00:00
Henry Oswald
c33956c0af
fix jade warnings about missing space, need to escape the module html
...
insertions a different way. != func rather than !{func}
2015-02-23 10:18:48 +00:00
Henry Oswald
4eed88c1ab
broken a err and null check into 2 lines
2015-02-19 10:54:28 +00:00
Henry Oswald
a9660a3a07
add err and null project test for locating project element
2015-02-18 21:57:21 +00:00
Henry Oswald
f8e3fa6308
increase the auto compile limit a little
2015-02-18 21:57:21 +00:00
Henry Oswald
21a01d94d4
check that content exists before adding it to getAllDocs.
...
causing error which I think is blowing up the mongo driver elsewhere
2015-02-18 21:57:21 +00:00
James Allen
000f01fbeb
Remove unneeded uid module
2015-02-17 11:21:50 +00:00
James Allen
8e13ded360
Regenerate the session id after logging in or registering
2015-02-13 11:18:17 +00:00
Henry Oswald
65859468de
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-02-12 09:21:48 +00:00
Henry Oswald
216c9cefe3
don't error on subscription dashboard page if there is no subscription.taxRate
2015-02-12 09:21:45 +00:00
James Allen
50048a53b5
Don't throw an exception if there is an error with unzip
2015-02-11 11:34:49 +00:00
James Allen
e4b77a2563
Merge branch 'dropbox-module'
2015-02-10 11:38:32 +00:00
James Allen
001a5d751b
Pull out templates logic into its own module
2015-02-10 11:24:34 +00:00
Henry Oswald
7030d5f822
change plan shows price including tax
2015-02-06 16:19:52 +00:00
Henry Oswald
86f963a7ec
recurly tax updates
...
- get all accounts does get all of them by looping through all pages
- creating coupons requires which plan the coupon is for
- fixed the total price shown to people so it includes tax
2015-02-06 16:19:52 +00:00
James Allen
6c387edbe2
Remove Dropbox front end logic from main sharelatex repo
2015-02-05 18:20:34 +00:00
James Allen
d7afb4e513
Clean up unused real-time code in web
2015-02-05 16:37:37 +00:00
James Allen
5a922e2356
Include email address explicitly in welcome email to avoid any confusion
2015-02-05 12:52:50 +00:00
James Allen
e35d80211e
Log when rate limit is hit
2015-02-05 09:52:40 +00:00
Henry Oswald
7fdb8009a0
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-02-04 20:20:16 +00:00
Henry Oswald
e4a54cbdfc
added recurly subscription null checks
...
this deals with a user who has an expired old subscription then
is added to a group subscription.
2015-02-04 20:17:55 +00:00
James Allen
4235c90623
Add in rate limit to opening projets
2015-02-04 15:05:35 +00:00
James Allen
860de1528f
Load default coupon code if provided in query string
2015-02-02 17:42:27 +00:00
Henry Oswald
ee83ed6e81
started using underscore.string to check domain emails
2015-02-02 11:15:04 +00:00
Henry Oswald
0a64c1c8ac
on register try and auto allocate a group licence if one exists
2015-01-27 18:22:51 +00:00
Henry Oswald
3360b3c35a
added basic domain allocation feature
2015-01-27 18:09:56 +00:00
Brian Gough
58750140f4
enable new pdf viewer by default for newly created users
2015-01-21 15:26:01 +00:00
Henry Oswald
00810eaf21
Merge branch 'recurlyv3'
2015-01-19 13:51:02 +00:00
Henry Oswald
17fe30ca0f
sanitise the ref for universities site. and remove unneeded sanitise
2015-01-19 10:49:40 +00:00
Henry Oswald
4bcc9fb5c9
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-01-07 16:51:15 +00:00
Henry Oswald
7ec0264fe2
added missing currency symbols to subscription formatter
2015-01-07 16:51:05 +00:00
James Allen
923fbfc574
Correctly handle quote characters in template name when downloading
2015-01-07 13:16:38 +00:00
Henry Oswald
f9843b3709
tax auto updates on change of address now. Is also preset based on users ip address
2015-01-07 13:16:19 +00:00
Henry Oswald
aaaf28f916
added some helper methods into recurly wrapper which can be used by
...
our one time scripts
2015-01-07 12:02:07 +00:00
Henry Oswald
7e64b88fcf
fix cancel subscription on delete user
2015-01-02 10:37:59 +00:00
Henry Oswald
baa0a42825
coupon field is shown if query string scf is shown
2014-12-28 17:51:36 +00:00
Henry Oswald
a7eb836c79
redirect to /thank-you on success and fix broken unit test from a few commits ago
2014-12-22 16:37:09 +00:00
Henry Oswald
5305cbfd3e
got more correct details making it to recurly and improved form.
2014-12-19 11:17:35 +00:00
Henry Oswald
cc545db17b
can add account just about into recurly
2014-12-18 18:59:29 +00:00
Brian Gough
79b560f96b
update tests for new pdf viewer server fixes
2014-12-16 09:44:25 +00:00
Brian Gough
660bb75df4
add query string parameters for compileGroup= and pdfng=
...
compileGroup will bypass mongo check for compileGroup priority
pdfng will pass pdf Range: headers through from user request to CLSI
2014-12-12 16:47:43 +00:00
Brian Gough
fbf9111d80
Revert "revert to original CLSI proxy call"
...
This reverts commit 99b1b0d6598562b6346921504d1d1d37efe3be86.
2014-12-12 15:43:36 +00:00
Henry Oswald
0561adde4b
added more logging
2014-12-12 12:21:14 +00:00
Henry Oswald
bd77d0e020
add null check in on project
2014-12-12 10:27:14 +00:00
Henry Oswald
5c7d77a853
added logging around docstore setting
2014-12-11 16:22:00 +00:00
Brian Gough
8a77d619a8
revert to original CLSI proxy call
...
due to problems with cost of authentication when byte-serving
2014-12-11 13:15:13 +00:00
Brian Gough
265ad4439c
Merge branch 'master' of github.com:sharelatex/web-sharelatex into pdfng
2014-12-05 14:43:01 +00:00
Brian Gough
a4ddfd5725
whitelist proxied headers when requesting pdfs from clsi
2014-12-03 15:09:46 +00:00
Brian Gough
138170be60
pass headers through when proxying request to allow for byte-range/etag handling
2014-12-02 14:53:46 +00:00
James Allen
c70c048aae
Send clear cache requests to the correct CLSI group
2014-12-01 12:19:01 +00:00
James Allen
e0178b17b5
Pass compile group correctly to Clsi._buildRequest
2014-12-01 10:28:09 +00:00
Henry Oswald
a570d05132
fixed bug with setting root doc which would fail if the document class isn't on the top line
2014-12-01 01:07:03 +00:00
James Allen
175dfae085
Look up compile group and features from project owner, not current user
2014-11-28 14:26:21 +00:00
Henry Oswald
20a5ad6e27
fixed where project to large code is passed from
2014-11-27 16:22:39 +00:00
Henry Oswald
fa755c6521
added project to long check from clsi2 (bit of a punt)
2014-11-27 15:42:37 +00:00
Henry Oswald
0bc76b6d92
mkdir p changed so it does not get entire project, now without doc lines
2014-11-27 12:07:49 +00:00
Henry Oswald
63deb0a508
Revert "added lock to update merger"
...
This reverts commit 8cdac1d74fd63d6ef83ce1e60ba41b9195ed0cac.
2014-11-27 11:46:17 +00:00
Henry Oswald
280895bdf5
added lock to update merger
2014-11-27 10:46:52 +00:00
Henry Oswald
ca8a21c425
change async to series
...
no real gain from parallel, series might reduce the cpu load if it finds the doc early
2014-11-26 21:53:57 +00:00
Henry Oswald
5e570d52a0
modfied setRootDocAutomatically to work async
...
was causing cpu to block for along time on big projects
2014-11-26 17:19:21 +00:00
Henry Oswald
857d867191
added locks into editor controller for new/move/deletes
...
filesystem import manager uses the unlocked version
2014-11-26 15:32:23 +00:00
Henry Oswald
dbecadcaea
Merge branch 'master' into multicurrency
2014-11-25 11:35:59 +00:00
Henry Oswald
6c0f03e9c7
added ab test to show collar plan to people in editor
2014-11-24 16:21:03 +00:00
James Allen
b8fdbdb406
Handle errors in request pipes
2014-11-24 13:58:41 +00:00
James Allen
970125b7a8
Check for null project in joinProject
2014-11-24 13:43:08 +00:00
James Allen
3578e41c9c
Add null check into FileTypeManager isDirectory check
2014-11-24 13:39:07 +00:00
James Allen
d4af0fe36d
Wrap smoke test in domain to catch errors
2014-11-24 13:36:10 +00:00
Henry Oswald
6c746d9aec
added redis health check in
2014-11-19 23:18:20 +00:00
Henry Oswald
cd8c233c05
Revert robust redis connection code
2014-11-19 15:06:05 +00:00
James Allen
8b9a26d6f3
Add in http health check end points for redis subscription channels
2014-11-19 14:12:37 +00:00
James Allen
d6532c63f8
Use new robust subscription model
2014-11-19 11:09:42 +00:00
Henry Oswald
804bc16bc8
redirect users to /register when coming from templates or share url
...
redirect to /login when going anywhere else (/project /project/1234)
2014-11-13 17:12:39 +00:00
Henry Oswald
f5d3801bfb
changed findElementByPath to not call cb more than once & deal with nulls
2014-11-11 14:44:44 +00:00
Henry Oswald
ae897cb41d
try catch encodeURIComponent
2014-11-10 16:30:02 +00:00
Henry Oswald
c920874872
added null check to compile features
2014-11-10 11:26:40 +00:00
Henry Oswald
29ae816432
added next into controller for error
2014-11-10 11:23:07 +00:00
Henry Oswald
e9232eb197
try catch converting id to object id
2014-11-09 23:08:23 +00:00
James Allen
84c08edcf3
Factor out common joinProject logic to provide and HTTP end point for the real-time API
2014-11-07 12:31:47 +00:00
James Allen
218f5fedf8
Fix broken template creation route
2014-11-07 11:21:55 +00:00
James Allen
9c5ae5adf4
Remove unused old update method
2014-11-07 09:39:17 +00:00
James Allen
d27af25bc9
Convert template publishing to use HTTP end points
2014-11-06 14:39:40 +00:00
James Allen
7b6ec86cef
Access Dropbox status via HTTP end points
2014-11-06 14:39:40 +00:00
James Allen
e596b60af0
Move collaborator HTTP end points into the Collaborators feature
2014-11-06 14:39:40 +00:00
James Allen
5c3e8e6d88
Add and remove collaborators with HTTP requests, not websockets
2014-11-06 14:39:40 +00:00
Henry Oswald
b9dd2d826e
added null check on subscription for group plans
2014-11-04 10:53:03 +00:00
Henry Oswald
edf715919d
send user to 404 if templates returns 404
2014-11-03 11:48:56 +00:00
Henry Oswald
4c7293f8c2
remove lang from page title in wiki article
2014-11-03 11:48:43 +00:00
Henry Oswald
30100f2a07
fixed badly called flushProjectToThirdPartyDataStore causing issues with initial drobox sync
2014-10-31 12:41:06 +00:00
Henry Oswald
aeb956c8a4
wiki will try and get spanish version of page then fall back to english if it is not there
2014-10-31 12:15:03 +00:00
Henry Oswald
e0aae65050
added file ref null check
2014-10-31 10:50:20 +00:00
Henry Oswald
d428e7e5b4
handle a null in the file refs list
...
this seems to happen now and then when there is networking issues
2014-10-31 10:34:21 +00:00
Henry Oswald
56efefd6d4
renamed variable
2014-10-30 08:33:18 +00:00
James Allen
ca664e0063
Get subscription status correctly for showing upgrade/bonus link
2014-10-27 15:00:46 +00:00
James Allen
f1ddff4061
Only ignore hidden files from Dropbox, not GitHub
2014-10-27 14:39:20 +00:00
Henry Oswald
011bdc4617
explicitly set the file types to delete
...
the wild card version can get mixed up with app.del '/project/:project_id/contents/*', httpAuth, TpdsController.deleteProjectContents
2014-10-24 12:01:52 +01:00
Henry Oswald
0a123418ac
insert ref data into uni page
2014-10-23 14:13:40 +01:00
Henry Oswald
8097e6ad71
made 7 day free trial the default
2014-10-21 13:48:46 +01:00
Henry Oswald
4bd0708029
put the compile group on the session so proxied requests are sent to the correct place
...
I know this is premature optimisation however we do make a lot of requests
to the clsi for each compile and this will save mongo a lot of calls
2014-10-21 09:34:58 +01:00
Henry Oswald
fb53be7ce4
Revert "priority compiles are proxyed to the priority servers"
...
This reverts commit 5375af085a1fc20def19a858e3f63c52f3bec9b0.
2014-10-21 09:16:23 +01:00
Henry Oswald
250606472d
priority compiles are proxyed to the priority servers
2014-10-20 17:48:00 +01:00
Henry Oswald
9be31a2ac1
removed type: from log lines
2014-10-20 14:24:39 +01:00
Henry Oswald
3cf64ce34f
pass new compile features to client side, don't show timeout upgrade for premium users
2014-10-20 12:21:40 +01:00
Henry Oswald
b9d6d5bbf1
set the request timeout to a few mins for the compile
2014-10-17 13:23:29 +01:00
Henry Oswald
e7906f7018
timeout option passed to clsi
2014-10-16 18:43:48 +01:00
Henry Oswald
7293ccf06d
if user has premium compile send them to a different server set
2014-10-16 17:52:21 +01:00
Henry Oswald
5a4a90924b
added default opts for users compile features
2014-10-16 16:57:51 +01:00
Henry Oswald
1506f86a5f
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-10-16 16:34:25 +01:00
Henry Oswald
d97e42a959
get users features for compile options i.e. timeout and which compiler
2014-10-16 16:34:21 +01:00
James Allen
8fa8a64c6f
Update email templates
2014-10-16 12:46:38 +01:00
James Allen
f3a1ba93a4
Fix argument signature of mergeUpdate and deleteUpdate
2014-10-16 11:43:54 +01:00
James Allen
46ecaf9f6c
Fix broken argument signature of addFolder
2014-10-16 11:27:10 +01:00
James Allen
9f1a7c7396
Send source of update to doc updater and allow external updates to be ignored in UI
2014-10-16 11:27:10 +01:00
James Allen
7e9318814d
Send source of update to doc updater on setDocument request
2014-10-15 15:36:08 +01:00
James Allen
6800c1a15e
Track the source of updates through the system on adding/updating of docs and files
2014-10-15 15:18:31 +01:00
James Allen
4f2ab51ebd
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-10-15 14:11:11 +01:00
James Allen
941f550d6c
Remove all traces of soa-req-id
2014-10-15 14:11:02 +01:00
Henry Oswald
af769c7871
allow ip to set via query string for plans page
2014-10-15 11:58:35 +01:00
James Allen
b32375530c
Refactor card css for use in new subscription page
2014-10-14 15:46:44 +01:00
Henry Oswald
b2b13ef9a7
pass plan to payment page to get the number of collaborators
2014-10-14 12:14:24 +01:00
Henry Oswald
4a774981cf
Merge branch 'master' into multicurrency
2014-10-14 11:52:03 +01:00
Henry Oswald
3bac4dc39f
increase auto compile limit
2014-10-14 11:50:06 +01:00
Henry Oswald
6437f74cd3
use req.ip not x-forwarded-for to get ip address for multi currency
2014-10-13 17:55:18 +01:00
Henry Oswald
5a0d74753f
plans page will auto redirect to best guess currency
2014-10-13 17:39:44 +01:00
Henry Oswald
2bf34bba4d
added currency to subscription view model
2014-10-13 16:14:13 +01:00
Henry Oswald
7964616f02
changing email address should lowercase the email
2014-10-13 15:44:45 +01:00
Henry Oswald
36264706f6
hooked the plans page up to the geo ip lookup
2014-10-13 14:10:15 +01:00
Henry Oswald
b90003b11e
added custom user dashboard page
2014-10-10 15:44:53 +01:00
Henry Oswald
3ba3a91043
if its a custom account redirect to /user/subscription/custom_account
2014-10-10 15:11:22 +01:00
Henry Oswald
e5ab40c911
added example session invalidation code
2014-10-09 18:10:01 +01:00
Henry Oswald
e7984a90d7
unlink dropbox when a user cancels
2014-10-09 17:05:41 +01:00
Henry Oswald
9924882b59
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-10-09 16:45:26 +01:00
James Allen
4743b460f5
Only show rename or deleted message once
2014-10-09 09:13:38 +01:00
James Allen
accd8207b2
Show password reset expired message rather than server error if that's what has happened
2014-10-08 17:18:24 +01:00
Henry Oswald
c2c29bb282
university site renders via prozy ok
2014-10-08 16:07:44 +01:00
James Allen
128c672edd
Merge branch 'github-sync'
...
Conflicts:
package.json
2014-10-08 12:13:37 +01:00
James Allen
dbd85a05f1
Send user features and features switches to views where needed
2014-10-07 13:31:13 +01:00
Henry Oswald
8789a4bde1
server rejects rename of entitys over 150 chars
2014-10-07 11:16:26 +01:00
Henry Oswald
b01b05e49b
server rejects project names over 150 chars
2014-10-07 11:14:02 +01:00
James Allen
6c7c09075c
Treat paths properly in project content update methods
2014-10-03 11:33:18 +01:00
James Allen
13a96c925b
Add in endpoints to allow updating project files when the project id is know
2014-10-02 14:15:30 +01:00
Henry Oswald
81307324fc
v2, seems to work...
2014-09-26 17:04:33 +01:00
Henry Oswald
f73629f8d9
v1 of sentinal support
2014-09-26 14:52:00 +01:00
Henry Oswald
9c98e95ca4
send cancelation email after 1 hour
2014-09-16 14:25:12 +01:00
Henry Oswald
6efda9cf1c
push currency default to seperate var
2014-09-11 11:45:00 +01:00
Henry Oswald
20f0c648e5
default to USD
2014-09-11 11:35:39 +01:00
Henry Oswald
1b02dc72a3
destroy session on dropbox webhook
2014-09-10 14:19:44 +01:00
Henry Oswald
d961b48857
imporved logging for session debug
2014-09-10 08:20:36 +01:00
Henry Oswald
93b4c5f4f8
thank you page displays the correct currency
2014-09-08 10:59:12 +01:00
Henry Oswald
aee0dda243
added currency to signiture
2014-09-08 10:36:30 +01:00
Henry Oswald
eeb27062a0
added currency query string param to subscribe button
2014-09-05 11:40:14 +01:00
James Allen
971afb7342
Treat large text files as binary
2014-09-04 13:00:51 +01:00
Henry Oswald
e740e4913d
if user is already annual tell them so on the annual upgrade page
2014-08-29 14:13:05 +01:00
Henry Oswald
350b95a0a5
annual upgrade page works, needs a bit of copy love now
2014-08-28 18:14:31 +01:00
Henry Oswald
f5618e9d9c
added confirm you want to change plan modal
...
added page and corisponding endpoint to migrate to annual plan
2014-08-27 17:51:10 +01:00
Henry Oswald
27b9cad8ca
make ga experiements per page
2014-08-24 17:07:40 +01:00
James Allen
894024ba29
Don't allow folders to be moved into their child folders
2014-08-22 14:38:52 +01:00
Henry Oswald
c91e95d593
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-08-22 14:22:12 +01:00
Henry Oswald
6c131b1084
- removed free trial on annual accounts
...
- added setting val for google analytics experiments to be added in head
- added 14 day free trial variation to plans page
2014-08-22 14:20:39 +01:00
James Allen
c8ab1bd394
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-08-22 12:52:31 +01:00
James Allen
456d194dbb
Merge branch 'james_tmp'
2014-08-22 12:51:35 +01:00
Henry Oswald
4a19d6731a
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-08-21 13:03:54 +01:00
Henry Oswald
b9372e6dcd
added key for your projects
2014-08-21 13:02:28 +01:00
James Allen
f093c99b96
Remove deprecated background dropbox polling logic
2014-08-21 13:01:27 +01:00
James Allen
d0eee7a1e5
Refactor template settings
2014-08-20 14:47:27 +01:00
James Allen
9be7228247
Delay Dropbox polling by 5 seconds and dispatch only a single request
2014-08-14 13:48:23 +01:00
James Allen
7816810249
Add in poll dropbox endpoint back into admin
2014-08-14 10:12:01 +01:00
James Allen
604505131b
Convert integer dropbox id to string when searching mongo
2014-08-13 17:34:45 +01:00
James Allen
670e8e5cb9
Use Dropbox Real-time polling
2014-08-13 17:26:18 +01:00
James Allen
3348249dcd
Download template PDF and zip file with good file names
2014-08-12 12:02:09 +01:00
James Allen
b7ed3bab8f
Merge branch 'redis-queue'
2014-08-11 12:10:25 +01:00
Henry Oswald
4c073ff285
render template name in CanonicalPage
2014-08-08 14:43:07 +01:00
James Allen
b20934e579
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-08-08 11:42:02 +01:00
James Allen
10021986c5
Don't error on password reset if no email found, and translate error messages
2014-08-08 11:41:54 +01:00
Henry Oswald
66ba6e612d
Revert "send 401 when login fails"
...
This reverts commit fb901c6365d37654ba9058f57a71a4e60366688e.
2014-08-08 10:21:17 +01:00
Henry Oswald
7976f2f0fe
send 401 when login fails
2014-08-07 16:28:00 +01:00
James Allen
b367c4a968
Show group subscription status on subscription dashboard page
...
Conflicts:
app/views/subscriptions/dashboard.jade
2014-08-07 15:51:43 +01:00
Henry Oswald
9c6f0faff6
Merge branch 'i18n'
...
Conflicts:
app/coffee/Features/User/UserPagesController.coffee
app/views/layout.jade
app/views/project/editor/dropbox.jade
app/views/project/editor/file-tree.jade
app/views/project/editor/pdf.jade
app/views/project/list/project-list.jade
app/views/user/settings.jade
2014-08-07 14:46:17 +01:00
Henry Oswald
c961cea514
fixed some bits
2014-08-07 13:56:04 +01:00
James Allen
0a44aa9e71
Push into doc updater queue rather than pub/sub for updates
2014-08-07 13:19:10 +01:00
James Allen
a7cf8d6b0a
Sort out title of wiki
2014-08-05 17:08:38 +01:00
Henry Oswald
1e0652888a
removed console.log
2014-08-04 12:21:38 +01:00
Henry Oswald
d047d44079
Changed the error messages which are sent down to the client to be translated first
...
fixed up tests from titles we check when rendering, deleted them as they never
catch anything important, more hastle than they are worth imo.
2014-08-01 14:03:38 +01:00
Henry Oswald
1b8c8b8c48
sorted out titles
2014-08-01 13:47:14 +01:00
James Allen
55ad2ce78d
Include contents page down side of wiki
2014-07-31 16:26:02 +01:00
James Allen
13c6fcb8d9
Handle encoded parameters in request URL to wiki
2014-07-31 13:12:24 +01:00
James Allen
94bcfc0eac
Only store host, not path in wiki URL setting
2014-07-30 15:56:27 +01:00
James Allen
49258fe3dd
Proxy to wiki
2014-07-30 15:44:03 +01:00
Henry Oswald
f906d63067
added some logging around dropbox update
2014-07-29 10:32:11 +01:00
Henry Oswald
344d32d4e8
fixed email logo link
2014-07-29 10:29:40 +01:00
Henry Oswald
2267a484f4
added /home so in dev can easily see home page when logged in
2014-07-28 17:04:17 +01:00
Henry Oswald
b7c6af1341
/home goes to home page, so can look at it when logged in
2014-07-25 14:17:40 +01:00
Henry Oswald
7255231abc
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
...
updated upstream into a topic branch.
2014-07-24 13:57:49 +01:00
James Allen
06ca7c904e
Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
2014-07-24 13:24:20 +01:00
James Allen
1128b45b17
Add in system messages
2014-07-24 13:24:08 +01:00
Henry Oswald
67cba0dfd2
killed info controller and setup features.less for dropbox and feature pages
...
also moved dropbox to external pages
2014-07-24 12:15:54 +01:00
Henry Oswald
a8deac697c
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
2014-07-24 11:29:11 +01:00
Henry Oswald
a7b678a2c0
removed dropbox template that is not needed
2014-07-24 11:29:05 +01:00
Henry Oswald
49f356b38f
removed advisor and themes page
2014-07-24 11:23:53 +01:00
James Allen
fbd36d8b07
Sort of style of admin panel and trim functionality
2014-07-24 11:22:22 +01:00
Henry Oswald
17962426ea
blog returns 404's if the page does not exist in blog
2014-07-23 12:16:52 +01:00
Henry Oswald
83b94f987c
cleaned up few small things with templates
2014-07-23 12:16:31 +01:00
Henry Oswald
a4b02558dc
'carded' the templates page, top search area still needs doing
2014-07-22 17:24:32 +01:00
Henry Oswald
46027128a4
change notifications email top header to the grey we use on the site
2014-07-21 15:52:55 +01:00
Henry Oswald
1322f3e183
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
2014-07-21 14:18:43 +01:00
Henry Oswald
375669cd3b
changed emails to adams design. Does not render brilliantly in gmail, but overall not bad.
2014-07-21 14:18:11 +01:00
James Allen
a3a5aa1c0d
Remove server-side santization of project name, it's all escaped client side now
2014-07-21 13:34:25 +01:00
James Allen
1c68ea7328
Don't care if user key has expired when we receive a cursor update
2014-07-21 13:16:07 +01:00
Henry Oswald
554fd7c7d0
change client connection timeout to 15 mins expire in redis
2014-07-17 16:03:53 +01:00
James Allen
37a12e88c1
Show who is online
2014-07-17 15:25:22 +01:00
James Allen
e0f1ed3c10
Use internal url for chat
2014-07-17 11:43:12 +01:00
Henry Oswald
f4b0dec1b8
changed api-key to read-only-api-key for angolia
2014-07-16 16:37:58 +01:00
Henry Oswald
abc4306e06
merge
2014-07-16 13:35:15 +01:00
Henry Oswald
6982ec63ae
changed get template details to findOne
2014-07-16 11:56:22 +01:00
Henry Oswald
cd60817592
made getting templates details parallel
2014-07-16 11:37:17 +01:00
James Allen
8f08823d34
Sort out fingerprints and pdf.js worker path
2014-07-16 11:28:52 +01:00
Henry Oswald
91ca726e66
get template details now includes the markdown description of the project
2014-07-16 11:27:47 +01:00
James Allen
b9f2b02594
Sort out scroll in chat
2014-07-15 18:25:12 +01:00
Henry Oswald
9f82e63a8f
changed :project_id to :Project_id
2014-07-14 22:11:41 +01:00
Henry Oswald
0aa6a206e7
added name and email to connected user data and example get request for chat
2014-07-14 16:23:31 +01:00
Henry Oswald
4a71b38721
added route for getting connected users
2014-07-14 16:16:01 +01:00
Henry Oswald
e6dfef6225
added getting connected users controller
2014-07-14 16:01:58 +01:00
Henry Oswald
b0cf0666fa
changed the redis stuf to multi
2014-07-14 15:38:55 +01:00
Henry Oswald
d13676dab2
cursor data is stored in redis
2014-07-14 15:30:55 +01:00
Henry Oswald
61b7bea203
added ttl to the users set to keep redis clean from inactive projects
2014-07-14 13:20:29 +01:00
Henry Oswald
2b2b995340
refactored updateClientPosition to use async
2014-07-14 12:58:55 +01:00
Henry Oswald
5093820a5f
Merge branch 'master-redesign' into master-redesign-templates-and-blog
2014-07-14 12:42:03 +01:00
Henry Oswald
13aaf042d9
connected user manager logic works correctly
2014-07-14 12:41:06 +01:00
James Allen
e4d9d03f55
Improve feedback on login/register forms
2014-07-11 17:08:19 +01:00
Henry Oswald
d737197e95
marksUserAsDisconnected -> markUserAsDisconnected
2014-07-10 17:01:42 +01:00
Henry Oswald
01ad313133
hooked up editor controller to connected users manager
2014-07-10 17:01:19 +01:00
Henry Oswald
e1dd58aca8
fixed algolia settings and removed some console.logs
2014-07-10 16:05:18 +01:00
Henry Oswald
4ccc56723f
added disconnect funtion in connected users manager
2014-07-10 16:05:05 +01:00
Henry Oswald
c0a6f0b7ad
Merge branch 'master-redesign' into master-redesign-templates-and-blog
...
Conflicts:
public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee
public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee
public/coffee/ide/online-users/OnlineUsersManager.coffee
public/coffee/ide/track-changes/directives/infiniteScroll.coffee
2014-07-10 15:15:18 +01:00
Henry Oswald
025d3147ec
blog intergration works
2014-07-10 14:53:53 +01:00
Henry Oswald
5cf756969e
blog wip
2014-07-09 19:49:39 +01:00
James Allen
16e382bef2
Update Ace and fix autocomplete
2014-07-09 17:59:04 +01:00
James Allen
6d10c186ad
Sort out escaping issues
2014-07-09 11:05:00 +01:00
James Allen
8c56a46594
Merge branch 'master' into master-redesign
2014-07-08 13:24:48 +01:00
James Allen
2553f51e44
Remove unused subscription downgrade logic
2014-07-08 12:55:29 +01:00
Henry Oswald
6dc9d32104
Merge branch 'master-redesign' into master-redesign-templates-and-blog
...
Conflicts:
public/coffee/app/main.coffee
2014-07-08 11:14:56 +01:00
Henry Oswald
581d9ec925
- hooked up chat throughout the stack
...
- removed lots of console.logs
- working on the auto scrol, doesn't quite work yet
2014-07-08 10:08:38 +01:00
James Allen
068d88ec0b
Style bonus page
2014-07-07 15:54:40 +01:00
James Allen
452098ca68
Redirect to register if not registered on plans page
2014-07-07 14:05:07 +01:00
James Allen
7947eb28ad
Remove ab test from plans page
2014-07-07 12:30:19 +01:00
Henry Oswald
d1f907cee5
first simple version of tracking who is active in the editor
2014-07-04 16:18:46 +01:00
Henry Oswald
de010cf971
added error logging
2014-07-04 13:29:59 +01:00
Henry Oswald
0d02241b46
linked chat into the editor real time contorller
2014-07-04 13:20:30 +01:00
Henry Oswald
9c35cfd693
very start of chat controllers done
2014-07-04 13:05:55 +01:00
Henry Oswald
77246b2a07
added query string support onto get requests for limit and before
2014-07-02 17:37:30 +01:00
Henry Oswald
8670b543b9
added basic chat handler
2014-07-02 17:28:05 +01:00
Henry Oswald
978e3262b5
added redirects from config file in, used for old template paths
2014-07-01 15:44:12 +01:00
Henry Oswald
000be22f16
Merge branch 'master-redesign' into master-redesign-templates-and-blog
...
Conflicts:
app/views/project/editor.jade
2014-07-01 15:23:05 +01:00
Henry Oswald
17537b0d7a
client side js for templates loads and works
2014-07-01 14:27:20 +01:00
James Allen
be48ab2a30
Add in basic share modal
2014-07-01 14:12:28 +01:00
Henry Oswald
53fa15d3db
added basic error handling around templates rendering
2014-06-30 17:27:13 +01:00
Henry Oswald
27a97b7fa8
build titles for tempaltes page in web
2014-06-30 17:19:25 +01:00
Henry Oswald
b80f751cb2
templates works basically, needs error handling and few little improvments
2014-06-30 17:08:54 +01:00
James Allen
afb953a489
Display cursor name labels
2014-06-26 11:19:05 +01:00
James Allen
9dfbb36a83
Update project settings over http
2014-06-25 13:51:02 +01:00
James Allen
d214b5dc5e
Merge branch 'master' into master-redesign
2014-06-25 12:14:26 +01:00
James Allen
5aa7daa951
Fix password reset rate limit to work on ip, not email which changes every request
2014-06-25 10:46:58 +01:00
James Allen
d2ac9a1e9f
Add in auto complete
2014-06-24 21:09:20 +01:00
James Allen
f154f17704
Wire up fontSize and mode settings
2014-06-24 20:46:00 +01:00
James Allen
5cef41fdbd
Allow selecting of theme
2014-06-24 20:28:53 +01:00
James Allen
242a866bce
Rename files
2014-06-22 20:08:56 +01:00
James Allen
f931df6084
Allow creation of folders
2014-06-22 14:39:38 +01:00
James Allen
f41534ee4d
Add in creating of files to editor
2014-06-22 12:10:42 +01:00
James Allen
6d0053e709
Start rebuilding editor
2014-06-21 22:20:37 +01:00
James Allen
a64b9eb82e
Create and style external pages
2014-06-20 17:17:24 +01:00
James Allen
a2bb89b579
Merge branch 'master' into master-redesign
2014-06-20 11:18:43 +01:00
James Allen
81845dec32
Wire up account settings forms
2014-06-20 11:15:25 +01:00
James Allen
0ef7e54ad3
Allow partial updates to user settings
2014-06-20 09:42:43 +01:00
James Allen
1bcc0a4554
Send 204 rather than redirect when leaving a project
2014-06-19 13:11:01 +01:00
Henry Oswald
85befe0d57
listen on stdout when unzipping, unsticks some zips for some reason...
2014-06-18 18:18:49 +01:00
James Allen
2b349039c3
Add in backend multiple project downloading
2014-06-18 16:37:18 +01:00
James Allen
b837a4e9f3
Merge branch 'master' into master-redesign
2014-06-18 15:26:09 +01:00
James Allen
70c51cb947
Merge branch 'master' into master-redesign
2014-06-18 10:56:30 +01:00
Henry Oswald
e0be5ef01b
added timeouts to email and newsletter as after a few days there are a few open connections still
2014-06-17 18:18:45 +01:00
James Allen
750b524771
Don't get user id from possibly deleted session
2014-06-17 17:45:07 +01:00
Henry Oswald
426b699865
links in emails use site url
2014-06-17 16:28:52 +01:00
James Allen
aa8969c652
Merge and fix external forms
2014-06-17 16:19:40 +01:00
Henry Oswald
2d55f080d6
get algolia to pull app id and api key from settings file
2014-06-17 12:25:49 +01:00
Henry Oswald
cc1b9472b2
don't show the user details area on project list if algolia instituions has not be setup
2014-06-17 11:59:57 +01:00
James Allen
c56648ab80
Merge branch 'master' into master-redesign
...
Conflicts:
app/views/project/list.jade
public/coffee/list.coffee
public/stylesheets/less/list.less
public/stylesheets/less/style.less
2014-06-17 11:54:29 +01:00
Henry Oswald
3350b99ccf
removed a couple of annoying console.log logs
2014-06-17 10:26:56 +01:00
James Allen
65a1f03768
Send project owner details to client
2014-06-16 13:34:38 +01:00
James Allen
9c5f63817e
Send accessLevel info to client
2014-06-16 12:47:39 +01:00
James Allen
6305ac16f4
Work in progress of doing project list with Angular
2014-06-12 15:22:49 +01:00
Henry Oswald
6dc1e54dc7
basic example using angular done
2014-06-11 17:45:09 +01:00
James Allen
067d343928
Display list of tags
2014-06-11 16:32:56 +01:00
Henry Oswald
e099a4a100
added default of empty string to user details, fixed route as well
2014-06-11 15:14:07 +01:00
James Allen
1eaba59df0
Use Ember to load project list
2014-06-11 14:52:23 +01:00
Henry Oswald
473da4fa4c
endpoint for user details is written
2014-06-11 12:46:28 +01:00
James Allen
99705ebb4f
Merge branch 'master' into master-redesign
2014-06-11 12:38:59 +01:00
Henry Oswald
3aff131428
added controller endpoint for updating user personal info
2014-06-10 22:26:43 +01:00
Henry Oswald
dabed896be
lowercase password reset email
2014-06-10 17:54:29 +01:00
James Allen
d3221f1cf1
Style login and register forms
2014-06-09 10:19:02 +01:00
James Allen
521befddd3
Merge pull request #76 from dfelder/patch-1
...
Ignore commented lines when setting root doc #52
2014-06-06 14:53:03 +01:00
James Allen
5c27ff4430
Don't show diffs of deleted docs (much simpler)
2014-06-06 14:43:45 +01:00
James Allen
02f48be825
Allow docs to be restored
2014-06-06 14:43:45 +01:00
James Allen
cabaf1ae1a
Show deleted documents when viewing history
2014-06-06 14:43:45 +01:00
Daniel Felder
1d12b88b09
Ignore commented lines when setting root doc #52
...
Same code I used in public/coffee/pdf/CompiledView.coffee. I didn't test it locally though.
2014-06-05 18:00:07 +02:00
Henry Oswald
22c467c231
Merge pull request #75 from dfelder/master
...
compile current file if top level document #42
2014-06-05 16:42:10 +01:00
James Allen
2fb8620ba0
Allow deleting of projects forever
2014-06-04 12:45:04 +01:00
James Allen
b95c9e1d0a
Find file path and act on it one after the other to avoid race condition
2014-06-04 11:46:01 +01:00
James Allen
015fd6873f
Allow projects to be restore after being deleted
2014-06-03 17:35:44 +01:00
Daniel Felder
4320b790bd
adjusting unit tests
2014-06-01 19:26:33 +02:00
Daniel Felder
5ad0ca08f9
adjusting unit tests
2014-06-01 18:16:05 +02:00
Daniel Felder
f03b2df461
compile current file if top level document #42
2014-06-01 16:43:52 +02:00
James Allen
80c58bb718
Remove deprecated versioning code
2014-05-27 12:56:23 +01:00
James Allen
c1afbc66d9
Don't error if user is not logged in when compiling
2014-05-27 12:33:56 +01:00
James Allen
8f41c6dcb2
Don't automatically clear the cache
2014-05-21 15:20:25 +01:00
Henry Oswald
fd53cf0124
tell tpds sender to use pub url for docstore
2014-05-21 09:15:50 +01:00
James Allen
063f6c7680
Only auto clear CLSI cache on hard error, otherwise prompt user
2014-05-21 08:04:52 +01:00
Henry Oswald
57eb0e2006
Revert "Revert "changed docstore url to /raw for tpds updates""
...
This reverts commit 4af4ff34b0ebad0ce9056a1c1dd5e20f12f6096d.
2014-05-20 13:19:02 +01:00
Henry Oswald
ed9e25450a
Revert "Revert "change send doc lines using tpds to work with stream and doc store""
...
This reverts commit a41299570d07b83111b6a995902a30a67867a5c7.
2014-05-20 13:18:59 +01:00
James Allen
93d418b716
Revert "change send doc lines using tpds to work with stream and doc store"
...
This reverts commit ba37710b087b4919c01eed3d8cfeb9d61af43a4d.
2014-05-20 11:14:06 +01:00
James Allen
22c577f9b5
Revert "changed docstore url to /raw for tpds updates"
...
This reverts commit f9e60db892d270811c5e38f273d8a1b62b86eeb2.
2014-05-20 11:13:57 +01:00
Henry Oswald
2398b34f28
changed docstore url to /raw for tpds updates
2014-05-20 08:32:39 +01:00
Henry Oswald
d32fe588b7
change send doc lines using tpds to work with stream and doc store
2014-05-19 20:32:48 +01:00
James Allen
a45200dfe3
Automatically clear CLSI cache when compile fails
2014-05-19 16:10:52 +01:00
James Allen
7fed2155be
Differentiate between timeouts, server errors, and LaTeX failures in client
2014-05-19 16:10:52 +01:00
James Allen
6c5a2c2740
Reconfigure internal CLSI call to understand more than just success/failure
2014-05-19 16:10:52 +01:00
Henry Oswald
a53d767eca
changed 412 status code to 400
2014-05-19 14:02:54 +01:00
Henry Oswald
de38cbf595
destroy session when getting project details
2014-05-19 12:01:05 +01:00
Henry Oswald
af2de3cdeb
finished off change email
2014-05-19 11:50:32 +01:00
Henry Oswald
7437115967
added controler t change user email
2014-05-16 17:45:48 +01:00
Henry Oswald
c4a420bd7f
writen function to set the user email safely
2014-05-16 17:29:54 +01:00
James Allen
a62bff5052
USe parallel limit on zip file streaming
2014-05-16 11:50:15 +01:00
Henry Oswald
50df82697a
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-05-16 11:27:09 +01:00
James Allen
2104c69cb9
Stream files into zip in series
2014-05-16 11:26:58 +01:00
Henry Oswald
9419d3a0e5
hooked up the frount end ui to show the email can not be found,
...
added client side valdidation on password, removed server side min
length check. Just check that it is not 0 len
2014-05-16 11:26:29 +01:00
James Allen
240dc2e319
Use crypto.randomBytes
2014-05-16 10:52:31 +01:00
Henry Oswald
9c3c57f2a8
renamed TokenGenerator to PasswordResetTokenHandler and added Expire to function name
2014-05-16 10:43:55 +01:00
Henry Oswald
bf1bb22afd
added rate limiting to password reset endpoint
2014-05-16 10:31:33 +01:00
Henry Oswald
133c4759f8
fix tests, whoops
2014-05-15 18:26:00 +01:00
Henry Oswald
e1b3f3542c
added some logging
2014-05-15 18:14:05 +01:00
Henry Oswald
24c50189b6
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-05-15 18:01:49 +01:00
Henry Oswald
f7245f32d0
cleaned up old password reset cruft
2014-05-15 18:01:43 +01:00
Henry Oswald
96d98329f1
token based reset works
2014-05-15 17:58:25 +01:00
Henry Oswald
1ffd19099b
writen getUserIdFromToken
2014-05-15 17:20:42 +01:00
Henry Oswald
9f901fb1ba
added the token generator and its getNewToken function
2014-05-15 17:16:20 +01:00
Henry Oswald
64688e661d
written password reset controller
2014-05-15 16:50:38 +01:00
Henry Oswald
551e1d465a
written password reset handler
2014-05-15 16:20:23 +01:00
James Allen
93883c7a03
Fix calling of updateDoc
2014-05-15 15:43:04 +01:00
James Allen
f6e85c4140
Don't proxy version number to/from docstore
2014-05-15 12:44:08 +01:00
James Allen
4a27342b01
Merge branch 'docstore_integration'
2014-05-12 14:23:41 +01:00
James Allen
0bddc5552e
Use docstore for updating documents
2014-05-08 15:47:50 +01:00
James Allen
8315de58c7
Proxy get doc requests to the docstore
2014-05-08 13:42:30 +01:00
Henry Oswald
9a81f85b41
added gauge metrics for number of open socket.io http and https
...
connections
2014-05-08 11:33:46 +01:00
Henry Oswald
a8571653db
added timeouts to filestore handler
2014-05-08 10:55:44 +01:00
James Allen
c73b7fae69
Use docstore when creating a new doc
2014-05-07 14:31:46 +01:00
James Allen
628fb65bc3
Work with ObjectId's passed to ProjectGetter
2014-05-06 13:34:37 +01:00
James Allen
2fb8b0e807
Get project without doc lines in getAllFolders
2014-05-06 13:15:18 +01:00
James Allen
6a2370b5be
Use docstore for CLSI request building
2014-05-06 12:54:26 +01:00
James Allen
ca6be52fa0
Revert "Revert "Get doclines from docstore when cloning project""
...
This reverts commit ff79e4d2e659751ec88b3791566f3de24e6b67f4.
2014-05-06 12:36:00 +01:00
James Allen
8af372aff3
Revert "Revert "Get doc lines from docstore when performing batch operations""
...
This reverts commit a700665650b5984fdb3afe5565d62ba810100ebe.
2014-05-06 12:35:27 +01:00
James Allen
9be4feaae1
Revert "Get doc lines from docstore when performing batch operations"
...
This reverts commit 9fab27158cb02b0268f8e6aec090f275f062d885.
2014-05-01 17:19:21 +01:00
James Allen
fee632cfc9
Revert "Get doclines from docstore when cloning project"
...
This reverts commit 9ab3f5b3fba8a1324c576bbdb9614f70f4c719aa.
2014-05-01 17:19:09 +01:00
James Allen
82b56d0b4f
Get doclines from docstore when cloning project
2014-04-30 16:45:53 +01:00
James Allen
465b5ca9db
Get doc lines from docstore when performing batch operations
2014-04-30 15:49:07 +01:00
James Allen
355a5a020e
Keep reference to deleted docs and delete via docstore
2014-04-30 11:15:29 +01:00
James Allen
f8dec76464
Add DocstoreManager
2014-04-29 17:22:37 +01:00
Henry Oswald
2cdadf1a4b
check for error when doing a password reset
2014-04-29 11:59:23 +01:00
Henry Oswald
bf2c60f84d
added rename project to list page
2014-04-28 17:47:47 +01:00
Henry Oswald
3655e83ff9
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-04-28 16:27:19 +01:00
Henry Oswald
a0fb170878
updated archive module to latest version
2014-04-28 16:27:15 +01:00
James Allen
d528ac21a3
Mark projects as archived, but don't actually delete them
2014-04-28 12:53:43 +01:00
Yimin
295b438498
fix typo
2014-04-22 04:21:42 -05:00
Henry Oswald
0a093b779e
fixed #100 , if tags is not running you should be able to delete a project still
2014-04-16 17:44:57 +01:00
Henry Oswald
8795a8a921
if retore url is not in mongo don't blow up
2014-04-15 14:19:20 +01:00
Henry Oswald
4b11790a54
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-04-15 13:59:04 +01:00
Henry Oswald
aca2e5639e
added referal allocator to user controller
2014-04-15 13:59:00 +01:00
James Allen
ea651ee9bd
Add in restore page
2014-04-14 06:17:07 +01:00
Henry Oswald
c23f9aa056
be able to get build templates from web as well as templates
2014-04-11 15:15:32 +01:00
Henry Oswald
dbe2dd3078
fix case problem with require of newsletter manager
2014-04-10 22:21:20 +01:00
Henry Oswald
51e69392a7
cleaned up and fixed problem with open user opening pojrect
2014-04-10 17:49:39 +01:00
Henry Oswald
9355632f30
deleted user controller. The end of /controllers
2014-04-10 17:29:46 +01:00
Henry Oswald
f7ea925e67
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-04-10 17:26:14 +01:00
Henry Oswald
5df01acfe1
moved reset password to new controler, not tests as it will be rewritten soon. Just want to kill off /controllers
2014-04-10 17:26:09 +01:00
Henry Oswald
5760e51d6e
moved password change to new user controller with tests
2014-04-10 17:15:18 +01:00
Henry Oswald
cc68fe443f
Moved register function into user registration handler and new user
...
controller
2014-04-10 16:32:47 +01:00
James Allen
573c877a57
Remove unneeded/broken stream.resume()
2014-04-10 12:57:49 +01:00
James Allen
049dcc2780
Split lines on Windows line endings too
2014-04-10 12:45:42 +01:00
Henry Oswald
2ca7c344a3
reformtted reg handler tests
2014-04-10 12:39:13 +01:00
Henry Oswald
b6b30c3d37
moved logout to new user controller
2014-04-09 16:59:28 +01:00
Henry Oswald
bb7025ad6e
moved user update user settings to user controller
2014-04-09 16:33:54 +01:00
Henry Oswald
bcfc1bee0c
moved unsubscribe endpoint to new user controller
2014-04-09 15:41:19 +01:00
Henry Oswald
12773c26c2
moved user settings page to the user pages controller
2014-04-09 15:04:47 +01:00
Henry Oswald
823f4a5eb9
created new UserController and put delete user in it
2014-04-09 14:50:12 +01:00
Henry Oswald
37fb959b00
renamed UserController to UserInfoController
2014-04-09 14:45:46 +01:00
Henry Oswald
c55c5032b0
moved delete user to the user controller
2014-04-09 14:43:08 +01:00
Henry Oswald
5f72f13528
moved password reset to user pages controller
2014-04-09 12:26:59 +01:00
Henry Oswald
434fca8874
moved login page to new user page controller
2014-04-09 12:22:57 +01:00
Henry Oswald
fa36891faf
moved register page to new UserPagesController
2014-04-09 12:17:50 +01:00
Henry Oswald
c163bba1da
populate users on a project in parallelLimit
2014-04-09 11:49:28 +01:00
Henry Oswald
47fb623c4b
dont call enable versioning on join project
2014-04-09 11:45:57 +01:00
Henry Oswald
cba3644777
updated building proj from template, no longer suport other domains and work in different envs
2014-04-09 08:24:23 +01:00
Henry Oswald
5ac1b59a78
added err check to project list page
2014-04-08 21:06:01 +01:00
Henry Oswald
811859a4a1
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-04-08 20:52:06 +01:00
Henry Oswald
71af89902d
removed the buffering from update merger, shouldn't be needed in node 0.10
2014-04-08 20:52:02 +01:00
Henry Oswald
c0780f5a67
made project page load faaaaaaster
2014-04-08 18:02:16 +01:00
Henry Oswald
88ba45b9dc
moved load project from old proj controller to new one
2014-04-08 17:44:31 +01:00
Henry Oswald
a6bd916fbf
refactored project list, and updated sig for findAllUsersProjects to include err
2014-04-08 16:56:34 +01:00
James Allen
374cf99ef2
Double click on PDF syncs with code
2014-04-08 16:49:21 +01:00
Henry Oswald
0c921d9188
moved project list to new project controller and added tests
2014-04-08 16:40:12 +01:00
Henry Oswald
6b6c447901
clened up new project controller
2014-04-08 15:28:18 +01:00
Henry Oswald
15bddae931
moved new project from old proj controller to new one with test
2014-04-08 15:25:27 +01:00
Henry Oswald
6f84f4214f
moved clone project from old proj controller to new one with test
2014-04-08 14:53:33 +01:00
Henry Oswald
5b757ac7ab
moved delete project from old proj controller to new one with test
2014-04-08 14:34:03 +01:00
Henry Oswald
bc07525d71
broken dropbox endpoints for user into its own controller
2014-04-07 21:49:22 +01:00
Henry Oswald
430cf5cea8
created CollaboratorsHandler
2014-04-07 20:46:58 +01:00
Henry Oswald
ff88849444
added a change privlage level for user to new collab handler, won't work yet but is starting point
2014-04-07 16:54:51 +01:00
Henry Oswald
fa78db5c59
moved setPublicAccessLevel to project details handler
2014-04-07 16:07:44 +01:00
Henry Oswald
d229269a69
moved rename project to project details handler
2014-04-07 15:37:40 +01:00
Henry Oswald
9134fa7b4c
moved deleteProject to the project deleter
2014-04-07 13:47:10 +01:00
Henry Oswald
5378890e57
moved rename entity to proj entity handler
2014-04-07 12:18:24 +01:00
Henry Oswald
1ce1a82617
moved admin controller into different feature
2014-04-07 11:02:12 +01:00
Henry Oswald
73bbd5b495
moved info and home controller into static page feature
2014-04-07 10:55:07 +01:00
Henry Oswald
b36ced3058
only poll dropbox users who have the dropbox feature
2014-04-05 12:14:50 +01:00
Henry Oswald
90eac4d52c
moved setRootDoc from collab manager to editor controller
2014-04-04 16:59:45 +01:00
Henry Oswald
7c10b5cd24
moved setPublicAccessLevel from collab manager to editor controller
2014-04-04 16:53:59 +01:00
Henry Oswald
08d1eeba78
moved renameProject from collab manager to editor controller
2014-04-04 16:49:44 +01:00
Henry Oswald
d684f04d4f
moved moveEntity from collab manager to editor controller
2014-04-04 16:40:53 +01:00
Henry Oswald
88e47bbe12
moved renameEntity from collab manager to editor controller
2014-04-04 16:35:02 +01:00
Henry Oswald
3983e77b73
move deleteProject from collab manager to editor controller
2014-04-04 16:21:30 +01:00
Henry Oswald
68271b04f9
deleted guid manager
2014-04-04 15:58:59 +01:00
Henry Oswald
615e05cb89
moved newsletter manager into its own feature
2014-04-04 15:47:27 +01:00
Henry Oswald
479b37a48c
null check user when getting user id from session
2014-04-02 15:56:54 +01:00
Henry Oswald
bd118a57c2
set compile throttle back to 10
2014-04-02 12:18:24 +01:00
Henry Oswald
6c700b1b6b
updated more modules, mongojs and redis are the big ones
2014-04-01 16:23:13 +01:00
Henry Oswald
8ce13a6b1e
changed xss lib to sanitize not validator
2014-03-31 16:46:28 +01:00
James Allen
3b079cde92
Change CLSI proxy errors to warnings
2014-03-28 16:04:44 +00:00
James Allen
6318d9ace1
Return features along with project details
2014-03-28 12:47:15 +00:00
James Allen
767b220fab
Allow CLSI cache to be cleared from within the editor
2014-03-27 17:00:41 +00:00
Henry Oswald
ba1371744b
deal with users who may have been deleted but are still inside a subscription group
2014-03-25 16:19:30 +00:00
Henry Oswald
ea9ba59371
updated google anltyics experiment code
2014-03-24 22:24:09 +00:00
James Allen
dc2dfaa66c
Flush project to track changes when leaving
2014-03-22 09:34:43 +00:00
Henry Oswald
4988fc4136
setup second plans page with free trial using google analytics experiements
2014-03-21 17:49:20 +00:00
Henry Oswald
04bdde4d0d
added logging around publishing templates and changed another templates-api -> templates
2014-03-20 12:53:23 +00:00
Henry Oswald
fc2b42400f
Merge pull request #54 from cwoac/nodemailer-passthrough
...
Nodemailer passthrough
2014-03-18 13:09:14 +00:00
James Allen
ea0b0c2ec2
Fine tune logging
2014-03-17 12:50:30 +00:00
James Allen
498e0d4787
Fix unit tests
2014-03-14 11:56:15 +00:00
James Allen
4c76b88a2d
Log out incoming and outgoing real-time updates
2014-03-14 11:51:19 +00:00
Henry Oswald
f7545393f2
fix bad logging on email sender
2014-03-12 23:37:54 +00:00
Henry Oswald
fa6065b298
changed logging which was causing error, reading _id on null
2014-03-12 23:37:10 +00:00
Henry Oswald
b7104a82e9
added null check when filtering elements
2014-03-12 22:44:15 +00:00
Oliver Matthews
efbb17a3b9
move all parameter handling to nodemailer.
2014-03-12 15:38:40 +00:00
James Allen
be64b510e8
Support the new update format from the track changes api
2014-03-11 18:01:14 +00:00
James Allen
afb8bb6a42
Add in restore button to track changes
2014-03-11 12:14:52 +00:00
Henry Oswald
e7602321e9
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-03-08 19:01:21 +00:00
Henry Oswald
0e7d241fcf
fixed has subscription check causing bad redirects
...
subscription != recurlySubscription
2014-03-08 19:01:00 +00:00
Henry Oswald
f2069c6208
converted all analytics to use new google analytics, removing mixpanel
...
and heap. Not tracking subscriptions or cancelations yet.
2014-03-08 19:00:26 +00:00
Oliver Matthews
8989284e10
move from node-ses to nodemailer
2014-03-07 14:08:21 +00:00
James Allen
9851321429
Merge branch 'track_changes_integration'
2014-03-07 13:17:30 +00:00
Henry Oswald
7efa51fb62
Merge pull request #51 from cwoac/reduce_doclines_logging
...
don't log doc contents if file is unchanged.
2014-03-06 12:50:52 +00:00
Henry Oswald
38d3bbb556
changed underscore templating to be standard syntax thoughout fixing main.tex name inserting bug, added tests to catch it in future
2014-03-06 12:28:07 +00:00
Oliver Matthews
b73d7f23c3
don't log doc contents if file is unchanged.
2014-03-06 10:53:59 +00:00
Henry Oswald
f5e802a7d1
added null check for email property #ugly
2014-03-06 09:51:19 +00:00
Henry Oswald
9ae85abb74
got my email null check the wrong way around
2014-03-05 22:57:28 +00:00
Henry Oswald
e433eca157
added null checks into email sender for from address
2014-03-05 22:37:55 +00:00
James Allen
0468cbc300
Add in proxy to track changes api
2014-03-05 16:31:52 +00:00
Henry Oswald
64257a7b2c
testing out new google analytics
2014-03-05 15:45:24 +00:00
Henry Oswald
ffe690afa3
hooked up lifetime emails
2014-03-05 14:56:52 +00:00
Henry Oswald
3431cf9070
share project email uses new email sender
2014-03-05 12:06:28 +00:00
Henry Oswald
8ba1a08245
hooked up password reset to use new email sending
2014-03-05 11:57:57 +00:00
Henry Oswald
3c18cc5553
email sending options are configurable from settings
2014-03-05 11:31:40 +00:00
Henry Oswald
5bacb2d784
added settings check on sending lifcycle emails out
2014-03-05 11:22:52 +00:00
Henry Oswald
eb92e5832b
renamed email templator -> email builder
2014-03-05 11:22:34 +00:00
Henry Oswald
360fac9510
setup basic new email feature which is tested, not linked up to real
...
events yet
2014-03-04 18:10:06 +00:00
Henry Oswald
67e9d0724d
increased auto compile limits
2014-03-04 15:29:45 +00:00
Henry Oswald
99dc141693
deleteing user account cancels any subscription
2014-03-03 16:22:55 +00:00
Henry Oswald
ff8320bce0
added new rate limit file based on redback. converetd auto compile to
...
use it.
2014-02-28 17:59:54 +00:00
Henry Oswald
303a0e985b
improved the publish button process so it talks to the templates-api and lets the user know what is going on
2014-02-27 17:35:35 +00:00
Henry Oswald
029077fe6e
downloading a file now sets the filename in header correctly
2014-02-20 22:33:12 +00:00
Henry Oswald
65f849aad0
fixed bug where file uploader was calling cb on read stream not write stream, race condition created.
2014-02-14 18:13:22 +00:00
James Allen
8715690ce9
Intial open source comment
2014-02-12 10:23:40 +00:00