Commit Graph

  • 7bf55823b2 Hide review panel when there are no entries. Paulo Reis 2016-11-15 15:04:29 +00:00
  • a822cc0c92 don't log events from health check user Henry Oswald 2016-11-15 13:41:15 +00:00
  • d0f451df2e Improve hover behaviour on review entries. Paulo Reis 2016-11-15 12:23:39 +00:00
  • b9001f19e6 use indexOf not matches for searching for project by name Henry Oswald 2016-11-15 11:41:14 +00:00
  • 6776aa61f1 use new way to send status in express for healthcheck controlller Henry Oswald 2016-11-15 11:04:13 +00:00
  • 411b5324df don't try and send requests when analytics isn't enabled Henry Oswald 2016-11-15 10:54:48 +00:00
  • d87067bc2f Merge branch 'announcments' Henry Oswald 2016-11-15 10:38:01 +00:00
  • 6ddfbe9125 Update settings.defaults.coffee Henry Oswald 2016-11-15 10:36:11 +00:00
  • 15564102a0 Update ProjectController.coffee Henry Oswald 2016-11-15 10:34:57 +00:00
  • b181115277 Basic review minimized state. Paulo Reis 2016-11-15 10:34:39 +00:00
  • 0c600ba9b8 Support overflowing panes in UI layout. Paulo Reis 2016-11-15 10:34:19 +00:00
  • 248d3c5128 Update README.md Henry Oswald 2016-11-15 10:29:06 +00:00
  • 6f98918910 Update README.md Henry Oswald 2016-11-15 10:29:06 +00:00
  • 3dab268e51 Update docker-compose.yml Henry Oswald 2016-11-15 10:27:21 +00:00
  • fc868f0025 Update docker-compose.yml Henry Oswald 2016-11-15 10:27:21 +00:00
  • fabf9c23cf Update ISSUE_TEMPLATE Henry Oswald 2016-11-15 10:19:58 +00:00
  • d94b622a8e Update ISSUE_TEMPLATE Henry Oswald 2016-11-15 10:19:58 +00:00
  • e4a57a84a5 Create ISSUE_TEMPLATE Henry Oswald 2016-11-15 10:19:20 +00:00
  • 5d69513fe8 Create ISSUE_TEMPLATE Henry Oswald 2016-11-15 10:19:20 +00:00
  • b212c00311 Fix acceptance tests, use the correct method of getting redis key. Shane Kilkelly 2016-11-14 16:33:54 +00:00
  • b67a65ff6a Merge branch 'master' into sk-passport-saml Shane Kilkelly 2016-11-14 16:11:24 +00:00
  • 4aadcb4b91 Refactor. Shane Kilkelly 2016-11-14 15:46:12 +00:00
  • 1c3f845143 Refactor. Shane Kilkelly 2016-11-14 15:46:12 +00:00
  • dc89ae1f97 Merge branch 'master' of github.com:sharelatex/sharelatex-docker-image Shane Kilkelly 2016-11-14 15:40:27 +00:00
  • 53eaaebcfb Merge branch 'master' of github.com:sharelatex/sharelatex-docker-image Shane Kilkelly 2016-11-14 15:40:27 +00:00
  • 3f5a41e302 Add saml config options Shane Kilkelly 2016-11-14 15:40:18 +00:00
  • 2042575b86 Add saml config options Shane Kilkelly 2016-11-14 15:40:18 +00:00
  • 6c381b127c Count saml as an external authentication system. Shane Kilkelly 2016-11-14 13:33:48 +00:00
  • c89579e1df Focus on the focused change James Allen 2016-11-14 12:47:46 +00:00
  • d447ebe304 Add timeout around reply layout render James Allen 2016-11-14 11:47:36 +00:00
  • 7201bde2a3 Add comment UI. Paulo Reis 2016-11-14 11:19:00 +00:00
  • e397b76fba commended out jade so can go live with rest of code quietly Henry Oswald 2016-11-14 10:54:36 +00:00
  • 803209e668 update shrinkwrap Shane Kilkelly 2016-11-14 10:52:46 +00:00
  • 47ed17aab3 remove unneeded package and comma in jade Henry Oswald 2016-11-14 10:48:06 +00:00
  • d32a7d0a94 Only apply doc changes, not fold changes in undo manager James Allen 2016-11-14 09:44:59 +00:00
  • 666bfdf967 stop the /announcements call at controller level Henry Oswald 2016-11-11 17:15:36 +00:00
  • 5a13ee1077 use anlaytis api Henry Oswald 2016-11-11 17:03:01 +00:00
  • 747e14dffe Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel James Allen 2016-11-11 16:16:10 +00:00
  • 3694754ca6 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel Paulo Reis 2016-11-11 16:10:44 +00:00
  • d04d7f834e Adjustments in the threaded comments, mocked comments responses. Paulo Reis 2016-11-11 16:10:26 +00:00
  • 9509e87dc1 Update entries in place and position via DOM attributes directly James Allen 2016-11-11 16:09:32 +00:00
  • 2cf2199964 WIP: enable non-csrf routes from modules Shane Kilkelly 2016-11-11 13:48:29 +00:00
  • 36b950ea30 Use evalAsync instead of timeout James Allen 2016-11-11 13:35:16 +00:00
  • 6c5c1549b6 Add comment replies via enter keypress. Paulo Reis 2016-11-11 10:51:32 +00:00
  • 8726a8fb4d Add passport-saml dependency Shane Kilkelly 2016-11-11 09:09:00 +00:00
  • 78e409593b Threaded comments. Paulo Reis 2016-11-10 17:19:41 +00:00
  • 8dcbb6ea4f Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel Paulo Reis 2016-11-10 15:09:56 +00:00
  • c5e6ca5200 More entry styling. Paulo Reis 2016-11-10 15:08:41 +00:00
  • c43c44e052 Merge pull request #370 from sharelatex/sk-sessions-cluster James Allen 2016-11-10 14:49:13 +00:00
  • 593e59450b Use different UserSessions keys for cluster vs normal redis session store James Allen 2016-11-10 14:31:48 +00:00
  • 997addf355 More entry header styling + entry body. Paulo Reis 2016-11-10 12:35:35 +00:00
  • e69b6da684 Stop deletes overlapping comments (but leads to occasional flickering) James Allen 2016-11-10 12:01:42 +00:00
  • 938a8c4894 Fix logic around not tracking rejections to changes James Allen 2016-11-10 10:58:55 +00:00
  • 4e2dd55cfd Fix merge issues James Allen 2016-11-10 10:53:30 +00:00
  • 812ee82af1 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel James Allen 2016-11-10 10:52:40 +00:00
  • 34b2b665a3 Accept and reject changes James Allen 2016-11-10 10:52:09 +00:00
  • 950fc0179c Basic support for action icons. Paulo Reis 2016-11-10 10:19:52 +00:00
  • ca178c1a85 Fix indentation James Allen 2016-11-09 17:12:01 +00:00
  • f62d95dd8c Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel James Allen 2016-11-09 17:11:02 +00:00
  • 2e719fc450 Start adding callouts in review panel James Allen 2016-11-09 17:10:58 +00:00
  • 013df17192 Entry header layout. Paulo Reis 2016-11-09 17:09:57 +00:00
  • f28119aacb Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel Paulo Reis 2016-11-09 16:36:12 +00:00
  • 341a092231 Merge + basic layout for entries. Paulo Reis 2016-11-09 16:36:06 +00:00
  • 184b421b1f Show user name in comments James Allen 2016-11-09 16:34:23 +00:00
  • b44f1cde10 Add user data into changes James Allen 2016-11-09 16:23:08 +00:00
  • e0fbb45844 Add colored borders. Paulo Reis 2016-11-09 16:00:02 +00:00
  • 19241e571f Distinguish between inserts and deletes in the entries repeater. Paulo Reis 2016-11-09 15:58:03 +00:00
  • c5532bd8a3 Add cancel buttons for comments James Allen 2016-11-09 15:51:40 +00:00
  • 1622269d1b Relayout review panel as needed James Allen 2016-11-09 15:46:47 +00:00
  • 74ddd33bd9 Add colors to LESS file. Paulo Reis 2016-11-09 15:39:01 +00:00
  • 6d7f4e9e6a Add basic comment replying James Allen 2016-11-09 15:25:41 +00:00
  • 707ed43a7d Very crude adding of comments James Allen 2016-11-09 14:50:58 +00:00
  • c3860dd7a7 Remove stray commented-out code, use mapSeries instead of map. Shane Kilkelly 2016-11-09 14:36:25 +00:00
  • 446ca7212a Track timestamps of changes James Allen 2016-11-09 12:19:48 +00:00
  • f6de4cbb44 Merge branch 'master' into sk-sessions-cluster Shane Kilkelly 2016-11-09 12:10:46 +00:00
  • de18231ef1 clarify purpose of redis client Shane Kilkelly 2016-11-09 12:09:15 +00:00
  • 41868ddda3 Make real-time work with web sessions in redis-cluster Shane Kilkelly 2016-11-09 12:06:32 +00:00
  • 5f3098df38 Replace multi-ops with Async.series, tests passing Shane Kilkelly 2016-11-09 11:03:03 +00:00
  • 2a6ef976f3 added default features Henry Oswald 2016-11-08 22:37:31 +00:00
  • 494839591a added default features Henry Oswald 2016-11-08 22:37:31 +00:00
  • cd494f7866 Update ChangesTracker to handle delete edge case James Allen 2016-11-08 17:57:23 +00:00
  • f68c615f61 Remove markers correctly James Allen 2016-11-08 17:47:54 +00:00
  • 084838926d Add in dashed line callouts for changes and comments James Allen 2016-11-08 17:31:08 +00:00
  • 4f8055d998 make sure line 1 changes don't hide under toolbar James Allen 2016-11-08 16:51:20 +00:00
  • 064ae1945a Toggle review panel and track changes with ui elements James Allen 2016-11-08 16:43:01 +00:00
  • a373868862 Fix unit tests Shane Kilkelly 2016-11-08 16:00:18 +00:00
  • bfa0e7cf89 WIP: start moving web sessions to cluster Shane Kilkelly 2016-11-08 15:32:36 +00:00
  • a907ec04fc Don't complain about comment markers when checking James Allen 2016-11-08 15:17:20 +00:00
  • 8c65cb5835 Track and highlight comment ranges James Allen 2016-11-08 15:12:25 +00:00
  • d556cbaacf Merge pull request #361 from djwf/master Henry Oswald 2016-11-08 11:26:42 +00:00
  • e85cb161b2 Merge branch 'sk-bug-can-invite-collaborator' Shane Kilkelly 2016-11-07 15:10:21 +00:00
  • f77ee597f4 Merge pull request #365 from sharelatex/bg-redirect-to-login-on-403 Brian Gough 2016-11-07 14:44:08 +00:00
  • 2ff211ce2c Make sure the $scope.canAddCollaborators var is initialised at least once, outside of angular $watch. Shane Kilkelly 2016-11-07 14:36:04 +00:00
  • 0b50623d51 Escape \ James Allen 2016-11-05 11:07:58 +00:00
  • 26f9ee7fd3 Escape \ James Allen 2016-11-05 11:07:07 +00:00
  • 6f41dddb42 disable spell check for anonymous users Brian Gough 2016-11-04 15:44:30 +00:00
  • f54bb9744a redirect to /login on failed requests Brian Gough 2016-11-04 15:44:12 +00:00
  • 68e4df72df check that nav.header is configured Shane Kilkelly 2016-11-04 15:14:33 +00:00
  • f1ce0b4068 check that nav.header is configured Shane Kilkelly 2016-11-04 15:14:33 +00:00
  • 307f08e6bb Merge pull request #363 from sharelatex/bg-lock-editor-when-connection-down Brian Gough 2016-11-04 11:04:30 +00:00