Henry Oswald
|
43256d2085
|
lined up the templates header with the search bar.
Need to kill big space bellow it next
|
2014-07-22 17:52:47 +01:00 |
|
Henry Oswald
|
c6ab4c4f7b
|
roughly styled template search results
clear button in template search also clears results
|
2014-07-22 17:43:17 +01:00 |
|
Henry Oswald
|
25ea01115a
|
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
|
2014-07-22 17:24:51 +01:00 |
|
Henry Oswald
|
a4b02558dc
|
'carded' the templates page, top search area still needs doing
|
2014-07-22 17:24:32 +01:00 |
|
James Allen
|
20a5d3742a
|
Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
|
2014-07-22 17:09:52 +01:00 |
|
James Allen
|
dfb82015f7
|
Style blog and lighten text
|
2014-07-22 17:09:44 +01:00 |
|
Henry Oswald
|
a20b46c786
|
template page looks ok, not quite like adam did.
Need to battle left padding still
|
2014-07-22 15:56:36 +01:00 |
|
Henry Oswald
|
234bc5e0e9
|
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
|
2014-07-22 14:56:41 +01:00 |
|
Henry Oswald
|
806ebc977c
|
templates index page looks roughly correct
|
2014-07-22 14:56:33 +01:00 |
|
James Allen
|
a4209000dc
|
Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
|
2014-07-22 14:38:51 +01:00 |
|
James Allen
|
c099b8e9de
|
Add hotkeys modal
|
2014-07-22 14:38:32 +01:00 |
|
Henry Oswald
|
c95730dd63
|
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
|
2014-07-22 13:42:37 +01:00 |
|
James Allen
|
cd8a94b108
|
Auto compile on project join, not doc open
|
2014-07-22 13:38:34 +01:00 |
|
James Allen
|
688842de3c
|
Allow full screen PDF
|
2014-07-22 13:33:01 +01:00 |
|
Henry Oswald
|
2c7d19d79b
|
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
|
2014-07-22 12:31:34 +01:00 |
|
Henry Oswald
|
2246e9c934
|
blog looks basically like adams
|
2014-07-22 12:31:19 +01:00 |
|
James Allen
|
c04b503914
|
Darken file names
|
2014-07-22 11:53:20 +01:00 |
|
James Allen
|
cb57c2f28d
|
Tweak css and style on homepage
|
2014-07-22 11:50:15 +01:00 |
|
James Allen
|
41c43ee2a9
|
More homepage CSS tweaks
|
2014-07-21 18:13:38 +01:00 |
|
James Allen
|
3a13dac7ab
|
Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
|
2014-07-21 17:56:28 +01:00 |
|
James Allen
|
2ec63f5057
|
Homepage css tweaks
|
2014-07-21 17:56:20 +01:00 |
|
Henry Oswald
|
aa3cd06d72
|
add trailing space for better spacing on register message
|
2014-07-21 17:32:16 +01:00 |
|
Henry Oswald
|
8a068cf9a0
|
styled the register page to show the messages for tempaltes/shared
correctly
i.e.: http://localhost:3000/register?zipUrl=%2Ftemplates%2F52fb89a333621a613683ec95%2Fv%2F1%2Fzip&templateName=thebibliography&compiler=pdflatex&redir=%2Fproject%2Fnew%2Ftemplate
and http://localhost:3000/register?project_name=cc&user_first_name=myname&new_email=henry.oswald%2B1%40gmail.com&r=9f5572a4&rs=ci&redir=%2Fproject%2F53c8ec05ae21f58877ded489
|
2014-07-21 17:29:55 +01:00 |
|
Henry Oswald
|
535a3c67cd
|
added template for bonus page with html linking to us
|
2014-07-21 16:41:22 +01:00 |
|
James Allen
|
b5cfe06645
|
Don't show options that don't make sense for anonymous users
|
2014-07-21 16:10:21 +01:00 |
|
Henry Oswald
|
46027128a4
|
change notifications email top header to the grey we use on the site
|
2014-07-21 15:52:55 +01:00 |
|
James Allen
|
a35d62c4ae
|
Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
|
2014-07-21 15:39:27 +01:00 |
|
James Allen
|
1d6314a2c1
|
add Ctrl-Enter hotkey
|
2014-07-21 15:39:15 +01:00 |
|
Henry Oswald
|
12f9b63c51
|
fixed kr theme, doing pr to ace project
|
2014-07-21 15:27:55 +01:00 |
|
James Allen
|
27795c451f
|
Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
|
2014-07-21 15:12:00 +01:00 |
|
James Allen
|
3468460ed6
|
Show progress before any js loads
|
2014-07-21 15:11:54 +01:00 |
|
James Allen
|
2b85ebf8ec
|
Allow root doc to be set
|
2014-07-21 15:09:19 +01:00 |
|
Henry Oswald
|
9292000f01
|
X in search bar clears search text, and the filter on the project list
|
2014-07-21 14:27:56 +01:00 |
|
Henry Oswald
|
1322f3e183
|
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
|
2014-07-21 14:18:43 +01:00 |
|
Henry Oswald
|
375669cd3b
|
changed emails to adams design. Does not render brilliantly in gmail, but overall not bad.
|
2014-07-21 14:18:11 +01:00 |
|
James Allen
|
a3a5aa1c0d
|
Remove server-side santization of project name, it's all escaped client side now
|
2014-07-21 13:34:25 +01:00 |
|
Henry Oswald
|
792147fb46
|
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
|
2014-07-21 13:25:43 +01:00 |
|
James Allen
|
1c68ea7328
|
Don't care if user key has expired when we receive a cursor update
|
2014-07-21 13:16:07 +01:00 |
|
Henry Oswald
|
82914b6fe5
|
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
|
2014-07-21 13:14:08 +01:00 |
|
James Allen
|
f16f6fd126
|
Don't render Mathjax on load
|
2014-07-21 12:44:48 +01:00 |
|
James Allen
|
98d601fb66
|
Only show synctex controls when pdf layout is open
|
2014-07-21 12:30:34 +01:00 |
|
James Allen
|
1cf508356c
|
Show 'no messages' state in chat
|
2014-07-21 12:19:13 +01:00 |
|
James Allen
|
4151f5d85f
|
Disable chat for anonymous users
|
2014-07-21 11:56:49 +01:00 |
|
James Allen
|
088d27f22b
|
Make sure gotoLine works when changing session
|
2014-07-21 11:50:02 +01:00 |
|
James Allen
|
6212b1c375
|
Append header tooltips to body
|
2014-07-21 11:38:19 +01:00 |
|
James Allen
|
36f48cf772
|
Fix drag and drop
|
2014-07-21 11:36:03 +01:00 |
|
Henry Oswald
|
57ad5e4182
|
- migrated event tracking to new pages/angular
- hooked up the search field on projects to search on keypress
|
2014-07-21 11:35:05 +01:00 |
|
James Allen
|
608fc8364b
|
Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
|
2014-07-18 14:30:35 +01:00 |
|
James Allen
|
abdd239ad2
|
Sort with latest first by default
|
2014-07-18 14:30:24 +01:00 |
|
Henry Oswald
|
d5d29f0997
|
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
|
2014-07-18 14:08:57 +01:00 |
|
Henry Oswald
|
0868ce9cc7
|
send user details on modal dismiss. Role uses same autocomplete lib as institution
|
2014-07-18 14:08:53 +01:00 |
|
James Allen
|
1ef76d99ec
|
Update visible projects when loading the page
|
2014-07-18 14:06:37 +01:00 |
|
Henry Oswald
|
533b51146e
|
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
|
2014-07-18 13:20:40 +01:00 |
|
Henry Oswald
|
175882dc67
|
changed role to datalist because im fed up of not being able to fix it. Datalist are not styled but its not that bad
|
2014-07-18 13:20:35 +01:00 |
|
James Allen
|
b532461232
|
Style project sorting with a cleaner look
|
2014-07-18 12:20:12 +01:00 |
|
James Allen
|
b785ab4d15
|
Fix broken project list page
|
2014-07-18 12:18:05 +01:00 |
|
James Allen
|
42578e328b
|
Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
|
2014-07-18 12:09:04 +01:00 |
|
James Allen
|
462403bb4f
|
Finger print Ace files
|
2014-07-18 12:08:56 +01:00 |
|
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 |
|
Daniel Felder
|
6015788e41
|
Update latex.js
Temporary fix. I proposed the same change to the official repo.
|
2014-07-15 01:44:39 +02: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 |
|
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 |
|
Henry Oswald
|
d1f907cee5
|
first simple version of tracking who is active in the editor
|
2014-07-04 16:18:46 +01:00 |
|
James Allen
|
e0c25a8cc3
|
Don't group far apart messages together
|
2014-07-04 15:47:48 +01:00 |
|
James Allen
|
773b457d24
|
Group messages from the same person together
|
2014-07-04 15:46:21 +01:00 |
|
Henry Oswald
|
de010cf971
|
added error logging
|
2014-07-04 13:29:59 +01:00 |
|
Henry Oswald
|
0d02241b46
|
linked chat into the editor real time contorller
|
2014-07-04 13:20:30 +01:00 |
|
Henry Oswald
|
86a9d08e5c
|
Merge branch 'master-redesign' into master-redesign-templates-and-blog
|
2014-07-04 13:06:47 +01:00 |
|
Henry Oswald
|
9c35cfd693
|
very start of chat controllers done
|
2014-07-04 13:05:55 +01:00 |
|
James Allen
|
97065e8547
|
CSS tweaks
|
2014-07-03 17:19:57 +01:00 |
|
James Allen
|
5dd3f828e3
|
Open current selection when leaving track changes
|
2014-07-03 17:12:23 +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 |
|
Henry Oswald
|
77246b2a07
|
added query string support onto get requests for limit and before
|
2014-07-02 17:37:30 +01:00 |
|
Henry Oswald
|
8670b543b9
|
added basic chat handler
|
2014-07-02 17:28:05 +01:00 |
|
James Allen
|
b61da1a9f0
|
Handle out of sync errors with a pop-up
|
2014-07-02 17:04:29 +01:00 |
|
James Allen
|
e870d7190b
|
Improve reconnecting message
|
2014-07-02 16:41: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 |
|
James Allen
|
f5e5e55457
|
Don't capture all click events
|
2014-07-02 10:58:06 +01:00 |
|
Henry Oswald
|
55d20e8abd
|
change format of algolia settings
|
2014-07-01 16:45:20 +01:00 |
|
James Allen
|
b51af73516
|
Fix a few issues with ace autocomplete and cursors
|
2014-07-01 16:36:30 +01:00 |
|
James Allen
|
beae4f2424
|
Style settings side panel
|
2014-07-01 16:03:14 +01:00 |
|
Henry Oswald
|
8f6dac77d0
|
added asset proxying from templates in, used for old images etc which people linked to
|
2014-07-01 16:00:42 +01:00 |
|
James Allen
|
7cfbaaca36
|
Style settings side panel
|
2014-07-01 15:57:55 +01:00 |
|
Henry Oswald
|
978e3262b5
|
added redirects from config file in, used for old template paths
|
2014-07-01 15:44:12 +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 |
|
James Allen
|
0b0f7eab0b
|
Stop public status looking like a table header
|
2014-07-01 15:15:54 +01:00 |
|
James Allen
|
9839f3fc62
|
Get public sharing modal working
|
2014-07-01 15:05:32 +01:00 |
|
Henry Oswald
|
17537b0d7a
|
client side js for templates loads and works
|
2014-07-01 14:27:20 +01:00 |
|
James Allen
|
d599cfa7ac
|
Fix unit tests
|
2014-07-01 14:19:52 +01:00 |
|
James Allen
|
08f702a7c5
|
Get free trial button working in share modal
|
2014-07-01 14:16:41 +01:00 |
|
James Allen
|
be48ab2a30
|
Add in basic share modal
|
2014-07-01 14:12:28 +01:00 |
|
James Allen
|
9097fdd930
|
Allow switching between pdfjs and native viewer
|
2014-07-01 11:00:47 +01:00 |
|
James Allen
|
96696e745e
|
Fix path normalization
|
2014-06-30 18:37:39 +01:00 |
|
James Allen
|
11d951f021
|
Get synctex working
|
2014-06-30 18:35:01 +01:00 |
|
Henry Oswald
|
53fa15d3db
|
added basic error handling around templates rendering
|
2014-06-30 17:27:13 +01:00 |
|
Henry Oswald
|
27a97b7fa8
|
build titles for tempaltes page in web
|
2014-06-30 17:19:25 +01:00 |
|
Henry Oswald
|
b80f751cb2
|
templates works basically, needs error handling and few little improvments
|
2014-06-30 17:08:54 +01:00 |
|
James Allen
|
d3d18c384a
|
Fix remote cursors
|
2014-06-30 14:01:39 +01:00 |
|
James Allen
|
0f9f04803e
|
Improve goto line functionalitt
|
2014-06-30 13:47:37 +01:00 |
|
James Allen
|
797dcf5c84
|
Jump to error when clicking on log entry
|
2014-06-30 13:41:32 +01:00 |
|
James Allen
|
8b6f962275
|
Allow clearing of aux files
|
2014-06-30 12:36:17 +01:00 |
|
James Allen
|
aee7b5477b
|
View raw log and download aux files
|
2014-06-30 12:05:43 +01:00 |
|
James Allen
|
32d1642b9e
|
Get basic compile/errors/autocompile working
|
2014-06-30 11:35:32 +01:00 |
|
James Allen
|
2d0264613e
|
Add in missing libs
|
2014-06-30 11:03:28 +01:00 |
|
James Allen
|
0a0719cf7b
|
Sort of out styling of log entries
|
2014-06-29 14:22:08 +01:00 |
|
James Allen
|
25a4be408a
|
Get PDF controls working
|
2014-06-28 15:43:44 +01:00 |
|
James Allen
|
9c9de35918
|
Set up basic PDF viewer
|
2014-06-28 13:25:06 +01:00 |
|
James Allen
|
845c4a7297
|
Get layout and resize logic working for PDF view
|
2014-06-28 12:07:18 +01:00 |
|
James Allen
|
3b57d62de2
|
Refactor project list select all to use linked directives
|
2014-06-27 21:19:14 +01:00 |
|
James Allen
|
75f1fb54b6
|
Allow restoring of deleted files
|
2014-06-27 17:11:26 +01:00 |
|
James Allen
|
562f28f412
|
Fix resizing and dragging issues
|
2014-06-27 15:55:08 +01:00 |
|
James Allen
|
b07def6901
|
Get infinite scroll auto-loading of track changes workikng
|
2014-06-27 15:45:14 +01:00 |
|
James Allen
|
7af839215f
|
Don't show cursor in track-changes diff
|
2014-06-27 14:46:39 +01:00 |
|
James Allen
|
0d334a560e
|
fix failing unit test
|
2014-06-27 14:38:08 +01:00 |
|
James Allen
|
5cbf600f05
|
Improve labelling of track changes diffs
|
2014-06-27 14:35:46 +01:00 |
|
James Allen
|
5da92dc864
|
Auto select recent changes
|
2014-06-27 13:46:38 +01:00 |
|
James Allen
|
b7adaf9f87
|
Display diffs
|
2014-06-27 12:45:37 +01:00 |
|
James Allen
|
b696d93c72
|
Fix loading element
|
2014-06-26 17:25:25 +01:00 |
|
James Allen
|
28f8c9e055
|
Get hover state working
|
2014-06-26 17:22:06 +01:00 |
|
James Allen
|
60e5542f35
|
Get basic track changes list working
|
2014-06-26 16:39:52 +01:00 |
|
James Allen
|
7e70dc9afc
|
Restore cursor position:
|
2014-06-26 11:45:12 +01:00 |
|
James Allen
|
afb953a489
|
Display cursor name labels
|
2014-06-26 11:19:05 +01:00 |
|
James Allen
|
70f64ee20c
|
Update securty page
|
2014-06-26 08:52:42 +01:00 |
|
James Allen
|
c14774bedd
|
Get basic cursor updating going on
|
2014-06-25 18:17:17 +01:00 |
|
James Allen
|
703a4faa0e
|
Code tidy up of ace editor directive
|
2014-06-25 16:46:28 +01:00 |
|
James Allen
|
5922ed45ee
|
Get spell check working in new editor
|
2014-06-25 16:06:04 +01:00 |
|
James Allen
|
9dfbb36a83
|
Update project settings over http
|
2014-06-25 13:51:02 +01:00 |
|
James Allen
|
adcea19dca
|
update security page
|
2014-06-25 12:15:45 +01:00 |
|
James Allen
|
d214b5dc5e
|
Merge branch 'master' into master-redesign
|
2014-06-25 12:14:26 +01:00 |
|
James Allen
|
341570d85d
|
Be more verbose with ip debug output
|
2014-06-25 11:06:04 +01:00 |
|
James Allen
|
5aa7daa951
|
Fix password reset rate limit to work on ip, not email which changes every request
|
2014-06-25 10:46:58 +01:00 |
|
James Allen
|
cb682ac584
|
Add in more robust support for being behind a proxy
|
2014-06-25 10:34:23 +01:00 |
|
James Allen
|
d2ac9a1e9f
|
Add in auto complete
|
2014-06-24 21:09:20 +01:00 |
|
James Allen
|
f154f17704
|
Wire up fontSize and mode settings
|
2014-06-24 20:46:00 +01:00 |
|
James Allen
|
5cef41fdbd
|
Allow selecting of theme
|
2014-06-24 20:28:53 +01:00 |
|
James Allen
|
7c2f944fad
|
Style loading panel
|
2014-06-24 17:50:59 +01:00 |
|
James Allen
|
71ca8f63ed
|
Improve reconnection and loading display and logic
|
2014-06-24 17:44:46 +01:00 |
|
James Allen
|
7104f458f7
|
Fix selection bugs
|
2014-06-24 17:24:29 +01:00 |
|
James Allen
|
2520651ef2
|
Automatically open previously open doc
|
2014-06-24 17:15:27 +01:00 |
|
James Allen
|
35c7f27788
|
Record last updated date for reconnecting
|
2014-06-24 16:56:31 +01:00 |
|
James Allen
|
f727bb775d
|
Show and preform auto-reconnect
|
2014-06-24 16:33:36 +01:00 |
|
James Allen
|
a1b715d1e9
|
Add in undo manager
|
2014-06-24 15:31:44 +01:00 |
|
James Allen
|
84f998ba4a
|
Restructure public/coffee/app folders slightly
|
2014-06-23 17:47:08 +01:00 |
|
James Allen
|
6f17e0bb82
|
Save folder expansion state to local storage
|
2014-06-23 17:28:05 +01:00 |
|
James Allen
|
cc0d45c678
|
Add right click to file tree
|
2014-06-23 17:25:45 +01:00 |
|
James Allen
|
a83f0fe054
|
Add in dropdowns to file tree
|
2014-06-23 12:37:05 +01:00 |
|
James Allen
|
2d6816b013
|
Highlight name when renaming or creating new file
|
2014-06-23 11:25:36 +01:00 |
|
James Allen
|
450ffd0564
|
Wrap http requests in angular
|
2014-06-23 11:10:18 +01:00 |
|
James Allen
|
a2663c0f32
|
Get drag and drop moving working
|
2014-06-23 10:57:31 +01:00 |
|
James Allen
|
84ac77795f
|
Delete files
|
2014-06-22 20:49:58 +01:00 |
|
James Allen
|
7556af6421
|
Listen for rename changes from server
|
2014-06-22 20:21:31 +01:00 |
|
James Allen
|
242a866bce
|
Rename files
|
2014-06-22 20:08:56 +01:00 |
|
James Allen
|
f1eee96c85
|
Allow uploading
|
2014-06-22 17:32:15 +01:00 |
|
James Allen
|
f931df6084
|
Allow creation of folders
|
2014-06-22 14:39:38 +01:00 |
|
James Allen
|
f41534ee4d
|
Add in creating of files to editor
|
2014-06-22 12:10:42 +01:00 |
|
James Allen
|
6d0053e709
|
Start rebuilding editor
|
2014-06-21 22:20:37 +01:00 |
|
James Allen
|
0d70777f7f
|
Fix JS errors in loading editor
|
2014-06-21 11:56:58 +01:00 |
|
James Allen
|
cb2a120c12
|
Shrink margin between subdued links
|
2014-06-20 21:42:55 +01:00 |
|
James Allen
|
e5ca033538
|
Add in configurable headings/footers
|
2014-06-20 21:35:42 +01:00 |
|
James Allen
|
3a15d1c573
|
Tweak homepage uni logos
|
2014-06-20 17:19:15 +01:00 |
|
James Allen
|
a64b9eb82e
|
Create and style external pages
|
2014-06-20 17:17:24 +01:00 |
|
James Allen
|
1980ffec09
|
Wire up delete and unsubscribe in account settings
|
2014-06-20 15:48:00 +01:00 |
|
James Allen
|
a2bb89b579
|
Merge branch 'master' into master-redesign
|
2014-06-20 11:18:43 +01:00 |
|
James Allen
|
81845dec32
|
Wire up account settings forms
|
2014-06-20 11:15:25 +01:00 |
|
James Allen
|
0ef7e54ad3
|
Allow partial updates to user settings
|
2014-06-20 09:42:43 +01:00 |
|
James Allen
|
63f958af07
|
Improve styling
|
2014-06-19 13:30:45 +01:00 |
|
James Allen
|
1bcc0a4554
|
Send 204 rather than redirect when leaving a project
|
2014-06-19 13:11:01 +01:00 |
|
James Allen
|
e07aa9165f
|
Queue up http requests so we can fire them in parallel without a problem
|
2014-06-19 13:03:34 +01:00 |
|
Henry Oswald
|
85befe0d57
|
listen on stdout when unzipping, unsticks some zips for some reason...
|
2014-06-18 18:18:49 +01:00 |
|
James Allen
|
70673d2881
|
Cloak project page while loading
|
2014-06-18 16:49:29 +01:00 |
|
James Allen
|
ad74cf2464
|
Add tooltips
|
2014-06-18 16:46:56 +01:00 |
|
James Allen
|
5513a0b436
|
Hook up front end download
|
2014-06-18 16:43:37 +01:00 |
|
James Allen
|
2b349039c3
|
Add in backend multiple project downloading
|
2014-06-18 16:37:18 +01:00 |
|
James Allen
|
b837a4e9f3
|
Merge branch 'master' into master-redesign
|
2014-06-18 15:26:09 +01:00 |
|
James Allen
|
618b6a7849
|
Apply form validations
|
2014-06-18 15:23:00 +01:00 |
|
Henry Oswald
|
2a6ff8cc5d
|
changed team@sharelatex.com to support@sharelatex.com
|
2014-06-18 14:47:29 +01:00 |
|
James Allen
|
04d3e5cfe1
|
Allow project search to be cleared
|
2014-06-18 11:53:18 +01:00 |
|
James Allen
|
9a03411d42
|
Don't show tags which are empty when loaded
|
2014-06-18 11:30:56 +01:00 |
|
James Allen
|
70c51cb947
|
Merge branch 'master' into master-redesign
|
2014-06-18 10:56:30 +01:00 |
|
Henry Oswald
|
e0be5ef01b
|
added timeouts to email and newsletter as after a few days there are a few open connections still
|
2014-06-17 18:18:45 +01:00 |
|
James Allen
|
750b524771
|
Don't get user id from possibly deleted session
|
2014-06-17 17:45:07 +01:00 |
|
James Allen
|
5ce319f8d9
|
Use ng-cloak rather than a loading spinner
|
2014-06-17 16:43:33 +01:00 |
|
James Allen
|
525581bada
|
Add in test loading spinner
|
2014-06-17 16:36:08 +01:00 |
|
Henry Oswald
|
426b699865
|
links in emails use site url
|
2014-06-17 16:28:52 +01:00 |
|
James Allen
|
dac4f09943
|
Merge branch 'master' into master-redesign
Conflicts:
app/views/project/list.jade
|
2014-06-17 16:21:21 +01:00 |
|
James Allen
|
aa8969c652
|
Merge and fix external forms
|
2014-06-17 16:19:40 +01:00 |
|
Henry Oswald
|
92d1d4ca1a
|
remove muted from institution auto complete as some browsers are inserting it to the input value
|
2014-06-17 14:44:24 +01:00 |
|
Henry Oswald
|
e1c8dc943e
|
added defaults of empty string into user profile, also changed account -> profile in message
|
2014-06-17 14:36:17 +01:00 |
|
James Allen
|
012371333f
|
Wrap project list code in require.js
|
2014-06-17 12:43:42 +01:00 |
|
Henry Oswald
|
2d55f080d6
|
get algolia to pull app id and api key from settings file
|
2014-06-17 12:25:49 +01:00 |
|
Henry Oswald
|
cc1b9472b2
|
don't show the user details area on project list if algolia instituions has not be setup
|
2014-06-17 11:59:57 +01:00 |
|
James Allen
|
c56648ab80
|
Merge branch 'master' into master-redesign
Conflicts:
app/views/project/list.jade
public/coffee/list.coffee
public/stylesheets/less/list.less
public/stylesheets/less/style.less
|
2014-06-17 11:54:29 +01:00 |
|
Henry Oswald
|
df44792a10
|
fix tests in user info controller
|
2014-06-17 11:48:14 +01:00 |
|
Henry Oswald
|
457fffd3f7
|
Merge branch 'angular-info'
|
2014-06-17 11:34:28 +01:00 |
|