James Allen
|
b367c4a968
|
Show group subscription status on subscription dashboard page
Conflicts:
app/views/subscriptions/dashboard.jade
|
2014-08-07 15:51:43 +01:00 |
|
Henry Oswald
|
06c83dfcfa
|
fixed missing title val
|
2014-08-07 15:15:07 +01:00 |
|
Henry Oswald
|
9c6f0faff6
|
Merge branch 'i18n'
Conflicts:
app/coffee/Features/User/UserPagesController.coffee
app/views/layout.jade
app/views/project/editor/dropbox.jade
app/views/project/editor/file-tree.jade
app/views/project/editor/pdf.jade
app/views/project/list/project-list.jade
app/views/user/settings.jade
|
2014-08-07 14:46:17 +01:00 |
|
Henry Oswald
|
a337b8e848
|
fixed jade error in track changes
|
2014-08-07 14:31:03 +01:00 |
|
Henry Oswald
|
ecd5d5274c
|
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
|
2014-08-07 13:56:17 +01:00 |
|
Henry Oswald
|
c961cea514
|
fixed some bits
|
2014-08-07 13:56:04 +01:00 |
|
James Allen
|
0a44aa9e71
|
Push into doc updater queue rather than pub/sub for updates
|
2014-08-07 13:19:10 +01:00 |
|
Henry Oswald
|
01b7f61e6b
|
added check if other langs are enabled for put the header rel link in
|
2014-08-06 15:35:57 +01:00 |
|
Henry Oswald
|
673def4f90
|
added different lang links to head for google
|
2014-08-06 15:05:13 +01:00 |
|
James Allen
|
07a2955341
|
Add in timeout documentation link to error message
|
2014-08-05 17:16:34 +01:00 |
|
James Allen
|
0111d699a3
|
Move sort click action to just the header text, not select all input
|
2014-08-05 17:10:24 +01:00 |
|
James Allen
|
a7cf8d6b0a
|
Sort out title of wiki
|
2014-08-05 17:08:38 +01:00 |
|
Henry Oswald
|
9baea1edc1
|
removed lang dropdown
|
2014-08-05 11:35:23 +01:00 |
|
Henry Oswald
|
90395af6b8
|
nav bar text is now translated but uses key as the string if it can't be translated
|
2014-08-05 11:24:18 +01:00 |
|
Henry Oswald
|
377acfaa56
|
added default lang of en-US and translations package does the set lang based on subdomain
|
2014-08-05 11:15:17 +01:00 |
|
Henry Oswald
|
2be22d7ca7
|
cookies work accross different subdomains, added translations middlewear into stack to render based on domain
|
2014-08-04 16:47:14 +01:00 |
|
Henry Oswald
|
1e0652888a
|
removed console.log
|
2014-08-04 12:21:38 +01:00 |
|
Henry Oswald
|
03db0bc797
|
added ugly dropdown for testing
|
2014-08-01 14:43:06 +01:00 |
|
Henry Oswald
|
d047d44079
|
Changed the error messages which are sent down to the client to be translated first
fixed up tests from titles we check when rendering, deleted them as they never
catch anything important, more hastle than they are worth imo.
|
2014-08-01 14:03:38 +01:00 |
|
Henry Oswald
|
1b8c8b8c48
|
sorted out titles
|
2014-08-01 13:47:14 +01:00 |
|
Henry Oswald
|
fdc5a5154a
|
added a load more pages
|
2014-08-01 12:34:53 +01:00 |
|
James Allen
|
2ea7dee682
|
Add card around wiki content to make it stand out
|
2014-08-01 08:51:01 +01:00 |
|
Henry Oswald
|
cb685f5ea6
|
done loads of more pages
|
2014-07-31 17:07:43 +01:00 |
|
James Allen
|
55ad2ce78d
|
Include contents page down side of wiki
|
2014-07-31 16:26:02 +01:00 |
|
James Allen
|
be725c50ba
|
Make right click on menus behave like native right click
|
2014-07-31 14:20:56 +01:00 |
|
Henry Oswald
|
ab10d84f6a
|
did some of the forms
|
2014-07-31 14:01:37 +01:00 |
|
Henry Oswald
|
43750e9cb6
|
converted plans page
|
2014-07-31 13:38:24 +01:00 |
|
James Allen
|
13c6fcb8d9
|
Handle encoded parameters in request URL to wiki
|
2014-07-31 13:12:24 +01:00 |
|
James Allen
|
bc2147993a
|
Show project path in Dropbox folder
|
2014-07-31 13:04:55 +01:00 |
|
James Allen
|
e1c14b0cf8
|
Mask iframe so resizer can go over native PDF
|
2014-07-31 13:04:55 +01:00 |
|
Henry Oswald
|
5f8bb9ea1f
|
converted settings page
|
2014-07-31 11:54:19 +01:00 |
|
Henry Oswald
|
42c63dd5a2
|
equals checks work, uses id now as well. Taken from:
http://blog.brunoscopelliti.com/angularjs-directive-to-check-that-passwords-match
the old one from SO does not seem to work any more
|
2014-07-31 11:16:13 +01:00 |
|
Henry Oswald
|
270c92c2a2
|
converted project list page
added missing js files
|
2014-07-30 17:18:45 +01:00 |
|
Henry Oswald
|
49c7d52208
|
i18n is cleaned and working with requirejs
|
2014-07-30 16:13:02 +01:00 |
|
Henry Oswald
|
9631d4da98
|
much simpler version of interpolation
|
2014-07-30 16:06:53 +01:00 |
|
Henry Oswald
|
7344f745e4
|
example of interpolation working
|
2014-07-30 16:04:26 +01:00 |
|
James Allen
|
94bcfc0eac
|
Only store host, not path in wiki URL setting
|
2014-07-30 15:56:27 +01:00 |
|
James Allen
|
49258fe3dd
|
Proxy to wiki
|
2014-07-30 15:44:03 +01:00 |
|
Henry Oswald
|
1a8c3d17b2
|
working example of directive for i18n new project button
|
2014-07-30 15:05:13 +01:00 |
|
Henry Oswald
|
bdf1fed462
|
jquery translations work
|
2014-07-30 14:22:36 +01:00 |
|
Henry Oswald
|
48f019236e
|
added first translations
|
2014-07-29 15:33:31 +01:00 |
|
Henry Oswald
|
39173fe583
|
Merge branch 'i18n'
Conflicts:
app/coffee/infrastructure/Server.coffee
app/views/project/list.jade
package.json
|
2014-07-29 13:44:10 +01:00 |
|
James Allen
|
1f44cc4375
|
Fix alignment of 'view all templates'
|
2014-07-29 11:35:56 +01:00 |
|
Henry Oswald
|
f821c38a9f
|
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
|
2014-07-29 10:55:29 +01:00 |
|
Henry Oswald
|
dff74cf5cb
|
hide dropbox in left menu if you are not the admin
|
2014-07-29 10:55:22 +01:00 |
|
James Allen
|
df85254d3c
|
Merge branch 'master' of github.com:sharelatex/web-sharelatex
|
2014-07-29 10:39:07 +01:00 |
|
James Allen
|
25205e3dda
|
Update to official mathjax cdn
|
2014-07-29 10:37:43 +01:00 |
|
Henry Oswald
|
f906d63067
|
added some logging around dropbox update
|
2014-07-29 10:32:11 +01:00 |
|
Henry Oswald
|
a62a8db0e0
|
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
|
2014-07-29 10:29:46 +01:00 |
|
Henry Oswald
|
344d32d4e8
|
fixed email logo link
|
2014-07-29 10:29:40 +01:00 |
|
James Allen
|
fc7753d49d
|
Add in download PDF button
|
2014-07-28 17:24:43 +01:00 |
|
Henry Oswald
|
2267a484f4
|
added /home so in dev can easily see home page when logged in
|
2014-07-28 17:04:17 +01:00 |
|
Henry Oswald
|
9354d61aa3
|
fixed delete account validation
not using angular equals which does not seem to work
|
2014-07-28 16:52:25 +01:00 |
|
James Allen
|
a5267184ab
|
Don't use dark theme yet
|
2014-07-28 15:57:06 +01:00 |
|
James Allen
|
db920f7aaf
|
Merge branch 'master' of github.com:sharelatex/web-sharelatex
|
2014-07-28 15:06:39 +01:00 |
|
James Allen
|
4ff9fe33b6
|
Use a dark editor surround if the theme is dark
|
2014-07-28 15:06:26 +01:00 |
|
Henry Oswald
|
d4be1ba7aa
|
changed template image paths to use correct ones
|
2014-07-28 12:50:56 +01:00 |
|
James Allen
|
ce47f75058
|
Show timedout errors properly
|
2014-07-28 10:22:27 +01:00 |
|
Henry Oswald
|
1603957571
|
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
|
2014-07-25 14:21:48 +01:00 |
|
Henry Oswald
|
b7c6af1341
|
/home goes to home page, so can look at it when logged in
|
2014-07-25 14:17:40 +01:00 |
|
James Allen
|
e8c5679954
|
Update styles for homepage
|
2014-07-25 14:14:27 +01:00 |
|
Henry Oswald
|
c0f5894edb
|
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
|
2014-07-25 13:14:22 +01:00 |
|
Henry Oswald
|
40dbeb1fe7
|
fixed missing fingerprint
|
2014-07-25 12:52:17 +01:00 |
|
James Allen
|
9aa8682082
|
Add group plan enquiry form
|
2014-07-25 12:32:26 +01:00 |
|
Henry Oswald
|
5a336ed7ef
|
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
|
2014-07-25 12:20:11 +01:00 |
|
Henry Oswald
|
d7814e354b
|
replace underscore with space in template names
|
2014-07-25 12:20:08 +01:00 |
|
James Allen
|
cb5206a49e
|
Convert plans page to use free trials
|
2014-07-25 12:10:56 +01:00 |
|
Henry Oswald
|
726719ce3f
|
changed html autofocus to an angular directive
autofocus is html5y and worked on chrome but not firefox for me.
|
2014-07-24 14:57:56 +01:00 |
|
Henry Oswald
|
b15adefed7
|
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
|
2014-07-24 14:06:33 +01:00 |
|
Henry Oswald
|
787a3adad3
|
killed changelog
|
2014-07-24 14:05:20 +01:00 |
|
James Allen
|
0938186868
|
Don't show system messages in editor
|
2014-07-24 14:04:26 +01:00 |
|
James Allen
|
5c18f4fe02
|
Sexy project list resizing
|
2014-07-24 14:02:14 +01:00 |
|
Henry Oswald
|
2ffe093952
|
removed unused bonus jade files
|
2014-07-24 13:58:02 +01:00 |
|
Henry Oswald
|
7255231abc
|
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
updated upstream into a topic branch.
|
2014-07-24 13:57:49 +01:00 |
|
James Allen
|
06ca7c904e
|
Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
|
2014-07-24 13:24:20 +01:00 |
|
James Allen
|
1128b45b17
|
Add in system messages
|
2014-07-24 13:24:08 +01:00 |
|
Henry Oswald
|
67cba0dfd2
|
killed info controller and setup features.less for dropbox and feature pages
also moved dropbox to external pages
|
2014-07-24 12:15:54 +01:00 |
|
Henry Oswald
|
a8deac697c
|
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
|
2014-07-24 11:29:11 +01:00 |
|
Henry Oswald
|
a7b678a2c0
|
removed dropbox template that is not needed
|
2014-07-24 11:29:05 +01:00 |
|
Henry Oswald
|
49f356b38f
|
removed advisor and themes page
|
2014-07-24 11:23:53 +01:00 |
|
James Allen
|
fbd36d8b07
|
Sort of style of admin panel and trim functionality
|
2014-07-24 11:22:22 +01:00 |
|
James Allen
|
596619633d
|
Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
|
2014-07-23 15:56:22 +01:00 |
|
James Allen
|
a459a178b3
|
Retina favicon
|
2014-07-23 15:56:15 +01:00 |
|
Henry Oswald
|
e60c67d7e4
|
moved the left hand pdf link to the top
|
2014-07-23 14:44:44 +01:00 |
|
Henry Oswald
|
e46bc51c67
|
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
|
2014-07-23 12:17:14 +01:00 |
|
Henry Oswald
|
17962426ea
|
blog returns 404's if the page does not exist in blog
|
2014-07-23 12:16:52 +01:00 |
|
Henry Oswald
|
83b94f987c
|
cleaned up few small things with templates
|
2014-07-23 12:16:31 +01:00 |
|
James Allen
|
077f87f1d3
|
Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
|
2014-07-23 12:05:31 +01:00 |
|
Henry Oswald
|
395b1ebf47
|
Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign
|
2014-07-23 11:29:43 +01:00 |
|
Henry Oswald
|
e39e6c86a1
|
moved where we write the window.sharelatex.x to the header as some
times it is possible for the scripts to evaulate before those props
have been read in
|
2014-07-23 11:29:04 +01:00 |
|
James Allen
|
2218acdc3b
|
Add close buttons to modals
|
2014-07-23 11:26:45 +01:00 |
|
Henry Oswald
|
a9d8be8dec
|
brought up the sections of templates to be closer to the search box
|
2014-07-23 11:26:17 +01:00 |
|
James Allen
|
bbaf024f14
|
Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
|
2014-07-23 11:22:12 +01:00 |
|
James Allen
|
cca50cf64c
|
Auto focus login, register and password fields
|
2014-07-23 11:18:42 +01:00 |
|
James Allen
|
96e99a5cc0
|
Minor project list tweaks
|
2014-07-23 11:12:12 +01:00 |
|
James Allen
|
532ec5e756
|
Make project list look better on a smaller screen
|
2014-07-23 11:08:55 +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
|
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
|
cb57c2f28d
|
Tweak css and style on homepage
|
2014-07-22 11:50:15 +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 |
|
Henry Oswald
|
aa3cd06d72
|
add trailing space for better spacing on register message
|
2014-07-21 17:32:16 +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
|
1d6314a2c1
|
add Ctrl-Enter hotkey
|
2014-07-21 15:39:15 +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
|
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
|
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
|
6212b1c375
|
Append header tooltips to body
|
2014-07-21 11:38:19 +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 |
|
Henry Oswald
|
0868ce9cc7
|
send user details on modal dismiss. Role uses same autocomplete lib as institution
|
2014-07-18 14:08:53 +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
|
462403bb4f
|
Finger print Ace files
|
2014-07-18 12:08:56 +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 |
|
James Allen
|
2cf8f8c56f
|
Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
|
2014-07-17 15:35:06 +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
|
a3faaf0c18
|
Add in mathjax directive
|
2014-07-17 13:23:43 +01:00 |
|