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
