James Allen
|
f34811fbf6
|
Add new folder link in side bar
|
2014-07-16 14:59:52 +01:00 |
|
James Allen
|
4b3610746e
|
Use native select box style in left menu
|
2014-07-16 12:09:19 +01:00 |
|
James Allen
|
fce271f827
|
Fix unit tests
|
2014-07-16 12:01:15 +01:00 |
|
James Allen
|
60174ffb09
|
Style closed page
|
2014-07-16 11:59:54 +01:00 |
|
James Allen
|
2dc43b504c
|
Style 404 page
|
2014-07-16 11:59:25 +01:00 |
|
James Allen
|
9e0d5ff890
|
Use permissions.admin, not hasPermission(...)
|
2014-07-16 11:50:03 +01:00 |
|
James Allen
|
4a139949f2
|
Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
|
2014-07-16 11:29:02 +01:00 |
|
James Allen
|
8f08823d34
|
Sort out fingerprints and pdf.js worker path
|
2014-07-16 11:28:52 +01:00 |
|
James Allen
|
eb818be2df
|
Use Ace in no-conflict mode
|
2014-07-16 11:07:18 +01:00 |
|
Henry Oswald
|
c8c0030b7c
|
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
|
2014-07-16 11:02:53 +01:00 |
|
Henry Oswald
|
46377aea3d
|
the template link in the left menu is only shown to owners/admins
|
2014-07-16 11:02:45 +01:00 |
|
James Allen
|
1d7a595c6c
|
Small chat scroll tweaks
|
2014-07-16 10:52:06 +01:00 |
|
James Allen
|
e0266e309f
|
Put project link in header
|
2014-07-15 20:44:13 +01:00 |
|
James Allen
|
604a877f12
|
Load chat messages in reasonable sized chunks
|
2014-07-15 18:50:46 +01:00 |
|
James Allen
|
2a3ff3c523
|
Fix unit tests
|
2014-07-15 18:33:59 +01:00 |
|
James Allen
|
81eca79613
|
Deep watch messages to catch all updates
|
2014-07-15 18:32:18 +01:00 |
|
James Allen
|
57409df92b
|
Remove dead code
|
2014-07-15 18:26:30 +01:00 |
|
James Allen
|
7318f4c2d3
|
Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
|
2014-07-15 18:25:29 +01:00 |
|
James Allen
|
b9f2b02594
|
Sort out scroll in chat
|
2014-07-15 18:25:12 +01:00 |
|
Henry Oswald
|
c93c8b3f7d
|
got basic client side templates
|
2014-07-15 17:56:09 +01:00 |
|
Henry Oswald
|
d39b8a0a05
|
fixed broken chat test
|
2014-07-15 14:28:39 +01:00 |
|
Henry Oswald
|
ef4b7f7036
|
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
|
2014-07-15 12:15:15 +01:00 |
|
James Allen
|
cf0ff6e97a
|
Hide chat in editor
|
2014-07-15 10:56:01 +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 |
|
James Allen
|
1c5778e2c4
|
List number of changes in diff
|
2014-07-11 16:34:12 +01:00 |
|
James Allen
|
76415ae02b
|
Show labels for tracked changes above and below
|
2014-07-11 16:17:59 +01:00 |
|
James Allen
|
0a2d93011f
|
Add in restore button for diffs
|
2014-07-11 13:55:14 +01:00 |
|
James Allen
|
660a307418
|
Tweak synctex buttons style so the pdf resizer still works above them
|
2014-07-11 13:04:01 +01:00 |
|
James Allen
|
39e4f46bdb
|
Style search and replace box
|
2014-07-10 17:27: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 |
|
James Allen
|
e102e65325
|
Set autocomplete menu to editor font size
|
2014-07-10 15:52:36 +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
|
a7cab5bf4f
|
Update with pristine Ace
|
2014-07-10 14:39:37 +01:00 |
|
James Allen
|
aaebb0902d
|
Fix synctex controls with new Ace
|
2014-07-10 14:36:04 +01:00 |
|
James Allen
|
1ce5062800
|
Add in link to go back to projects
|
2014-07-10 14:08:32 +01:00 |
|