Commit graph

343 commits

Author SHA1 Message Date
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
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
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
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
Henry Oswald
d06848d109 fixed null on description in client 2014-07-17 12:02:56 +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
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
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
14a9d0838e Get line wrapping of long tag names sorted 2014-07-16 15:24:30 +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
Henry Oswald
eb58bb7c5a all template buttons in editor are disabled on publish/unpublish 2014-07-16 12:04:33 +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
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
604a877f12 Load chat messages in reasonable sized chunks 2014-07-15 18:50:46 +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
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
5093820a5f Merge branch 'master-redesign' into master-redesign-templates-and-blog 2014-07-14 12:42:03 +01:00
James Allen
e4d9d03f55 Improve feedback on login/register forms 2014-07-11 17:08:19 +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
39e4f46bdb Style search and replace box 2014-07-10 17:27:19 +01:00
Henry Oswald
e1dd58aca8 fixed algolia settings and removed some console.logs 2014-07-10 16:05:18 +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
James Allen
aaebb0902d Fix synctex controls with new Ace 2014-07-10 14:36:04 +01:00