Commit graph

778 commits

Author SHA1 Message Date
James Allen
e559c72491 Connect to configurable websocket service 2014-11-17 13:38:44 +00:00
James Allen
f7e6b24ff6 Save template description on modal close 2014-11-07 10:26:09 +00:00
James Allen
a59a2dcf39 Make sure to send description before publishing 2014-11-07 10:20:29 +00:00
James Allen
c9e5583394 Use local versions of jquery and angular 2014-11-07 09:49:30 +00:00
James Allen
d27af25bc9 Convert template publishing to use HTTP end points 2014-11-06 14:39:40 +00:00
James Allen
7b6ec86cef Access Dropbox status via HTTP end points 2014-11-06 14:39:40 +00:00
James Allen
5c3e8e6d88 Add and remove collaborators with HTTP requests, not websockets 2014-11-06 14:39:40 +00:00
Henry Oswald
a2f99bc04f prevent spell check from running twice on doc load 2014-11-04 14:20:59 +00:00
Henry Oswald
908926a0cc compiled pdf.worker with closure compiler manually 2014-11-04 12:44:45 +00:00
Henry Oswald
05a872763e revert updated pdf worker and don't minify it
This reverts commit ffbf6f052f1800b55c7636a98e4f16fdf629c376.
2014-11-04 12:16:06 +00:00
Henry Oswald
be6f0c1ad7 updated pdf worker 2014-11-04 12:10:21 +00:00
Henry Oswald
ccae47979f added chinese flags under cn 2014-10-31 13:21:04 +00:00
Henry Oswald
4f590d7acb added chinese flags in 2014-10-30 11:52:45 +00:00
Henry Oswald
14d32af6bf allow ace to scoll off screen 2014-10-30 08:33:54 +00:00
James Allen
2a69e185ce Append spell check menu to body so it isn't hidden by PDF view resizer 2014-10-27 14:51:28 +00:00
James Allen
184189fa3f Disable hotkeys for layout panels since they interfere with text editing 2014-10-27 14:47:06 +00:00
James Allen
2debba6bbc Update PGP key 2014-10-24 11:55:30 +01:00
Henry Oswald
0f8519f619 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-10-21 14:57:52 +01:00
Henry Oswald
c60f11519f added ga logging of starting free trial again 2014-10-21 14:06:53 +01:00
Henry Oswald
8097e6ad71 made 7 day free trial the default 2014-10-21 13:48:46 +01:00
James Allen
281c4eb4e3 Style tweaks for uni site 2014-10-21 13:39:47 +01:00
Henry Oswald
3cf64ce34f pass new compile features to client side, don't show timeout upgrade for premium users 2014-10-20 12:21:40 +01:00
James Allen
9f1a7c7396 Send source of update to doc updater and allow external updates to be ignored in UI 2014-10-16 11:27:10 +01:00
Henry Oswald
750b050358 added ab test in for multi currency 2014-10-15 16:21:45 +01:00
James Allen
64fe2a2404 Improve CSS and layout of feature list on new subscription page 2014-10-15 10:22:03 +01:00
James Allen
b32375530c Refactor card css for use in new subscription page 2014-10-14 15:46:44 +01:00
Henry Oswald
3382c5bb17 added blurb to payment page 2014-10-13 17:51:59 +01:00
Henry Oswald
52c54e7300 added ability to change currency on payment page 2014-10-13 17:28:00 +01:00
Henry Oswald
2bbdea3433 renamed change currency function and sorted out recommended currency 2014-10-13 16:27:27 +01:00
Henry Oswald
f55ef2f1b4 made what is returned for multi currency more explicit 2014-10-13 16:13:31 +01:00
Henry Oswald
36264706f6 hooked the plans page up to the geo ip lookup 2014-10-13 14:10:15 +01:00
James Allen
a8afe3a0d7 Improve file uploader CSS 2014-10-10 13:40:00 +01:00
James Allen
bc94ea56cb Add projects to tag after creating the tag 2014-10-09 08:39:15 +01:00
Henry Oswald
1f5d7ee6a8 Merge pull request #116 from mickaobrien/keyboard-shortcuts
Added keyboard shortcuts to bold and italicise text
2014-10-08 16:56:03 +01:00
James Allen
7258fadd17 Improve styling of plan name and price on subscription form 2014-10-08 16:52:37 +01:00
Mick O'Brien
834e27f3c5 Fix indentation in italics shortcut 2014-10-08 16:34:44 +01:00
James Allen
696e8d24e1 Fix z index of more updates buttons 2014-10-08 16:32:42 +01:00
Mick O'Brien
b7db72e574 Replace $isEmpty check 2014-10-08 16:17:38 +01:00
Mick O'Brien
72fc630e81 Added keyboard shortcuts to bold and italicise text 2014-10-08 15:44:01 +01:00
James Allen
128c672edd Merge branch 'github-sync'
Conflicts:
	package.json
