Henry Oswald
0e9ec00f85
added stubbed logger in document controller tests
2015-08-19 11:58:59 +01:00
Henry Oswald
63580f6a79
remove useClsi2 flag in project collection
2015-08-19 11:58:41 +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
70b825fd2a
fixed call to ProjectUpdateHandler.markAsOpened and made it async
2015-08-14 11:27:11 +01:00
Henry Oswald
68e970cd69
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-08-14 09:31:25 +01:00
Henry Oswald
a0142d4415
added inactive and reactivate project logic
2015-08-13 22:40:28 +01:00
Henry Oswald
3ecf201eda
send -> sendStatus
2015-07-08 16:56:38 +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
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
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
f709ddf3eb
add csv export unit tests
2015-05-28 17:22:49 -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
b657c5207e
cleaned up the views a bit
2015-05-27 21:45:29 +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
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
Brian Gough
cc9c8fdc94
freeze Date in Recurly tests before all calls
...
beforeEach freezes and resets for each subtest, which does not give
the desired result as the time increases between each subtest, we want
to freeze once at the beginning and reset at the end using before/after.
2015-05-19 15:00:30 +01:00
Henry Oswald
f5c39efcac
patched xss hole with messages not setting the content type correctly
2015-05-19 11:04:52 +01:00
Brian Gough
3051d7dab6
modify LockManager test to avoid dependence on timing
2015-05-18 09:14:28 +01:00
Henry Oswald
9764ab258b
added complex password validation to password resets
2015-04-30 12:05:46 +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
Henry Oswald
7a46b98c82
fixed unit tests for deleting files sent from tpds
2015-04-22 15:08:29 +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
185514ea35
Fix failing unit test
2015-03-19 16:41:09 +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
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
0ff5f54bf6
fix unit test for build parameter
2015-03-02 15:33:45 +00:00
Brian Gough
0315954b47
Merge branch 'master' into support-cached-pdfs
2015-03-02 09:20:00 +00:00
Brian Gough
a64b8724bd
include the build parameter in the compile unit tests
2015-02-26 16:21:44 +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
James Allen
1a7d4f6be1
Fix smoke tests
2015-02-17 11:21:14 +00:00
James Allen
8e13ded360
Regenerate the session id after logging in or registering
2015-02-13 11:18:17 +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
001a5d751b
Pull out templates logic into its own module
2015-02-10 11:24:34 +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
366a0403a6
Clear rate limit in smoke tests
2015-02-05 10:18:18 +00:00
James Allen
e35d80211e
Log when rate limit is hit
2015-02-05 09:52:40 +00:00
James Allen
4235c90623
Add in rate limit to opening projets
2015-02-04 15:05:35 +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
Henry Oswald
00810eaf21
Merge branch 'recurlyv3'
2015-01-19 13:51:02 +00:00
Henry Oswald
7e64b88fcf
fix cancel subscription on delete user
2015-01-02 10:37:59 +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
Brian Gough
79b560f96b
update tests for new pdf viewer server fixes
2014-12-16 09:44:25 +00:00
Brian Gough
d3b38c8dc2
Revert "Revert test changes for proxied headers when requesting pdfs from clsi"
...
This reverts commit ab31d2c3fdc00a38f6444248011a3871b83dbec2.
2014-12-12 15:43:21 +00:00
Brian Gough
f005c5e8dc
Revert test changes for proxied headers when requesting pdfs from clsi
2014-12-11 13:42:51 +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
35b6abe79c
fix tests for pdf header passing
2014-12-02 16:36:19 +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
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
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
393a637673
remove a couple of required coffee-scritps which are not required
2014-11-26 15:37:53 +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
bd841b4795
coppied the lock manager over from doc updater
2014-11-25 16:52:27 +00:00
Henry Oswald
3bae278c92
Revert "increased timeout for geoip to 3 seconds"
...
This reverts commit e4c892b59734a0b6b67ad37a1d09c1618ec389d4.
2014-11-25 13:10:00 +00:00
Henry Oswald
d91064a369
increased timeout for geoip to 3 seconds
2014-11-25 11:51:03 +00:00
James Allen
afca9ba0cb
Fix unit tests
2014-11-24 14:26:51 +00:00
James Allen
c28e09076b
Add missing logger include in smoke test
2014-11-24 13:33:03 +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
948183b685
return done in smoke test
2014-11-10 16:33:36 +00:00
Henry Oswald
4c905c168a
do null check on csrf token in smoke test
2014-11-10 11:20:34 +00:00
James Allen
6d10e45135
Fix unit test
2014-11-07 12:35:10 +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
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
1a2411d4c2
removed bad require in test causing redis to be required in unit test #shouldhavebeenabountyhunter
2014-11-06 12:07:50 +00:00
Henry Oswald
30100f2a07
fixed badly called flushProjectToThirdPartyDataStore causing issues with initial drobox sync
2014-10-31 12:41:06 +00:00
James Allen
f1ddff4061
Only ignore hidden files from Dropbox, not GitHub
2014-10-27 14:39:20 +00: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
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
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
Henry Oswald
d8cc3b7b61
fixed leaky test
2014-10-16 16:02:31 +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
941f550d6c
Remove all traces of soa-req-id
2014-10-15 14:11:02 +01:00
Henry Oswald
19a08f82a6
default to USD if there is no match
2014-10-14 12:14:03 +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
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
3ca04e25fd
add 1 second timeout to geoiplookup
...
response times generally seem to be around 0.05s from our servers
2014-10-13 13:15:48 +01:00
Henry Oswald
2e6c2c1926
default to USD in geo ip lookup.
...
Decided to put default logic in the GeoIpLookup.getCurrencyCode as
we are going to want this default everywhere we use it.
2014-10-13 13:08:11 +01:00
Henry Oswald
e78e4d46b0
use first ip passed though in string for ip lookup
2014-10-13 13:04:20 +01:00
Henry Oswald
259871cbdd
added geoip lookup feature
2014-10-13 00:45:45 +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
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
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
2375dbb851
run succesful login before each smoke test to avoid any rate limit issues
2014-09-29 11:45:34 +01:00
Henry Oswald
7f2df4bbd3
renamed rate limiter tests
2014-09-29 11:42:46 +01:00
Henry Oswald
0d056434e6
fixed tests
2014-09-26 17:49:31 +01:00
Henry Oswald
558b6cdfde
remove test which isn't really that important
2014-09-18 14:41:30 +01:00
Henry Oswald
1b02dc72a3
destroy session on dropbox webhook
2014-09-10 14:19:44 +01:00
Henry Oswald
b875864568
check for error on smoke test after
2014-09-04 18:06:24 +01:00
James Allen
971afb7342
Treat large text files as binary
2014-09-04 13:00:51 +01:00
Henry Oswald
c131a9d301
added /logout to smoke tests
2014-09-04 12:35:59 +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
416f41e59d
stopped using proper settings inside of a test
2014-08-29 13:06:50 +01:00
Henry Oswald
aa83b5ca5d
fixed tests whoops
2014-08-29 12:41:42 +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
James Allen
894024ba29
Don't allow folders to be moved into their child folders
2014-08-22 14:38:52 +01:00
James Allen
456d194dbb
Merge branch 'james_tmp'
2014-08-22 12:51:35 +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
Henry Oswald
6bb4c9867e
convert smoke cookie to be unsecure so curl will send it
2014-08-19 15:35:34 +01:00
Henry Oswald
ca5b1e7422
cleaned up smoke tests
2014-08-19 14:35:20 +01:00
Henry Oswald
a082dd0f3b
use cookie domain in smoke test path
2014-08-19 12:05:07 +01:00
Henry Oswald
8895ceea35
write cookies to tmp for smoke test
2014-08-19 12:01:30 +01:00
Henry Oswald
523694c4ff
changed smoke tests to work with curl
...
this was needed as there is a bug with request/tough cookie with
multi subdomain cookies ie .sharelatex.com
https://github.com/goinstant/tough-cookie/issues/16
moving it to request in the future is probably a good idea, if we do move to
request then with the current issues we would we need to set
jar._jar.rejectPublicSuffixes = false
2014-08-19 11:17:51 +01:00
Henry Oswald
0dc4b3a01b
login works with curl
2014-08-19 10:54:33 +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
670e8e5cb9
Use Dropbox Real-time polling
2014-08-13 17:26:18 +01:00
James Allen
b7ed3bab8f
Merge branch 'redis-queue'
2014-08-11 12:10:25 +01:00
Henry Oswald
b41256b599
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-08-08 13:15:03 +01:00
Henry Oswald
b48ca2c7ed
fixed smoke test breaking on title, removed "the" as its not great for SEO (i think)
2014-08-08 13:11:49 +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
James Allen
0a44aa9e71
Push into doc updater queue rather than pub/sub for updates
2014-08-07 13:19:10 +01:00
James Allen
dc54fe3d2e
Fix Smoke test to use new title
2014-08-06 11:50:19 +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
bf56e083cf
removed a load of console.logs
2014-07-25 13:14:19 +01:00
James Allen
1128b45b17
Add in system messages
2014-07-24 13:24:08 +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
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
abc4306e06
merge
2014-07-16 13:35:15 +01:00
James Allen
fce271f827
Fix unit tests
2014-07-16 12:01: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
Henry Oswald
91ca726e66
get template details now includes the markdown description of the project
2014-07-16 11:27:47 +01:00
James Allen
2a3ff3c523
Fix unit tests
2014-07-15 18:33:59 +01:00
Henry Oswald
d39b8a0a05
fixed broken chat test
2014-07-15 14:28:39 +01:00
Henry Oswald
9f82e63a8f
changed :project_id to :Project_id
2014-07-14 22:11:41 +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
13aaf042d9
connected user manager logic works correctly
2014-07-14 12:41:06 +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
1be8dadbcf
fixed chat tests
2014-07-10 15:12:28 +01:00
Henry Oswald
025d3147ec
blog intergration works
2014-07-10 14:53:53 +01:00
James Allen
6d10c186ad
Sort out escaping issues
2014-07-09 11:05:00 +01:00
James Allen
ff7b7cdd20
Fix smoke tests
2014-07-08 14:29:06 +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
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
Henry Oswald
d1f907cee5
first simple version of tracking who is active in the editor
2014-07-04 16:18:46 +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
James Allen
d599cfa7ac
Fix unit tests
2014-07-01 14:19:52 +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
0d334a560e
fix failing unit test
2014-06-27 14:38:08 +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
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
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
James Allen
2b349039c3
Add in backend multiple project downloading
2014-06-18 16:37:18 +01:00
James Allen
aa8969c652
Merge and fix external forms
2014-06-17 16:19:40 +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
df44792a10
fix tests in user info controller
2014-06-17 11:48:14 +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
Henry Oswald
e099a4a100
added default of empty string to user details, fixed route as well
2014-06-11 15:14:07 +01:00
Henry Oswald
473da4fa4c
endpoint for user details is written
2014-06-11 12:46:28 +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
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
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
015fd6873f
Allow projects to be restore after being deleted
2014-06-03 17:35:44 +01:00
Daniel Felder
66dcb376a4
added unit tests
2014-06-01 22:28:19 +02: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
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