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
|
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
|
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
|
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 |
|
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
|
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
|
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
|
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
|
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
|
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 |
|
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
|
025d3147ec
|
blog intergration works
|
2014-07-10 14:53:53 +01:00 |
|
James Allen
|
1ce5062800
|
Add in link to go back to projects
|
2014-07-10 14:08:32 +01:00 |
|
Henry Oswald
|
5cf756969e
|
blog wip
|
2014-07-09 19:49:39 +01:00 |
|
James Allen
|
c93902345a
|
Remove all console.log debug statements
|
2014-07-09 16:18:09 +01:00 |
|
James Allen
|
b0f43eab19
|
Use events for updating cursor = big performance gain
|
2014-07-09 15:38:38 +01:00 |
|
James Allen
|
07debb2450
|
Fix some more project list style issues
|
2014-07-09 14:56:25 +01:00 |
|
James Allen
|
f2066e46dd
|
Use Angular 1.30 and only update emails on blur
|
2014-07-09 14:53:30 +01:00 |
|
James Allen
|
f6c2feff2d
|
Improve styling of project list with long titles and labels
|
2014-07-09 11:51:21 +01:00 |
|
James Allen
|
488f33d3d0
|
Replace slashes globally
|
2014-07-09 11:17:16 +01:00 |
|
James Allen
|
6d10c186ad
|
Sort out escaping issues
|
2014-07-09 11:05:00 +01:00 |
|
James Allen
|
4423471b1a
|
Auto resize project list to always fit in screen
|
2014-07-08 17:47:20 +01:00 |
|
James Allen
|
d9d1499dae
|
Ignore external pages
|
2014-07-08 13:36:08 +01:00 |
|
James Allen
|
2f92856db4
|
Provide more config options for nav and footer entries
|
2014-07-08 12:51:11 +01:00 |
|
Henry Oswald
|
0080809489
|
merge/moving js stuff around half done
|
2014-07-08 12:32:50 +01:00 |
|
James Allen
|
b9909bbd84
|
Sort out front end coffee/js files and minification
|
2014-07-08 12:01:32 +01:00 |
|
Henry Oswald
|
32b5e39681
|
chat scoll works fairly well using scroll glue
|
2014-07-08 11:56:44 +01:00 |
|