2014-10-08 12:13:37 +01:00
Henry Oswald
28b1e6bfe5 added client side checks on how long project or entity names can be
150 chars should be safely under the 1024 bytes mongo index limit
2014-10-07 11:08:08 +01:00
James Allen
10732d112d Hook module system into project list page 2014-10-03 11:32:59 +01:00
Henry Oswald
ab46d6ec1a 30 != 7 days 2014-09-26 11:33:34 +01:00
Henry Oswald
b1562984c0 added tr flag 2014-09-26 11:25:29 +01:00
Henry Oswald
21f46da08a changed ab test from 30 -> 14 to 14 -> 7 2014-09-26 10:56:45 +01:00
Henry Oswald
d961b48857 imporved logging for session debug 2014-09-10 08:20:36 +01:00
Henry Oswald
50ee889569 fixed template search, ng-controller was too deep 2014-09-09 16:51:52 +01:00
Henry Oswald
187e87a978 disabled euro and pounds for the moment 2014-09-08 17:45:03 +01:00
James Allen
e973a66482 Allow client side module code injection 2014-09-08 17:33:30 +01:00
Henry Oswald
f1372fc449 moved button, not that pretty 2014-09-05 16:11:19 +01:00
Henry Oswald
ff0365c157 change plan has multi currency view 2014-09-05 15:47:08 +01:00
Henry Oswald
eeb27062a0 added currency query string param to subscribe button 2014-09-05 11:40:14 +01:00
Henry Oswald
13a667f47a v1 of multi currency 2014-09-04 19:03:04 +01:00
Henry Oswald
69eafd2a74 added more console .logs 2014-09-02 14:03:31 +01:00
Henry Oswald
137cffabec added some console.logs in 2014-09-02 13:54:09 +01:00
Henry Oswald
7fc0388003 fixed case sensitivity 2014-09-02 13:19:59 +01:00
Henry Oswald
75e570c076 fix ab cookies and send 0 event when clicking monthly free trial button on plans page 2014-09-02 11:07:21 +01:00
Henry Oswald
f25dba10ea changed label to send to GA 2014-09-02 10:47:58 +01:00
Henry Oswald
326900c467 broke project-list file down into more digestable chunks 2014-09-01 18:05:51 +01:00
Henry Oswald
54b9cdc3e4 new ab framework up and running 2014-09-01 17:48:09 +01:00
Henry Oswald
62f207c368 added basic new a/b test funnely framework 2014-09-01 15:14:08 +01:00
Henry Oswald
f3c04feda7 added a missing templates button back into templates index page 2014-09-01 15:13:37 +01:00
Henry Oswald
66e0785e59 fixed word wrapping on plans button page 2014-08-29 15:34:46 +01:00
Henry Oswald
e740e4913d if user is already annual tell them so on the annual upgrade page 2014-08-29 14:13:05 +01:00
Henry Oswald
b951ab798c set flag incorrectly when debugging 2014-08-29 12:37:00 +01:00
Henry Oswald
e67d3889f9 got better logic and copy for upgrade annual plans, needs i18n next 2014-08-29 12:36:36 +01:00
Henry Oswald
350b95a0a5 annual upgrade page works, needs a bit of copy love now 2014-08-28 18:14:31 +01:00
Henry Oswald
78d94094b4 changed moment path in libs to work locally 2014-08-27 13:22:17 +01:00
Henry Oswald
d0d08824da modal asking users to confirm a change of plan 2014-08-27 13:21:39 +01:00
Henry Oswald
15e14d5bda changed padding of perk to ork well in czech 2014-08-24 17:26:20 +01:00
Henry Oswald
3bd4e26956 added czech flag 2014-08-22 15:49:11 +01:00
James Allen
894024ba29 Don't allow folders to be moved into their child folders 2014-08-22 14:38:52 +01:00
James Allen
c4b91de8e8 Layout templates in rows of four 2014-08-20 14:58:01 +01:00
James Allen
ab6cd36f27 Small tweaks to LaTeX mode 2014-08-20 10:02:38 +01:00
Daniel Felder
1d9e3f431c Latex mode for ace has new syntax highlighting
This is an update to the latest version.
2014-08-19 22:33:09 +02:00
James Allen
02ec2bc264 Align flags on left of menu to match flag in footer 2014-08-14 16:41:48 +01:00
James Allen
ac4b3663cb CSS tweaks to i18n stuff 2014-08-14 16:33:01 +01:00
Henry Oswald
aa4f748608 Merge branch 'master' into i18n 2014-08-14 15:42:54 +01:00
Henry Oswald
7c2beb5d2d added correct flags 2014-08-14 13:00:04 +01:00
Henry Oswald
02cdfb4d09 lng dropdown at bottom in footer works nicely, needs few style tweeks 2014-08-13 23:06:15 +01:00
James Allen
670e8e5cb9 Use Dropbox Real-time polling 2014-08-13 17:26:18 +01:00
Henry Oswald
d033238efc forgot to commit files 2014-08-13 16:04:23 +01:00
Henry Oswald
9b2ce4860a changed cookie lib from default angular to custom one so can set expires 2014-08-13 15:02:45 +01:00
Henry Oswald
041e85b92b added local cooked option to hide notification 2014-08-13 14:14:31 +01:00
Henry Oswald
2222b32321 added message at top of page offering redirect to local lng 2014-08-13 12:31:14 +01:00
James Allen
6bfefea5cb Show PDF button in toolbar if file tree is closed in PDF flat view 2014-08-12 13:18:22 +01:00
James Allen
93f2969be5 Change style on file rename input to avoid weird Chrome behaviour 2014-08-12 12:46:05 +01:00
James Allen
f902cfdcf6 Monkey patch ace until cursor patches come from upstream 2014-08-12 12:33:12 +01:00
James Allen
3348249dcd Download template PDF and zip file with good file names 2014-08-12 12:02:09 +01:00
James Allen
7e24972b46 Fix off by one error in track changes highlights 2014-08-08 14:01:30 +01:00
James Allen
10021986c5 Don't error on password reset if no email found, and translate error messages 2014-08-08 11:41:54 +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
James Allen
d0e51fb637 Fix context menu in firefox on windows 2014-08-06 15:49:40 +01:00
Henry Oswald
687b3f2888 removed external libs for i18n which we no longer need 2014-08-04 12:18:45 +01:00
Henry Oswald
9b8d77cb0f removed client side i18n as we don't really need it #wasteoftime 2014-08-01 14:49: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
James Allen
e6c04bbeeb Clear message from chat box immediately on pressing enter 2014-07-31 13:04:55 +01:00
James Allen
330d4f5a16 Redirect to cloned project after copy 2014-07-31 13:04:55 +01:00
James Allen
f886f19429 Keep root doc list in sync with file tree updates 2014-07-31 13:04:55 +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
James Allen
eb483e0ecf Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-07-30 15:45:17 +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
4160101570 moved got link status outside of the if so if they are not registered we can start the link process 2014-07-30 10:44:46 +01:00
James Allen
87aa860c87 Update about page css 2014-07-29 12:29:00 +01:00
James Allen
627f9e47c6 Bring back Prof. Lion 2014-07-29 11:25:34 +01:00
James Allen
714266b16e Fix infinite scroll 2014-07-28 17:28:52 +01:00
James Allen
fc7753d49d Add in download PDF button 2014-07-28 17:24:43 +01:00
James Allen
6d9072f0e2 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-07-28 17:16:08 +01:00
James Allen
9f26214142 Fix double context menu in FF 2014-07-28 17:11:15 +01:00
Henry Oswald
c5b72f5f8b added font weight 300 into the open sans for home page 2014-07-28 17:03:54 +01:00
Henry Oswald
e8be248b29 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-07-28 16:52:40 +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
9db2fc93a4 Add spell check underline to front marker layer 2014-07-28 16:28:01 +01:00
James Allen
d1e0849c5e Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-07-28 16:24:28 +01:00
James Allen
3a3933dfe9 Don't immediately close context menu in Firefox 2014-07-28 16:23:46 +01:00
Henry Oswald
0db45733c5 added -moz-osx-font-smoothing to the stylesheet which improves font rendering in firefox 2014-07-28 16:10:30 +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
2c7623d3a7 added the other font sizes we use into the font import, not magic fix 2014-07-28 14:57:06 +01:00
Henry Oswald
0fb1152010 added templates less file in, got lost somewhere 2014-07-28 12:54:55 +01:00
James Allen
24f140ed8b Merge branch 'master' into master-redesign
Conflicts:
	public/js/ace/mode/latex.js
