Commit Graph

6735 Commits

Author SHA1 Message Date
Paulo Reis 0478fcd925 Add comment resolution info. 2017-01-06 15:24:33 +00:00
James Allen cb24e9390a Fix comments in overview panel 2017-01-06 14:17:57 +01:00
James Allen beb94b0756 Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-06 13:42:08 +01:00
James Allen 3a5d45fa32 Get user info via web, not chat 2017-01-06 13:41:58 +01:00
Paulo Reis 42585085c0 Integrate new directive, plumb data into it. More styling. 2017-01-06 12:00:17 +00:00
Henry Oswald 0b67265eb6 use admin email for closed site 2017-01-06 11:32:57 +00:00
Paulo Reis a1435d13a3 Basic structure for the resolved comments dropdown. 2017-01-05 17:15:27 +00:00
Henry Oswald 862e15b842 log out user id and anonymous when loading editor 2017-01-05 15:02:10 +00:00
Paulo Reis d13035a4f4 Simpler UI for comments; remove some unused code. 2017-01-05 11:50:43 +00:00
James Allen 60152e219b Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-04 16:26:08 +01:00
James Allen 84d9b2aa49 Save resolve and reopened state 2017-01-04 16:26:02 +01:00
Paulo Reis fdafcf9677 Restyle insertions and deletions - increasing info density. 2017-01-04 15:24:49 +00:00
Shane Kilkelly 7bbbfe20b9 If external auth is used, remove /register items from header nav.
(logic moved from docker-image settings file)
2016-12-21 13:50:13 +00:00
Shane Kilkelly 64f69069b2 Experimental: upgrade to node 6.9.2 (latest LTS release) 2016-12-21 10:23:42 +00:00
Shane Kilkelly 259c589076 Add option to restrict invites to existing user accounts. 2016-12-20 09:54:42 +00:00
Shane Kilkelly 822f76a883 Add unit tests for RedisWrapper 2016-12-19 15:12:22 +00:00
Shane Kilkelly d428f9adbc Make LoginRateLimiter a thin wrapper around RateLimiter 2016-12-19 14:10:51 +00:00
Shane Kilkelly 03b541fb64 Fix small mistakes 2016-12-19 14:10:27 +00:00
Shane Kilkelly 9f787943b6 Remove stray redis imports. 2016-12-19 12:17:23 +00:00
Shane Kilkelly ef0a5801d5 Create a RedisWrapper, and use it for rate limiting. 2016-12-19 12:17:02 +00:00
Paulo Reis d6fcc21ab5 Add support for GMail go-to actions in the single CTA template. 2016-12-16 17:04:26 +00:00
James Allen 988005e929 Send and get comments via the chat api 2016-12-16 16:42:41 +00:00
Paulo Reis 869f729132 Fix forgotten templating function. 2016-12-16 15:15:06 +00:00
Paulo Reis ca5040882f Use the new template in the join group email. 2016-12-16 14:57:59 +00:00
Paulo Reis 0fe3664a82 Use the new template in the reset pwd email. 2016-12-16 12:16:45 +00:00
Paulo Reis 2234c438a1 Support a secondary message in the single CTA email template. 2016-12-16 12:16:33 +00:00
Paulo Reis 7dfc2c61a6 Make the CTA button text configurable. 2016-12-16 10:06:56 +00:00
Paulo Reis 47a5eb5382 Add a new layout and body template for e-mails. 2016-12-15 17:22:39 +00:00
James Allen 898277b4af Refactor ops model so it all happens in Document 2016-12-13 17:34:29 +00:00
James Allen 0a6a6c3c28 Keep files ordered in overview panel in the same was as the file tree 2016-12-09 16:17:28 +00:00
James Allen 293ba1fc4c Fetch all ranges from docstore when viewing overview panel 2016-12-09 15:43:08 +00:00
James Allen 1d426e538f Load ranges from docupdater and toggle track changes when possible 2016-12-08 14:10:30 +00:00
James Allen 1830d41eba Proxy ranges between doc updater and docstore 2016-12-08 14:09:06 +00:00
Paulo Reis 42bd1852c6 Use HTML binding in the excerpt. 2016-12-07 15:45:22 +00:00
Paulo Reis 58ab888f3f Add a button to show all, when filtering new items. 2016-12-07 14:57:54 +00:00
Paulo Reis c716b86def Add logic to dismiss unread announcements, styling fixes. 2016-12-07 14:26:10 +00:00
Henry Oswald e6eeb86046 add read property to announcments 2016-12-07 11:39:22 +00:00
Paulo Reis 821e556dd3 Better handling of overflowing content. 2016-12-06 17:15:56 +00:00
Paulo Reis c1355e64b3 Merge branch 'master' into pr-style-announcements 2016-12-06 15:42:24 +00:00
Paulo Reis 6a9ab1f525 Style adjusments; make announcements close when backdrop is clicked. 2016-12-06 14:17:30 +00:00
Shane Kilkelly a5d2183441 if Recurly error, parse body xml rather than using regex match 2016-12-06 10:39:59 +00:00
Shane Kilkelly 58280bf6ee Merge branch 'master' into sk-user-delete-with-cancelled-sub 2016-12-06 09:31:42 +00:00
Paulo Reis a00acd7458 Add animations and state toggling. 2016-12-05 15:32:38 +00:00
James Allen 48cc5a992f Merge branch 'master' into ja-set-version-in-docstore 2016-12-01 09:30:53 +00:00
Shane Kilkelly e03d16e0cd Deleting user: if subscription is already cancelled, ignore and proceed. 2016-11-30 16:03:18 +00:00
James Allen 34276520d8 Merge pull request #379 from sharelatex/sk-show-user-email
Add a `user_email` option to the nav "Account" dropdown.
2016-11-30 15:49:34 +00:00
Shane Kilkelly d38890e9f4 Add the rolling option to session 2016-11-30 09:41:58 +00:00
James Allen eb648b9bc8 Proxy version number to and from docstore 2016-11-29 17:16:56 +00:00
Paulo Reis 73e0a63689 Basic mark-up and styles. Change the controller to hold all notifications. 2016-11-29 17:12:53 +00:00
Shane Kilkelly cf94429e05 Add a user_email option to the nav "Account" dropdown. 2016-11-29 16:04:20 +00:00