Commit Graph

640 Commits

Author SHA1 Message Date
Brian Gough 33d94af930 Merge branch 'master' into pdfng 2014-11-26 14:17:02 +00:00
Brian Gough 643bda6095 add pdfng module and use it by default 2014-11-25 16:49:09 +00:00
Brian Gough 81b8594944 upgrade pdf.js to v1.0.712 2014-11-25 15:58:01 +00:00
Henry Oswald ba784c3e62 changed swiss franks to show Fr for display issues 2014-11-25 13:18:57 +00:00
Henry Oswald d070c0acd8 fixed SGD collab price 2014-11-25 13:14:38 +00:00
Henry Oswald dd37436da2 delete old cookie keys 2014-11-25 11:35:46 +00:00
Henry Oswald 02ef07dca4 broken free trial func into own file. added ab test on upgrade button colour 2014-11-24 23:59:55 +00:00
Henry Oswald 6c0f03e9c7 added ab test to show collar plan to people in editor 2014-11-24 16:21:03 +00:00
Henry Oswald 6d22bda88f added new currencies removed ab test as well 2014-11-21 13:13:53 +00:00
Henry Oswald 458e4335de added a load more currencies 2014-11-19 21:34:13 +00:00
Henry Oswald dbb1d68b66 added SEK and CAD currencies 2014-11-19 14:52:59 +00:00
Henry Oswald bb5ec10609 don't try and get angular min map file 2014-11-17 14:55:48 +00:00
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