Commit Graph

  • 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
  • 7258fadd17 Improve styling of plan name and price on subscription form James Allen 2014-10-08 16:52:37 +01:00
  • 834e27f3c5 Fix indentation in italics shortcut Mick O'Brien 2014-10-08 16:34:44 +01:00
  • 696e8d24e1 Fix z index of more updates buttons James Allen 2014-10-08 16:32:42 +01:00
  • b7db72e574 Replace $isEmpty check Mick O'Brien 2014-10-08 16:17:38 +01:00
  • c2c29bb282 university site renders via prozy ok Henry Oswald 2014-10-08 16:07:44 +01:00
  • 8f7dff1518 Don't show empty sync menu list for collaborators James Allen 2014-10-08 15:57:56 +01:00
  • 72fc630e81 Added keyboard shortcuts to bold and italicise text Mick O'Brien 2014-10-08 15:44:01 +01:00
  • 3a9d8c2b31 Make Dropbox unlinking consistent with github James Allen 2014-10-08 14:02:37 +01:00
  • 82dc3cf654 Don't reload module views each request by default James Allen 2014-10-08 12:39:36 +01:00
  • b62fb3960c Fix javascript compiling when there are no modules James Allen 2014-10-08 12:22:04 +01:00
  • 128c672edd Merge branch 'github-sync' James Allen 2014-10-08 12:13:37 +01:00
  • e406034ad6 Add in Dropbox description James Allen 2014-10-07 14:42:03 +01:00
  • dbd85a05f1 Send user features and features switches to views where needed James Allen 2014-10-07 13:31:13 +01:00
  • c137e05bfd fixed acceptence tests Henry Oswald 2014-10-07 12:31:16 +01:00
  • 5ff8983528 implemeneted redis-sharelatex Henry Oswald 2014-10-07 12:08:36 +01:00
  • 8789a4bde1 server rejects rename of entitys over 150 chars Henry Oswald 2014-10-07 11:16:26 +01:00
  • b01b05e49b server rejects project names over 150 chars Henry Oswald 2014-10-07 11:14:02 +01:00
  • 28b1e6bfe5 added client side checks on how long project or entity names can be Henry Oswald 2014-10-07 11:06:37 +01:00
  • b7c77c959b Merge branch 'master' of https://github.com/sharelatex/track-changes-sharelatex Henry Oswald 2014-10-07 08:35:28 +01:00
  • 3328acc82b bump sharelatex-redis Henry Oswald 2014-10-07 08:33:00 +01:00
  • 6c7c09075c Treat paths properly in project content update methods James Allen 2014-10-03 11:33:18 +01:00
  • 10732d112d Hook module system into project list page James Allen 2014-10-03 11:32:59 +01:00
  • b05c6bb001 fixed hiding lang popup in firefox Henry Oswald 2014-10-02 17:27:02 +01:00
  • 13a96c925b Add in endpoints to allow updating project files when the project id is know James Allen 2014-10-02 14:15:30 +01:00
  • 3442786930 fixed template error Henry Oswald 2014-09-30 21:52:00 +01:00
  • de6135c777 added missing translations Henry Oswald 2014-09-30 11:41:47 +01:00
  • 9faf4771e7 added ab test controller so it is always loaded Henry Oswald 2014-09-29 17:33:54 +01:00
  • affee1ffe6 changed redis-sharelatex to use 0.0.4 and update minor versions Henry Oswald 2014-09-29 16:58:22 +01:00
  • b74e9b02f0 Bump version to 0.1.1 James Allen 2014-09-29 16:05:44 +01:00
  • e35a32d7d7 take minor versions of redis-sharelatex Henry Oswald 2014-09-29 12:48:26 +01:00
  • 9c85e9b848 moved back to not include sentinal while we upgrade to 0.10.x node Henry Oswald 2014-09-29 12:07:32 +01:00
  • 4fd5191528 bump package Henry Oswald 2014-09-29 12:02:38 +01:00
  • c63f3c9da9 added readme Henry Oswald 2014-09-29 12:00:03 +01:00
  • 2375dbb851 run succesful login before each smoke test to avoid any rate limit issues Henry Oswald 2014-09-29 11:45:34 +01:00
  • 7f2df4bbd3 renamed rate limiter tests Henry Oswald 2014-09-29 11:42:46 +01:00
  • 49e7777b6d bumped redis-sharelatex Henry Oswald 2014-09-29 11:42:28 +01:00
  • fd6c2b5616 bump redis-sharelatex Henry Oswald 2014-09-29 11:41:26 +01:00
  • 66bba0dec9 bump redis-sharelatex Henry Oswald 2014-09-29 11:41:09 +01:00
  • 8f31ac60ca if password is passed rename it to auth_pass Henry Oswald 2014-09-29 11:40:40 +01:00