Commit Graph

  • 0a65a5eabf Set and get ranges along with lines James Allen 2016-12-05 14:21:49 +00:00
  • ca96d168dd Make attributes that can be set in mongo flexible James Allen 2016-12-02 15:22:08 +00:00
  • 144bae3a55 Add an error guard around the version being present James Allen 2016-12-02 15:17:38 +00:00
  • 776ff2960d Add updateUserDetailsOnLogin options to ldap and saml. Shane Kilkelly 2016-12-02 15:12:57 +00:00
  • 06c9ebdd72 Add updateUserDetailsOnLogin options to ldap and saml. Shane Kilkelly 2016-12-02 15:12:57 +00:00
  • ab527c3c5d remove code left over from migration James Allen 2016-12-02 15:02:54 +00:00
  • 54afc10461 Add a dummy rollback, clean up. Shane Kilkelly 2016-12-02 14:12:52 +00:00
  • afcd6b9f53 Add a dummy rollback, clean up. Shane Kilkelly 2016-12-02 14:12:52 +00:00
  • 45d86c3a43 Merge branch 'master' into sk-user-features Shane Kilkelly 2016-12-02 14:01:46 +00:00
  • e2570a06d2 Merge branch 'master' into sk-user-features Shane Kilkelly 2016-12-02 14:01:46 +00:00
  • 42d48b7187 Add an update_user_features migration. Shane Kilkelly 2016-12-02 14:01:19 +00:00
  • cc878e4caf Add an update_user_features migration. Shane Kilkelly 2016-12-02 14:01:19 +00:00
  • 3ea2e07993 Add tests for fetching and flushing track changes entries to persistence layer James Allen 2016-12-02 12:01:23 +00:00
  • 418405e8b9 Return track changes entries in HTTP request James Allen 2016-12-02 11:37:27 +00:00
  • 4fadd75ef3 Track changes based on flag on op, not global setting James Allen 2016-12-02 11:04:21 +00:00
  • f43355b74d Fix UpdateManager tests James Allen 2016-12-01 18:19:47 +00:00
  • ce93a76e7f Fix ShareJsUpdateManager tests James Allen 2016-12-01 18:11:03 +00:00
  • e7ff05e792 Fix UpdateManager tests James Allen 2016-12-01 18:06:33 +00:00
  • 889f5fdf9f Fix ShareJsDB tests James Allen 2016-12-01 17:14:40 +00:00
  • b6c93c718d Update TrackChangesManagerTests -> HistoryManagerTests James Allen 2016-12-01 16:50:55 +00:00
  • d878dd5758 Fix RedisManagerTests James Allen 2016-12-01 16:49:53 +00:00
  • 9ee913be39 Update PersistenceManagerTests James Allen 2016-12-01 16:40:15 +00:00
  • fb39e37fe0 Update DocumentManager tests James Allen 2016-12-01 16:27:40 +00:00
  • d36f1a86f1 Merge branch 'master' into ja-track-changes James Allen 2016-12-01 16:06:13 +00:00
  • d518b93902 Merge pull request #12 from sharelatex/ja-no-mongo James Allen 2016-12-01 14:48:52 +00:00
  • 3da4c104c2 Merge pull request #380 from sharelatex/ja-set-version-in-docstore James Allen 2016-12-01 09:59:12 +00:00
  • 48cc5a992f Merge branch 'master' into ja-set-version-in-docstore James Allen 2016-12-01 09:30:53 +00:00
  • e03d16e0cd Deleting user: if subscription is already cancelled, ignore and proceed. Shane Kilkelly 2016-11-30 16:03:18 +00:00
  • dcc9a5de32 Merge pull request #382 from sharelatex/sk-spellcheck-underline-retina James Allen 2016-11-30 15:51:34 +00:00
  • 34276520d8 Merge pull request #379 from sharelatex/sk-show-user-email James Allen 2016-11-30 15:49:34 +00:00
  • ddb956a647 Merge pull request #381 from sharelatex/sk-roll-sessions James Allen 2016-11-30 15:48:53 +00:00
  • e156d8017c Be explicit in version filter James Allen 2016-11-30 15:29:43 +00:00
  • 9b0cef808a Merge pull request #12 from sharelatex/ja-set-version-in-docstore James Allen 2016-11-30 15:27:59 +00:00
  • 8b95a04a36 Don't look up version in mongo if not needed James Allen 2016-11-30 15:08:56 +00:00
  • e081409b09 Update to modern images Shane Kilkelly 2016-11-30 14:34:50 +00:00
  • 0677bcb110 Merge pull request #11 from sharelatex/ja-set-version-in-docstore James Allen 2016-11-30 14:28:11 +00:00
  • ef115e2f91 add a 2x version of the spellcheck-underline image. Shane Kilkelly 2016-11-30 11:25:47 +00:00
  • d38890e9f4 Add the rolling option to session Shane Kilkelly 2016-11-30 09:41:58 +00:00
  • 7ede096903 Merge branch 'master' into ja-set-version-in-docstore James Allen 2016-11-29 17:24:53 +00:00
  • eb648b9bc8 Proxy version number to and from docstore James Allen 2016-11-29 17:16:56 +00:00
  • efab68e6b2 Add in guards on bad data from web API James Allen 2016-11-29 17:13:16 +00:00
  • 546d9e9cee Remove left over test James Allen 2016-11-29 17:13:07 +00:00
  • 73e0a63689 Basic mark-up and styles. Change the controller to hold all notifications. Paulo Reis 2016-11-29 17:12:53 +00:00
  • 2852043a6d Don't store doc version in Mongo directly, instead use docstore James Allen 2016-11-29 17:06:23 +00:00
  • 50f2983912 Log out version when updating doc James Allen 2016-11-29 16:49:35 +00:00
  • cf94429e05 Add a user_email option to the nav "Account" dropdown. Shane Kilkelly 2016-11-29 16:04:20 +00:00
  • 77b1d0ea21 Fix up package versions James Allen 2016-11-29 15:29:22 +00:00
  • f7ba0946be More acceptance test fixes James Allen 2016-11-29 15:09:11 +00:00
  • 2df5c08389 Update acceptance tests to use redis-sharelatex James Allen 2016-11-29 15:05:02 +00:00
  • db8b4bf991 Update acceptance test script James Allen 2016-11-29 14:57:05 +00:00
  • 10008fa9c4 Don't add colours in automated test script James Allen 2016-11-29 14:41:12 +00:00
  • 68ddf04fe8 to string record event check Henry Oswald 2016-11-28 19:19:00 +00:00
  • 6e9458e9e1 wip Henry Oswald 2016-11-29 14:38:25 +00:00
  • 7204c08fb2 Rebuild npm modules as part of acceptance test docker run James Allen 2016-11-29 14:29:51 +00:00
  • aacdb1e96b to string record event check Henry Oswald 2016-11-28 19:19:00 +00:00
  • f7ba554658 set up acceptance tests to run via docker James Allen 2016-11-28 16:51:43 +00:00
  • eb9a3b314a Set/get version in docOps via docstore HTTP API James Allen 2016-11-28 14:55:16 +00:00
  • a03ac8fe72 More robust session destruction after deleting user account. Shane Kilkelly 2016-11-28 12:37:53 +00:00
  • 853dad95f3 After account delete, bounce to login after 1-second delay Shane Kilkelly 2016-11-28 12:01:32 +00:00
  • d15659ed85 check user is present before accessing email Shane Kilkelly 2016-11-28 12:01:11 +00:00
  • e739e86c48 Get basic ChangeTracker hooked up. WIP James Allen 2016-11-28 10:14:42 +00:00
  • 52462d7020 Merge branch 'sk-sync-details-from-sso' Shane Kilkelly 2016-11-28 10:11:59 +00:00
  • 395135a655 Merge branch 'sk-post-login-redirect' Shane Kilkelly 2016-11-28 09:52:14 +00:00
  • acce8853ba Remove redundant baseUrl from plans page. Shane Kilkelly 2016-11-25 15:24:50 +00:00
  • 2ab5ad4230 If we're updating details from a SSO source, don't allow editing on settings page. Shane Kilkelly 2016-11-25 14:38:00 +00:00
  • 4b59fdd453 added missing settings file to announcments controller Henry Oswald 2016-11-25 11:59:29 +00:00
  • f130470971 log ip address of user when logging in Henry Oswald 2016-11-25 11:27:57 +00:00
  • 65c1a62cb7 Add in null check for user when getting hue in chat James Allen 2016-11-25 11:08:32 +00:00
  • e56c4b189a remove a bit of logging which is filling disk up Henry Oswald 2016-11-24 18:54:32 +00:00
  • 04c151eed0 Only bind to Ace if track changes is enabled James Allen 2016-11-24 16:56:50 +00:00
  • ecd81738cb Restyle toggle. Paulo Reis 2016-11-24 15:55:09 +00:00
  • 167f01857a Remove stray next params. Shane Kilkelly 2016-11-24 14:15:01 +00:00
  • 4cc4a4e264 Merge branch 'master' into sk-post-login-redirect Shane Kilkelly 2016-11-24 14:02:38 +00:00
  • 22101d0305 If user is sent to login page with explicit redirect, obey Shane Kilkelly 2016-11-24 11:38:13 +00:00
  • bf5aa5e253 Fix review panel toolbar in flex contexts. Paulo Reis 2016-11-23 17:04:55 +00:00
  • 1148b00c9a Add review header item. Paulo Reis 2016-11-23 16:53:13 +00:00
  • 8d933d9b5f Toggler style adjustments. Paulo Reis 2016-11-23 16:10:35 +00:00
  • 3a8becbe21 change how grunt splits tasks up which fix broken migrate call Henry Oswald 2016-11-23 15:32:44 +00:00
  • b1a3be4510 change how grunt splits tasks up which fix broken migrate call Henry Oswald 2016-11-23 15:32:44 +00:00
  • f61aac0bb3 Make toggler label clickable. Paulo Reis 2016-11-23 14:44:04 +00:00
  • e655e85e6d Integrate toggler in review panel. Paulo Reis 2016-11-23 14:34:55 +00:00
  • aba6c90524 Add styling for toggler. Paulo Reis 2016-11-23 14:34:40 +00:00
  • ed20f8533f Add toggler directive. Paulo Reis 2016-11-23 14:34:21 +00:00
  • 8922421443 Add options for saml firstName and lastName fields. Shane Kilkelly 2016-11-23 14:13:37 +00:00
  • 8a8ac600d1 Add options for saml firstName and lastName fields. Shane Kilkelly 2016-11-23 14:13:37 +00:00
  • ba5118d02a Merge branch 'master' into ja-review-panel Paulo Reis 2016-11-23 10:41:20 +00:00
  • 5c40640d06 Add saml emailFieldName option Shane Kilkelly 2016-11-23 10:37:35 +00:00
  • 4de0d35384 Add saml emailFieldName option Shane Kilkelly 2016-11-23 10:37:35 +00:00
  • ff0a5395e5 Merge pull request #374 from sharelatex/pr-wrap-ab-test-header Paulo Jorge Reis 2016-11-23 09:49:53 +00:00
  • cee3326ce3 fix omission of 'length' Shane Kilkelly 2016-11-22 17:06:05 +00:00
  • f9b1862ddb Merge branch 'master' into sk-post-login-redirect Shane Kilkelly 2016-11-22 16:54:12 +00:00
  • 8a4352fff2 Set redirect when redirecting from restricted Shane Kilkelly 2016-11-22 16:54:03 +00:00
  • 2edd75de96 Allow the 500/Error page to render, even if res.locals aren't set up yet. Shane Kilkelly 2016-11-22 16:48:13 +00:00
  • 33f6c0dd1b Jump to position based on offset since we don't know doc lines for unopen docs James Allen 2016-11-22 16:34:39 +00:00
  • 8089bb55a4 use session for the post-login redirect, remove redir query string. Shane Kilkelly 2016-11-22 14:24:36 +00:00
  • 0bc52412ea Hide header labels in XS resolutions (i.e. up to 768px). Paulo Reis 2016-11-22 10:59:20 +00:00
  • fab7ec3e98 Remove test-related tracking and analytics code. Paulo Reis 2016-11-22 10:50:29 +00:00
  • dce272462a Remove test-related mark-up. Paulo Reis 2016-11-22 10:39:56 +00:00
  • decaaab7ea Fix CSS property typo. Paulo Reis 2016-11-22 10:36:13 +00:00
  • 9396b62bdb Merge pull request #493 from hyperdo/patch-1 Henry Oswald 2016-11-22 09:34:45 +00:00