2014-07-28 10:40:35 +01:00
James Allen
06eb952994 Resize project list correctly on page load 2014-07-28 10:28:48 +01:00
James Allen
bb55d8f406 Reset undo state when switching documents 2014-07-25 21:10:50 +01:00
James Allen
d3fd161c25 Clear annotations 2014-07-25 16:54:49 +01:00
James Allen
7ad9849db0 Use cards for long form features 2014-07-25 14:33:46 +01:00
James Allen
89fa55c361 Don't use background on long form stuff 2014-07-25 14:27:17 +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
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
bf56e083cf removed a load of console.logs 2014-07-25 13:14:19 +01:00
Henry Oswald
4d0f35e6be remove unneed js 2014-07-25 13:12:04 +01:00
Henry Oswald
d0c050af37 added in missing home page pattern 2014-07-25 12:52:38 +01:00
James Allen
b4162511f7 Simplify feature cards 2014-07-25 12:49:23 +01:00
James Allen
9aa8682082 Add group plan enquiry form 2014-07-25 12:32:26 +01:00
James Allen
e5df7597c5 Remove unnecessary padding 2014-07-24 17:40:08 +01:00
James Allen
74297297c2 Experiment with animated homepage 2014-07-24 17:38:18 +01:00
James Allen
4809c5ceee Track events that were done in analytics manager 2014-07-24 16:51:04 +01:00
James Allen
6e6b20d3af Add in renamed or deleted modal 2014-07-24 16:39:32 +01:00
James Allen
fb98509789 Report client side errors to server 2014-07-24 16:07:43 +01:00
James Allen
4abf6ed38c Show message and auto refresh on force disconnect 2014-07-24 15:59:24 +01:00
James Allen
8146a09b42 Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign 2014-07-24 15:02:31 +01:00
James Allen
27784ed848 Add retina screenshot 2014-07-24 15:02:23 +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
James Allen
5c18f4fe02 Sexy project list resizing 2014-07-24 14:02:14 +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
Henry Oswald
9ec2c32605 added text-rendering: optimizelegibility; to css 2014-07-24 13:48:10 +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
James Allen
fbd36d8b07 Sort of style of admin panel and trim functionality 2014-07-24 11:22:22 +01:00
James Allen
22576945c3 Fix dropshadow on image 2014-07-24 10:47:09 +01:00
James Allen
dd27384587 Remove uneeded 700 weight 2014-07-23 17:33:14 +01:00
James Allen
824881d26e Update fonts to explicitly use web fonts for consistency 2014-07-23 17:30:40 +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
9c2cca1372 Added the old backspace highjack back in.
It uses jquery and works well. There may be an angular way todo this
but the jquery way seemed cleanest to me.
2014-07-23 14:40:01 +01:00
Henry Oswald
f0f997ed6c changed kr to the way nonconflict will be in the future 2014-07-23 14:28:39 +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
83b94f987c cleaned up few small things with templates 2014-07-23 12:16:31 +01:00
James Allen
50748069f8 Don't just use webkit retina detection: 2014-07-23 12:09:11 +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
James Allen
134ea6f3df Add retina logo 2014-07-23 12:03:13 +01:00
Henry Oswald
35342849b8 make h1 in search results red link 2014-07-23 11:36:36 +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
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
532ec5e756 Make project list look better on a smaller screen 2014-07-23 11:08:55 +01:00
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
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
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