Commit graph

9923 commits

Author SHA1 Message Date
Henry Oswald
9a72667e91 added word count UI feature. 2015-09-14 15:28:19 +01:00
Shane Kilkelly
5e157bcd16 Fix a case where a null user would cause displayName to crash. 2015-09-14 12:27:27 +01:00
Shane Kilkelly
77ac6c1baf Merge branch 'master' of github.com:sharelatex/web-sharelatex 2015-09-14 12:08:11 +01:00
Shane Kilkelly
7bc9218b3c Fix up a bunch of issues with the track-changes list view.
- not crash when a user is null
- fix alignment of user color square
- if first and last name are absent, display email instead
- truncate overly long display name with '...'
2015-09-14 12:08:05 +01:00
Henry Oswald
507e8d13a6 Merge pull request #200 from heukirne/wordcount
Wordcount hook
2015-09-11 16:22:15 +01:00
Shane Kilkelly
778f588741 Merge pull request #199 from sharelatex/sk-missing-users
When a user is null in track-changes UI, display them as "Anonymous".
2015-09-11 14:24:08 +01:00
Henrique Dias
3be0425b45 add unit tests for wordcount 2015-09-11 10:21:05 -03:00
Henrique Dias
d228fd88ab add worcount file param 2015-09-11 09:53:06 -03:00
Henrique Dias
77c2162872 add wordcount clsi handler 2015-09-10 12:41:48 -03:00
James Allen
662050b3f9 Only show services header if we have some services to render 2015-09-10 16:01:12 +01:00
Shane Kilkelly
4a315a0474 When a user is null in track-changes UI, display them as "Anonymous". 2015-09-10 14:35:09 +01:00
James Allen
1c9f9274a9 Remove uneeded and now wrong Sentry error capturing 2015-09-08 11:48:39 +01:00
James Allen
25b9a9be19 Upgrade Ace to 'package 11.07.15'
This required a refactor of all code that listen to events changes since the API
has changed. See https://github.com/ajaxorg/ace/pull/1745 for more details.
2015-09-07 17:04:05 +01:00
James Allen
5fdb50958e Fix logs dropdown to work with Angular 1.3 2015-09-03 13:13:28 +01:00
James Allen
95db287fef Fix more dropdown menu in project list for new Angular 2015-09-03 13:02:43 +01:00
James Allen
c64891a61b Fix folder dropdown to work with new Angular 2015-09-03 12:54:11 +01:00
James Allen
aa06eb55b7 Merge branch 'master' into angular_1.3.15 2015-09-03 12:52:08 +01:00
James Allen
7446572ed9 Group online users into dropdown menu when more than 3 2015-09-02 14:33:51 +01:00
James Allen
34c8f22dd7 Allow multiple collaborators to be added at once with a list of emails 2015-09-02 14:33:43 +01:00
James Allen
639424f664 Don't error on project clone if not root doc is set 2015-09-02 14:32:21 +01:00
James Allen
40704b486e Don't lock up on very long lined documents 2015-08-28 16:52:09 +01:00
Shane Kilkelly
0aaeb6671e Keep password reset token in session, and strip it from reset page url.
This fixes an issue where the reset token was leaked in the referrer header
when navigating away from the password reset page to an external site.

Now we get the token from the query string, store it in the session,
then redirect to the bare url of the password reset page, which then
uses the stored token to render the reset form.
2015-08-24 11:53:33 +01:00
Henry Oswald
a53e3b80cf if blog or universities site is down don't crash, send 500 2015-08-20 16:55:16 +01:00
Shane Kilkelly
23bd5d317c A few extra cases which should not be treated as html. 2015-08-20 15:58:36 +01:00
Shane Kilkelly
ebf754904f More thorough tests for the FileStoreController when downloading .html files. 2015-08-20 15:56:56 +01:00
Shane Kilkelly
aab7a8713e Catch the case where filename is shorter than the extension length. 2015-08-20 15:56:30 +01:00
Shane Kilkelly
85c1704fc5 Test that content-type is set for mobile-safari user-agents. 2015-08-20 14:03:12 +01:00
Shane Kilkelly
ce248f56d7 Un-break FileStoreControllerTests by mocking out the req.get method. 2015-08-20 12:28:51 +01:00
Shane Kilkelly
2dd56d0b32 If we're sending a html file to mobile-safari, do so as plain text.
This prevents safari from trying to render the page,
which it does because it ignores the "Content-Disposition" header.
2015-08-20 12:02:43 +01:00
Shane Kilkelly
936b41ff2a Merge branch 'sk-unpublish-buttons' 2015-08-19 15:44:02 +01:00
Henry Oswald
038c5a33a2 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-08-19 12:00:58 +01:00
Henry Oswald
0e9ec00f85 added stubbed logger in document controller tests 2015-08-19 11:58:59 +01:00
Henry Oswald
63580f6a79 remove useClsi2 flag in project collection 2015-08-19 11:58:41 +01:00
Henry Oswald
a777fcc5a6 changed post to deactivate projects to set params via body rather than query params 2015-08-19 11:55:35 +01:00
Henry Oswald
50fc886c94 changed inactive to active as its more effienct query in mongo 2015-08-19 11:54:30 +01:00
Shane Kilkelly
18f75bba79 Generalize this style to all .btn elements under the .template-details-section 2015-08-19 09:59:01 +01:00
Shane Kilkelly
865372d13f Add some whitespace around buttons in template-details. 2015-08-18 14:45:44 +01:00
Shane Kilkelly
96619bde8c Move the template-browser code into the 'templates' module.
Now located to be located at `modules/templates/public/coffee/main/index.coffee`,
moved to complete a migration of template related code into the templates module.

Corresponding commit in sharelatex-web-modules:
625c556e42072d30f30d474aaef72deff24ca154
2015-08-18 14:21:35 +01:00
Shane Kilkelly
6b295fde28 Add shane image. 2015-08-17 14:23:36 +01:00
Henry Oswald
d3499acd7b pass options through stating how long ago want to archive from and limit 2015-08-14 14:11:53 +01:00
Henry Oswald
70b825fd2a fixed call to ProjectUpdateHandler.markAsOpened and made it async 2015-08-14 11:27:11 +01:00
Henry Oswald
66b87df17c added deactivate project endpoint 2015-08-14 11:26:11 +01:00
Henry Oswald
bec9bf5c87 replace lodash with underscore in this project 2015-08-14 09:42:27 +01:00
Henry Oswald
68e970cd69 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-08-14 09:31:25 +01:00
Henry Oswald
21a67ddab4 added deactivate old projects endpoint 2015-08-13 22:50:39 +01:00
Henry Oswald
a0142d4415 added inactive and reactivate project logic 2015-08-13 22:40:28 +01:00
Brian Gough
a25373d53e update metric-sharelatex to v1.2.0 for mongodb-core support 2015-08-06 09:44:47 +01:00
James Allen
ec5e03bd01 Fix subscription currency dropdowns 2015-08-04 15:58:31 +01:00
Henry Oswald
04d3e527d6 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-08-04 10:46:19 +01:00
Henry Oswald
53dc0b63c8 v1 of enago 2015-08-04 10:45:19 +01:00