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 |
|
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 |
|
James Allen
|
773b457d24
|
Group messages from the same person together
|
2014-07-04 15:46:21 +01:00 |
|
Henry Oswald
|
86a9d08e5c
|
Merge branch 'master-redesign' into master-redesign-templates-and-blog
|
2014-07-04 13:06:47 +01:00 |
|
James Allen
|
ac0f05a9e4
|
Create binary file preview
|
2014-07-03 17:05:50 +01:00 |
|
James Allen
|
af870c8269
|
Style project name and allow renaming
|
2014-07-03 16:18:49 +01:00 |
|
James Allen
|
a8d371d2f6
|
Sort out permissions and displaying anonymous users
|
2014-07-03 15:05:35 +01:00 |
|
James Allen
|
58e4e92d84
|
Add in upgrade pop up to history
|
2014-07-03 11:18:15 +01:00 |
|
James Allen
|
a13ee00e91
|
Allow dragging into the root folder
|
2014-07-03 11:01:41 +01:00 |
|
James Allen
|
a4afc70f9b
|
Show saving notifications
|
2014-07-02 17:41:07 +01:00 |
|
James Allen
|
b61da1a9f0
|
Handle out of sync errors with a pop-up
|
2014-07-02 17:04:29 +01:00 |
|
Henry Oswald
|
b81fac1cf4
|
Merge branch 'master-redesign' into master-redesign-templates-and-blog
|
2014-07-02 15:58:30 +01:00 |
|
Henry Oswald
|
ba4d585854
|
Merge branch 'master-redesign' into master-redesign-templates-and-blog
|
2014-07-02 15:56:22 +01:00 |
|
James Allen
|
f256c96195
|
Add in chat view with stubbed data
|
2014-07-02 15:56:09 +01:00 |
|
James Allen
|
926b31b337
|
Fix a few ui bugs
|
2014-07-02 13:29:56 +01:00 |
|
James Allen
|
ab09a865b8
|
Add in chat pane and sort out layout resizing
|
2014-07-02 13:23:04 +01:00 |
|
James Allen
|
83666be910
|
Disabled pdf download if not available
|
2014-07-02 11:06:20 +01:00 |
|
James Allen
|
f86c9cf853
|
Move all editor manager binding logic into the managers
|
2014-07-02 10:59:18 +01:00 |
|
Henry Oswald
|
55d20e8abd
|
change format of algolia settings
|
2014-07-01 16:45:20 +01:00 |
|
James Allen
|
beae4f2424
|
Style settings side panel
|
2014-07-01 16:03:14 +01:00 |
|
James Allen
|
7cfbaaca36
|
Style settings side panel
|
2014-07-01 15:57:55 +01:00 |
|
Henry Oswald
|
000be22f16
|
Merge branch 'master-redesign' into master-redesign-templates-and-blog
Conflicts:
app/views/project/editor.jade
|
2014-07-01 15:23:05 +01:00 |
|
James Allen
|
e1bce85933
|
Update style when project is public too
|
2014-07-01 15:17:42 +01:00 |
|