James Allen
|
d641be70a4
|
Fix minification of clone/index.coffee
|
2014-07-18 11:53:44 +01:00 |
|
Henry Oswald
|
4862587745
|
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
|
2014-07-18 11:45:10 +01:00 |
|
James Allen
|
88840232fb
|
Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
|
2014-07-18 11:43:55 +01:00 |
|
James Allen
|
d0d4d9d4b9
|
Add remote path for mathjax
|
2014-07-18 11:43:45 +01:00 |
|
Henry Oswald
|
20cf493328
|
app -> App
|
2014-07-18 11:35:58 +01:00 |
|
Henry Oswald
|
57b461e0ff
|
added little icons to the table for when you want to sort
|
2014-07-18 10:43:32 +01:00 |
|
Henry Oswald
|
ca6e8a7d40
|
basic sorting added to project list page
|
2014-07-17 17:34:09 +01:00 |
|
Henry Oswald
|
c683eab9e2
|
change the scribtex modal to be bootstrap3/angular, same content and same logic if it should be shown or not
|
2014-07-17 17:05:39 +01:00 |
|
Henry Oswald
|
554fd7c7d0
|
change client connection timeout to 15 mins expire in redis
|
2014-07-17 16:03:53 +01:00 |
|
Henry Oswald
|
478910a3aa
|
if a user does not have a first or last name use their email for their name in connected user data
|
2014-07-17 16:00:41 +01:00 |
|
Henry Oswald
|
97641ed205
|
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
|
2014-07-17 15:37:44 +01:00 |
|
James Allen
|
2cf8f8c56f
|
Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
|
2014-07-17 15:35:06 +01:00 |
|
Henry Oswald
|
8e5ba6c488
|
changed favicon to adam's
|
2014-07-17 15:34:14 +01:00 |
|
James Allen
|
9ed93b3a81
|
Make colors consistent everywhere
|
2014-07-17 15:33:38 +01:00 |
|
Henry Oswald
|
fc02f99659
|
made restricted page like 404, also got dropbox progress bar going the other way
|
2014-07-17 15:26:31 +01:00 |
|
James Allen
|
37a12e88c1
|
Show who is online
|
2014-07-17 15:25:22 +01:00 |
|
Henry Oswald
|
c429bd1f44
|
improved the dropbox progress bar
|
2014-07-17 15:08:12 +01:00 |
|
Henry Oswald
|
b54c351956
|
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
|
2014-07-17 14:23:55 +01:00 |
|
Henry Oswald
|
5fa83fb2b9
|
added dropbox in left menu
|
2014-07-17 14:23:47 +01:00 |
|
James Allen
|
3995de3cfc
|
Add in project cloning to editor
|
2014-07-17 14:04:21 +01:00 |
|
James Allen
|
3055231f75
|
Clear countdown before returning from reconnect
|
2014-07-17 13:46:14 +01:00 |
|
James Allen
|
a002709870
|
Don't try reconnect if connected
|
2014-07-17 13:44:50 +01:00 |
|
Henry Oswald
|
b428a8fb7d
|
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
|
2014-07-17 13:43:41 +01:00 |
|
James Allen
|
a3faaf0c18
|
Add in mathjax directive
|
2014-07-17 13:23:43 +01:00 |
|
James Allen
|
361fe310ce
|
Update chat UI immediately
|
2014-07-17 13:12:34 +01:00 |
|
James Allen
|
d531e3b393
|
Fix overlapping issues when name is empty in track changes list
|
2014-07-17 13:03:29 +01:00 |
|
James Allen
|
380d776b67
|
Remove wonky line
|
2014-07-17 12:58:35 +01:00 |
|
James Allen
|
ee7013c1ee
|
TRack free trial clicks and redirect to subscription page
|
2014-07-17 12:57:17 +01:00 |
|
James Allen
|
05b078ec92
|
New File => Folder in folder modal
|
2014-07-17 12:03:26 +01:00 |
|
Henry Oswald
|
d06848d109
|
fixed null on description in client
|
2014-07-17 12:02:56 +01:00 |
|
James Allen
|
661cfcb2c1
|
Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
|
2014-07-17 11:43:59 +01:00 |
|
James Allen
|
e0f1ed3c10
|
Use internal url for chat
|
2014-07-17 11:43:12 +01:00 |
|
Henry Oswald
|
4bc47bd2b2
|
don't search for instituion until we get a few chars. Saves some usless algolia http calls
|
2014-07-17 11:21:25 +01:00 |
|
James Allen
|
8d946e68d2
|
Return better blank gravatar image
|
2014-07-17 11:07:34 +01:00 |
|
James Allen
|
c6f51cf5ac
|
Show new chat message notification
|
2014-07-17 11:05:08 +01:00 |
|
James Allen
|
596ad4cf1c
|
Null check
|
2014-07-16 17:32:04 +01:00 |
|
James Allen
|
abf04f7e1a
|
Make pdfjs default if not set
|
2014-07-16 17:05:57 +01:00 |
|
James Allen
|
9064a9d9df
|
Append project list tooltips to body
|
2014-07-16 17:04:17 +01:00 |
|
James Allen
|
9ce746c6c5
|
Tweak menu style
|
2014-07-16 17:01:41 +01:00 |
|
James Allen
|
8e1593bb96
|
Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
|
2014-07-16 16:58:25 +01:00 |
|
James Allen
|
c24fe212a9
|
Fix PDF position tracking
|
2014-07-16 16:58: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
|
55eb15baba
|
changed the icon for templates in the left menu
|
2014-07-16 16:20:31 +01:00 |
|
Henry Oswald
|
4f91e40875
|
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
|
2014-07-16 15:53:12 +01:00 |
|
Henry Oswald
|
f3f53a99d0
|
Templates state resets on modal close so if the api comes back it will work
|
2014-07-16 15:50:27 +01:00 |
|
James Allen
|
f7e69cebfd
|
Make progress bars distinct site-wide
|
2014-07-16 15:37:22 +01:00 |
|
James Allen
|
14a9d0838e
|
Get line wrapping of long tag names sorted
|
2014-07-16 15:24:30 +01:00 |
|
James Allen
|
1d79f3bec3
|
Don't close folder menu on modal pop up
|
2014-07-16 15:04:37 +01:00 |
|
James Allen
|
a924f2a928
|
Rephrase shared projects
|
2014-07-16 15:01:06 +01:00 |
|
James Allen
|
f34811fbf6
|
Add new folder link in side bar
|
2014-07-16 14:59:52 +01:00 |
|
Henry Oswald
|
735bc9e53d
|
show message when can not talk to templates api
|
2014-07-16 13:36:02 +01:00 |
|
Henry Oswald
|
abc4306e06
|
merge
|
2014-07-16 13:35:15 +01:00 |
|
James Allen
|
4b3610746e
|
Use native select box style in left menu
|
2014-07-16 12:09:19 +01:00 |
|
Henry Oswald
|
eb58bb7c5a
|
all template buttons in editor are disabled on publish/unpublish
|
2014-07-16 12:04:33 +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 |
|
Henry Oswald
|
6982ec63ae
|
changed get template details to findOne
|
2014-07-16 11:56:22 +01:00 |
|
James Allen
|
9e0d5ff890
|
Use permissions.admin, not hasPermission(...)
|
2014-07-16 11:50:03 +01:00 |
|
Henry Oswald
|
cd60817592
|
made getting templates details parallel
|
2014-07-16 11:37:17 +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 |
|
Henry Oswald
|
91ca726e66
|
get template details now includes the markdown description of the project
|
2014-07-16 11:27:47 +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 |
|