Commit Graph

  • 9f38a40cd2 Initial commit Winston Li 2014-11-01 16:02:22 +00:00
  • ccae47979f added chinese flags under cn Henry Oswald 2014-10-31 13:21:04 +00:00
  • 30100f2a07 fixed badly called flushProjectToThirdPartyDataStore causing issues with initial drobox sync Henry Oswald 2014-10-31 12:41:06 +00:00
  • aeb956c8a4 wiki will try and get spanish version of page then fall back to english if it is not there Henry Oswald 2014-10-31 12:15:03 +00:00
  • e0aae65050 added file ref null check Henry Oswald 2014-10-31 10:50:20 +00:00
  • 0f4d9771aa added null check to where we insert elements into a project Henry Oswald 2014-10-31 10:37:44 +00:00
  • d428e7e5b4 handle a null in the file refs list Henry Oswald 2014-10-31 10:34:18 +00:00
  • 4f590d7acb added chinese flags in Henry Oswald 2014-10-30 11:52:45 +00:00
  • 14d32af6bf allow ace to scoll off screen Henry Oswald 2014-10-30 08:33:54 +00:00
  • 56efefd6d4 renamed variable Henry Oswald 2014-10-30 08:33:18 +00:00
  • a39c356014 Update acceptance tests for new knitr, and remove markdown James Allen 2014-10-29 10:59:32 +00:00
  • 5216526191 Force mimetype of output files to be safe James Allen 2014-10-28 12:07:17 +00:00
  • ca664e0063 Get subscription status correctly for showing upgrade/bonus link James Allen 2014-10-27 15:00:46 +00:00
  • 2a69e185ce Append spell check menu to body so it isn't hidden by PDF view resizer James Allen 2014-10-27 14:51:28 +00:00
  • 184189fa3f Disable hotkeys for layout panels since they interfere with text editing James Allen 2014-10-27 14:47:06 +00:00
  • f1ddff4061 Only ignore hidden files from Dropbox, not GitHub James Allen 2014-10-27 14:39:20 +00:00
  • f4be1884d3 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex Henry Oswald 2014-10-27 11:23:50 +00:00
  • 011bdc4617 explicitly set the file types to delete Henry Oswald 2014-10-24 12:01:35 +01:00
  • 2debba6bbc Update PGP key James Allen 2014-10-24 11:53:13 +01:00
  • 0a123418ac insert ref data into uni page Henry Oswald 2014-10-23 14:13:40 +01:00
  • fab0dc5cbc change button to a Henry Oswald 2014-10-23 11:51:35 +01:00
  • b067e0d0a4 fixed email us button on templates Henry Oswald 2014-10-23 11:18:04 +01:00
  • 0f8519f619 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex Henry Oswald 2014-10-21 14:57:52 +01:00
  • d64577fb9d Update README.md James Allen 2014-10-21 14:20:53 +01:00
  • 421e2574f5 Update README.md James Allen 2014-10-21 14:20:53 +01:00
  • c60f11519f added ga logging of starting free trial again Henry Oswald 2014-10-21 14:06:53 +01:00
  • 8097e6ad71 made 7 day free trial the default Henry Oswald 2014-10-21 13:48:46 +01:00
  • 281c4eb4e3 Style tweaks for uni site James Allen 2014-10-21 13:39:47 +01:00
  • 4bd0708029 put the compile group on the session so proxied requests are sent to the correct place Henry Oswald 2014-10-21 09:34:58 +01:00
  • fb53be7ce4 Revert "priority compiles are proxyed to the priority servers" Henry Oswald 2014-10-21 09:16:23 +01:00
  • 250606472d priority compiles are proxyed to the priority servers Henry Oswald 2014-10-20 17:48:00 +01:00
  • 36136a99ca fixed escaping of html Henry Oswald 2014-10-20 15:46:42 +01:00
  • 0a7bc1c5f1 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex Henry Oswald 2014-10-20 14:25:26 +01:00
  • 9be31a2ac1 removed type: from log lines Henry Oswald 2014-10-20 14:22:31 +01:00
  • 35a90b9cbc removed type: from log lines Henry Oswald 2014-10-20 14:22:31 +01:00
  • 7ba6689ea0 add clsi2_priority to settings.defaults Henry Oswald 2014-10-20 12:21:58 +01:00
  • 3cf64ce34f pass new compile features to client side, don't show timeout upgrade for premium users Henry Oswald 2014-10-20 12:21:40 +01:00
  • fc4bc08fc2 added upgrade to get faster compiles message to timeout Henry Oswald 2014-10-17 15:57:49 +01:00
  • b9d6d5bbf1 set the request timeout to a few mins for the compile Henry Oswald 2014-10-17 13:23:29 +01:00
  • c37447a2d6 increase max compile to 4 mins Henry Oswald 2014-10-17 11:03:08 +01:00
  • ce8c6d824d Merge branch 'master' of https://github.com/sharelatex/clsi-sharelatex Henry Oswald 2014-10-17 10:22:27 +01:00
  • a698795558 up timeout to 6 mins Henry Oswald 2014-10-17 10:14:23 +01:00
  • e7906f7018 timeout option passed to clsi Henry Oswald 2014-10-16 18:43:48 +01:00
  • 7293ccf06d if user has premium compile send them to a different server set Henry Oswald 2014-10-16 17:52:21 +01:00
  • 5a4a90924b added default opts for users compile features Henry Oswald 2014-10-16 16:57:51 +01:00
  • 1506f86a5f Merge branch 'master' of https://github.com/sharelatex/web-sharelatex Henry Oswald 2014-10-16 16:34:25 +01:00
  • d97e42a959 get users features for compile options i.e. timeout and which compiler Henry Oswald 2014-10-16 16:34:21 +01:00
  • d8cc3b7b61 fixed leaky test Henry Oswald 2014-10-16 16:02:31 +01:00
  • 8fa8a64c6f Update email templates James Allen 2014-10-16 12:46:38 +01:00
  • f3a1ba93a4 Fix argument signature of mergeUpdate and deleteUpdate James Allen 2014-10-16 11:43:54 +01:00
  • 46ecaf9f6c Fix broken argument signature of addFolder James Allen 2014-10-16 11:26:57 +01:00
  • 9f1a7c7396 Send source of update to doc updater and allow external updates to be ignored in UI James Allen 2014-10-15 16:37:14 +01:00
  • 1b893ff502 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex Henry Oswald 2014-10-15 16:22:01 +01:00
  • 750b050358 added ab test in for multi currency Henry Oswald 2014-10-15 16:21:45 +01:00
  • 7e9318814d Send source of update to doc updater on setDocument request James Allen 2014-10-15 15:36:08 +01:00
  • 6800c1a15e Track the source of updates through the system on adding/updating of docs and files James Allen 2014-10-15 15:18:31 +01:00
  • 4f2ab51ebd Merge branch 'master' of github.com:sharelatex/web-sharelatex James Allen 2014-10-15 14:11:11 +01:00
  • 941f550d6c Remove all traces of soa-req-id James Allen 2014-10-15 14:11:02 +01:00
  • af769c7871 allow ip to set via query string for plans page Henry Oswald 2014-10-15 11:58:35 +01:00
  • e443809206 free trial length is show correctly at bottom of plans page Henry Oswald 2014-10-15 11:49:20 +01:00
  • fd8991f62e Sort out responsive flow James Allen 2014-10-15 10:23:08 +01:00
  • 64fe2a2404 Improve CSS and layout of feature list on new subscription page James Allen 2014-10-15 10:22:03 +01:00
  • b32375530c Refactor card css for use in new subscription page James Allen 2014-10-14 15:46:44 +01:00
  • b2b13ef9a7 pass plan to payment page to get the number of collaborators Henry Oswald 2014-10-14 12:14:24 +01:00
  • 19a08f82a6 default to USD if there is no match Henry Oswald 2014-10-14 12:14:03 +01:00
  • 4a774981cf Merge branch 'master' into multicurrency Henry Oswald 2014-10-14 11:52:03 +01:00
  • 2538d16e63 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex Henry Oswald 2014-10-14 11:50:10 +01:00
  • 3bac4dc39f increase auto compile limit Henry Oswald 2014-10-14 11:50:06 +01:00
  • 6437f74cd3 use req.ip not x-forwarded-for to get ip address for multi currency Henry Oswald 2014-10-13 17:55:18 +01:00
  • 3382c5bb17 added blurb to payment page Henry Oswald 2014-10-13 17:51:59 +01:00
  • 5a0d74753f plans page will auto redirect to best guess currency Henry Oswald 2014-10-13 17:39:44 +01:00
  • 52c54e7300 added ability to change currency on payment page Henry Oswald 2014-10-13 17:28:00 +01:00
  • 58f6ae323b fix which plan is "your plan" on dashboard Henry Oswald 2014-10-13 16:33:01 +01:00
  • 2bbdea3433 renamed change currency function and sorted out recommended currency Henry Oswald 2014-10-13 16:27:27 +01:00
  • 2bf34bba4d added currency to subscription view model Henry Oswald 2014-10-13 16:14:13 +01:00
  • f55ef2f1b4 made what is returned for multi currency more explicit Henry Oswald 2014-10-13 16:13:31 +01:00
  • 3c058edfb4 Add github feature flag to user model James Allen 2014-10-13 15:45:19 +01:00
  • 7964616f02 changing email address should lowercase the email Henry Oswald 2014-10-13 15:44:45 +01:00
  • 5edefe2498 Add in compile timeout and group feature options James Allen 2014-10-13 15:42:11 +01:00
  • cfb3969b88 Fix alignment in left menu James Allen 2014-10-13 14:45:45 +01:00
  • 36264706f6 hooked the plans page up to the geo ip lookup Henry Oswald 2014-10-13 14:10:15 +01:00
  • 3ca04e25fd add 1 second timeout to geoiplookup Henry Oswald 2014-10-13 13:15:48 +01:00
  • 2e6c2c1926 default to USD in geo ip lookup. Henry Oswald 2014-10-13 13:08:11 +01:00
  • e78e4d46b0 use first ip passed though in string for ip lookup Henry Oswald 2014-10-13 13:04:20 +01:00
  • 259871cbdd added geoip lookup feature Henry Oswald 2014-10-13 00:45:45 +01:00
  • 40c3c3e1ce added customAccount to subscription model Henry Oswald 2014-10-10 15:57:27 +01:00
  • 7b37bed2cd Merge branch 'master' of https://github.com/sharelatex/web-sharelatex Henry Oswald 2014-10-10 15:45:09 +01:00
  • b90003b11e added custom user dashboard page Henry Oswald 2014-10-10 15:44:53 +01:00
  • 3ba3a91043 if its a custom account redirect to /user/subscription/custom_account Henry Oswald 2014-10-10 15:11:22 +01:00
  • a8afe3a0d7 Improve file uploader CSS James Allen 2014-10-10 13:39:47 +01:00
  • c7a3cb87c2 added modules folder Henry Oswald 2014-10-10 09:50:53 +01:00
  • e5ab40c911 added example session invalidation code Henry Oswald 2014-10-09 18:10:01 +01:00
  • e7984a90d7 unlink dropbox when a user cancels Henry Oswald 2014-10-09 17:05:41 +01:00
  • 9924882b59 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex Henry Oswald 2014-10-09 16:45:26 +01:00
  • 9803f8bd70 changed uni page holder and footer Henry Oswald 2014-10-09 16:44:50 +01:00
  • 4743b460f5 Only show rename or deleted message once James Allen 2014-10-09 09:13:38 +01:00
  • bc94ea56cb Add projects to tag after creating the tag James Allen 2014-10-09 08:39:15 +01:00
  • 3bf7948510 Merge branch 'master' of github.com:sharelatex/web-sharelatex James Allen 2014-10-08 17:18:57 +01:00
  • accd8207b2 Show password reset expired message rather than server error if that's what has happened James Allen 2014-10-08 17:18:24 +01:00
  • 1f5d7ee6a8 Merge pull request #116 from mickaobrien/keyboard-shortcuts Henry Oswald 2014-10-08 16:56:03 +01:00