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
|
8d57e052c7
|
Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
Conflicts:
public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee
public/coffee/ide/editor/directives/aceEditor/spell-check/SpellCheckManager.coffee
|
2014-07-10 15:14:06 +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 |
|
James Allen
|
cd6234570c
|
Improve loading page color contrast
|
2014-07-10 13:45:48 +01:00 |
|
James Allen
|
7fb8154c6e
|
Improve loading screen
|
2014-07-10 13:41:54 +01:00 |
|
James Allen
|
9e4653d83c
|
Try to clean up to avoid memory leaks
|
2014-07-09 20:49:10 +01:00 |
|
James Allen
|
f2b8a5971f
|
Don't do a scope.apply on every change
|
2014-07-09 20:32:03 +01:00 |
|
Henry Oswald
|
5cf756969e
|
blog wip
|
2014-07-09 19:49:39 +01:00 |
|
James Allen
|
558d32adeb
|
Fix minification process
|
2014-07-09 18:20:57 +01:00 |
|
James Allen
|
16e382bef2
|
Update Ace and fix autocomplete
|
2014-07-09 17:59:04 +01:00 |
|
James Allen
|
c93902345a
|
Remove all console.log debug statements
|
2014-07-09 16:18:09 +01:00 |
|
James Allen
|
51d0026b74
|
More performance tweaks
|
2014-07-09 16:07:42 +01:00 |
|
James Allen
|
b0f43eab19
|
Use events for updating cursor = big performance gain
|
2014-07-09 15:38:38 +01:00 |
|
James Allen
|
d9c8e5c1c2
|
Deleted docs null check
|
2014-07-09 15:01:33 +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
|
ff7b7cdd20
|
Fix smoke tests
|
2014-07-08 14:29:06 +01:00 |
|
Henry Oswald
|
c5497a6c07
|
remove gravtar compute function as we are not using it, this is done in the chat api
|
2014-07-08 14:19:27 +01:00 |
|
James Allen
|
d9d1499dae
|
Ignore external pages
|
2014-07-08 13:36:08 +01:00 |
|
James Allen
|
8067432e09
|
Fix include paths
|
2014-07-08 13:29:09 +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 |
|
James Allen
|
2f92856db4
|
Provide more config options for nav and footer entries
|
2014-07-08 12:51:11 +01:00 |
|
Henry Oswald
|
521c7f9485
|
Merge branch 'master-redesign' into master-redesign-templates-and-blog
|
2014-07-08 12:45:13 +01:00 |
|
Henry Oswald
|
60cc16dbe6
|
fixed broken paths to ace editor stuff from moving things around
|
2014-07-08 12:43:07 +01:00 |
|
Henry Oswald
|
0080809489
|
merge/moving js stuff around half done
|
2014-07-08 12:32:50 +01:00 |
|
James Allen
|
8ed03694c3
|
Add missing files
|
2014-07-08 12:02:26 +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 |
|
Henry Oswald
|
6dc9d32104
|
Merge branch 'master-redesign' into master-redesign-templates-and-blog
Conflicts:
public/coffee/app/main.coffee
|
2014-07-08 11:14:56 +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 |
|
James Allen
|
8525bf4a72
|
Get group admin page working with angular and new style
|
2014-07-07 18:06:12 +01:00 |
|
James Allen
|
c542116b41
|
Fix role autocomplete
|
2014-07-07 16:25:18 +01:00 |
|
James Allen
|
5d62775ab6
|
Fix auto complete in user profile
|
2014-07-07 16:22:38 +01:00 |
|
James Allen
|
068d88ec0b
|
Style bonus page
|
2014-07-07 15:54:40 +01:00 |
|
James Allen
|
41ef675999
|
Improve UX of user profile
|
2014-07-07 14:58:12 +01:00 |
|
James Allen
|
452098ca68
|
Redirect to register if not registered on plans page
|
2014-07-07 14:05:07 +01:00 |
|
James Allen
|
5f48105b04
|
Style subscription management pages
|
2014-07-07 13:43:36 +01:00 |
|
James Allen
|
7947eb28ad
|
Remove ab test from plans page
|
2014-07-07 12:30:19 +01:00 |
|
James Allen
|
b3bfa2dc26
|
Add plans page
|
2014-07-07 12:27:58 +01:00 |
|
Henry Oswald
|
34ac6b03cd
|
Merge branch 'master-redesign' into master-redesign-templates-and-blog
|
2014-07-07 10:54:50 +01:00 |
|