Paulo Reis
|
24f82c3c35
|
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
|
2016-11-16 15:34:49 +00:00 |
|
James Allen
|
fc3fd5c73c
|
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
|
2016-11-16 15:27:48 +00:00 |
|
James Allen
|
379afe4aa5
|
Refactor scroll handling into directive
|
2016-11-16 15:23:29 +00:00 |
|
Paulo Reis
|
00a6df156b
|
Wrap comment entries in a directive
|
2016-11-16 15:12:58 +00:00 |
|
Paulo Reis
|
9ffb05cd98
|
Wrap insert and delete entries in a directive
|
2016-11-16 14:56:34 +00:00 |
|
Brian Gough
|
277894631a
|
try out new pdfjs font fix
https://github.com/mozilla/pdf.js/pull/7705
|
2016-11-16 14:50:09 +00:00 |
|
Paulo Reis
|
d7d21b106c
|
Isolate review-panel markup.
|
2016-11-16 14:42:07 +00:00 |
|
Shane Kilkelly
|
f9774141b1
|
Fix up makeRequest, so it copes with analytics.url being un-configured.
|
2016-11-16 14:40:38 +00:00 |
|
James Allen
|
479ea83e36
|
Dump everything (unstyled) into the review panel
|
2016-11-16 13:51:30 +00:00 |
|
James Allen
|
711f282575
|
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
|
2016-11-16 13:26:33 +00:00 |
|
Paulo Reis
|
f640c17d4d
|
Add review panel substate toggling.
|
2016-11-16 12:31:47 +00:00 |
|
Paulo Reis
|
db5dc6ef15
|
Positive action buttons on the right.
|
2016-11-16 11:03:29 +00:00 |
|
James Allen
|
b443c5d7dc
|
Make mini review panel entries scroll and stack like main panel
|
2016-11-15 17:07:06 +00:00 |
|
James Allen
|
829ccb6641
|
Resize on toggling review panel
|
2016-11-15 16:21:45 +00:00 |
|
Paulo Reis
|
8a11c8c3ca
|
Show add comment button when review panel is off.
|
2016-11-15 16:02:12 +00:00 |
|
James Allen
|
09074f5413
|
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
|
2016-11-15 15:48:17 +00:00 |
|
James Allen
|
4542d1094d
|
Keep separate persistent change tracker for each doc
|
2016-11-15 15:48:12 +00:00 |
|
Henry Oswald
|
5b3cd7ed2b
|
use makeRequest func in analytics manager
|
2016-11-15 15:36:26 +00:00 |
|
Paulo Reis
|
7bf55823b2
|
Hide review panel when there are no entries.
|
2016-11-15 15:04:29 +00:00 |
|
Henry Oswald
|
a822cc0c92
|
don't log events from health check user
|
2016-11-15 13:41:15 +00:00 |
|
Henry Oswald
|
6776aa61f1
|
use new way to send status in express for healthcheck controlller
|
2016-11-15 11:04:13 +00:00 |
|
Henry Oswald
|
411b5324df
|
don't try and send requests when analytics isn't enabled
|
2016-11-15 10:54:48 +00:00 |
|
Henry Oswald
|
d87067bc2f
|
Merge branch 'announcments'
|
2016-11-15 10:38:01 +00:00 |
|
Henry Oswald
|
15564102a0
|
Update ProjectController.coffee
|
2016-11-15 10:34:57 +00:00 |
|
Paulo Reis
|
0c600ba9b8
|
Support overflowing panes in UI layout.
|
2016-11-15 10:34:19 +00:00 |
|
Shane Kilkelly
|
6c381b127c
|
Count saml as an external authentication system.
|
2016-11-14 13:33:48 +00:00 |
|
James Allen
|
c89579e1df
|
Focus on the focused change
|
2016-11-14 12:47:46 +00:00 |
|
Paulo Reis
|
7201bde2a3
|
Add comment UI.
|
2016-11-14 11:19:00 +00:00 |
|
Henry Oswald
|
e397b76fba
|
commended out jade so can go live with rest of code quietly
|
2016-11-14 10:54:36 +00:00 |
|
Henry Oswald
|
47ed17aab3
|
remove unneeded package and comma in jade
|
2016-11-14 10:50:49 +00:00 |
|
Henry Oswald
|
666bfdf967
|
stop the /announcements call at controller level
|
2016-11-11 17:15:36 +00:00 |
|
Henry Oswald
|
5a13ee1077
|
use anlaytis api
- don’t talk to postgres
- show recent blog post announcments
- proxy all events to analytics api
|
2016-11-11 17:03:09 +00:00 |
|
James Allen
|
747e14dffe
|
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
|
2016-11-11 16:16:10 +00:00 |
|
Paulo Reis
|
d04d7f834e
|
Adjustments in the threaded comments, mocked comments responses.
|
2016-11-11 16:10:26 +00:00 |
|
James Allen
|
9509e87dc1
|
Update entries in place and position via DOM attributes directly
|
2016-11-11 16:09:32 +00:00 |
|
Shane Kilkelly
|
2cf2199964
|
WIP: enable non-csrf routes from modules
|
2016-11-11 13:48:29 +00:00 |
|
Paulo Reis
|
6c5c1549b6
|
Add comment replies via enter keypress.
|
2016-11-11 10:51:32 +00:00 |
|
Paulo Reis
|
78e409593b
|
Threaded comments.
|
2016-11-10 17:19:41 +00:00 |
|
Paulo Reis
|
8dcbb6ea4f
|
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
|
2016-11-10 15:09:56 +00:00 |
|
Paulo Reis
|
c5e6ca5200
|
More entry styling.
|
2016-11-10 15:08:41 +00:00 |
|
James Allen
|
593e59450b
|
Use different UserSessions keys for cluster vs normal redis session store
|
2016-11-10 14:31:48 +00:00 |
|
Paulo Reis
|
997addf355
|
More entry header styling + entry body.
|
2016-11-10 12:35:35 +00:00 |
|
James Allen
|
4e2dd55cfd
|
Fix merge issues
|
2016-11-10 10:53:30 +00:00 |
|
James Allen
|
812ee82af1
|
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
Conflicts:
app/views/project/editor/editor.jade
|
2016-11-10 10:52:40 +00:00 |
|
James Allen
|
34b2b665a3
|
Accept and reject changes
|
2016-11-10 10:52:09 +00:00 |
|
Paulo Reis
|
950fc0179c
|
Basic support for action icons.
|
2016-11-10 10:19:52 +00:00 |
|
James Allen
|
ca178c1a85
|
Fix indentation
|
2016-11-09 17:12:01 +00:00 |
|
James Allen
|
f62d95dd8c
|
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
|
2016-11-09 17:11:02 +00:00 |
|
James Allen
|
2e719fc450
|
Start adding callouts in review panel
|
2016-11-09 17:10:58 +00:00 |
|
Paulo Reis
|
013df17192
|
Entry header layout.
|
2016-11-09 17:09:57 +00:00 |
|
Paulo Reis
|
f28119aacb
|
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
|
2016-11-09 16:36:12 +00:00 |
|
Paulo Reis
|
341a092231
|
Merge + basic layout for entries.
|
2016-11-09 16:36:06 +00:00 |
|
James Allen
|
184b421b1f
|
Show user name in comments
|
2016-11-09 16:34:23 +00:00 |
|
James Allen
|
b44f1cde10
|
Add user data into changes
|
2016-11-09 16:23:08 +00:00 |
|
Paulo Reis
|
19241e571f
|
Distinguish between inserts and deletes in the entries repeater.
|
2016-11-09 15:58:03 +00:00 |
|
James Allen
|
c5532bd8a3
|
Add cancel buttons for comments
|
2016-11-09 15:51:40 +00:00 |
|
James Allen
|
6d7f4e9e6a
|
Add basic comment replying
|
2016-11-09 15:25:41 +00:00 |
|
James Allen
|
707ed43a7d
|
Very crude adding of comments
|
2016-11-09 14:50:58 +00:00 |
|
Shane Kilkelly
|
c3860dd7a7
|
Remove stray commented-out code, use mapSeries instead of map.
|
2016-11-09 14:36:25 +00:00 |
|
James Allen
|
446ca7212a
|
Track timestamps of changes
|
2016-11-09 12:19:48 +00:00 |
|
Shane Kilkelly
|
f6de4cbb44
|
Merge branch 'master' into sk-sessions-cluster
|
2016-11-09 12:10:46 +00:00 |
|
Shane Kilkelly
|
5f3098df38
|
Replace multi-ops with Async.series, tests passing
|
2016-11-09 11:03:03 +00:00 |
|
James Allen
|
064ae1945a
|
Toggle review panel and track changes with ui elements
|
2016-11-08 16:43:01 +00:00 |
|
Shane Kilkelly
|
bfa0e7cf89
|
WIP: start moving web sessions to cluster
|
2016-11-08 15:32:36 +00:00 |
|
Henry Oswald
|
d556cbaacf
|
Merge pull request #361 from djwf/master
Pass ignoreTLS option to nodemailer
|
2016-11-08 11:26:42 +00:00 |
|
Brian Gough
|
6f41dddb42
|
disable spell check for anonymous users
these requests always fail
|
2016-11-04 16:03:18 +00:00 |
|
Brian Gough
|
307f08e6bb
|
Merge pull request #363 from sharelatex/bg-lock-editor-when-connection-down
lock editor when connection down
|
2016-11-04 11:04:30 +00:00 |
|
Brian Gough
|
49a06f8489
|
modal for lost connection
|
2016-11-03 12:37:44 +00:00 |
|
James Allen
|
091eb7e462
|
Merge branch 'master' into ja-review-panel
Conflicts:
public/coffee/ide.coffee
public/stylesheets/app/editor.less
|
2016-11-03 10:07:37 +00:00 |
|
David J. Weller-Fahy
|
5efee51ed8
|
Pass ignoreTLS option to nodemailer
|
2016-11-02 13:14:54 -04:00 |
|
Paulo Reis
|
559350eaa2
|
Avoid showing the history upgrade teaser when user is not the project owner.
|
2016-11-02 16:08:47 +00:00 |
|
Shane Kilkelly
|
e7b09a81a7
|
Merge branch 'sk-passport-ldap'
|
2016-11-02 15:39:32 +00:00 |
|
Paulo Jorge Reis
|
74d8fb103b
|
Merge pull request #358 from sharelatex/pr-latex-linter-onboarding
Code-checker onboarding
|
2016-11-02 13:58:06 +00:00 |
|
Henry Oswald
|
fde9ab60cc
|
remove left-menu-upgraed-rotation ab test
|
2016-11-02 10:24:03 +00:00 |
|
Henry Oswald
|
11a097c9a6
|
remove some old sixpack tests
|
2016-11-02 10:09:12 +00:00 |
|
Shane Kilkelly
|
a63f7685b8
|
Move the planCode logic for Collaborator into a helper function.
|
2016-11-02 09:56:33 +00:00 |
|
Paulo Reis
|
c18114bfeb
|
Different strategy for highlighting the code-check setting.
|
2016-11-01 17:30:27 +00:00 |
|
Paulo Reis
|
840d52ef1a
|
Remove default value from user model, but add it upon creation (i.e. affecting new users).
|
2016-11-01 16:36:26 +00:00 |
|
Paulo Reis
|
8c182c2ccd
|
Show code-check option for non-beta users.
|
2016-11-01 15:26:26 +00:00 |
|
Brian Gough
|
585f8681ea
|
enable syntax validation for all users
(by defining aceWorker)
|
2016-11-01 15:02:32 +00:00 |
|
Shane Kilkelly
|
9cb3d8c4b8
|
Enable hook from module into passport init.
|
2016-11-01 14:06:54 +00:00 |
|
Paulo Reis
|
06629e05d4
|
Include teaser media and do some style adjustments.
|
2016-11-01 11:36:21 +00:00 |
|
Paulo Reis
|
aa58b70d43
|
Improve visibility logic.
|
2016-10-31 20:18:08 +00:00 |
|
James Allen
|
8368577867
|
Merge branch 'master' into ja-review-panel
Conflicts:
app/views/project/editor/editor.jade
public/coffee/ide.coffee
public/coffee/ide/editor/directives/aceEditor.coffee
|
2016-10-31 16:42:55 +00:00 |
|
Paulo Reis
|
97b92928dc
|
Merge branch 'master' into pr-latex-linter-onboarding
|
2016-10-28 16:36:10 +01:00 |
|
Paulo Reis
|
4721fd450c
|
Improve condition to avoid linking sixpack directives when project loads.
|
2016-10-28 14:40:04 +01:00 |
|
Paulo Reis
|
8157f68393
|
Avoid linking sixpack directives when project loads.
|
2016-10-28 14:23:16 +01:00 |
|
Shane Kilkelly
|
5c8cdd22cc
|
Merge branch 'sk-account-delete-pass'
|
2016-10-28 11:02:41 +01:00 |
|
Shane Kilkelly
|
6e6211bde6
|
Merge branch 'sk-plain-text-emails-all'
|
2016-10-28 11:02:33 +01:00 |
|
Shane Kilkelly
|
4c092e7ff1
|
Remove deprecated "projectSharedWithYou" email.
|
2016-10-28 10:37:10 +01:00 |
|
Shane Kilkelly
|
164c8a091f
|
Move the scripts block after jQuery has been loaded and CDN logic.
Fixes issue on the update-billing-info page.
|
2016-10-28 10:18:20 +01:00 |
|
Shane Kilkelly
|
751a116921
|
add plainTextTemplate to all emails
|
2016-10-27 14:41:13 +01:00 |
|
Paulo Reis
|
1c4183e7b1
|
Merge branch 'master' into pr-ab-test-history-teaser
|
2016-10-27 12:35:11 +01:00 |
|
Paulo Reis
|
5dddbec5b2
|
Add AB test conversion.
|
2016-10-27 12:06:36 +01:00 |
|
Paulo Reis
|
991626692b
|
Track subscriptions in metabase with AB test variant.
|
2016-10-27 12:05:32 +01:00 |
|
Paulo Reis
|
5a82cebcff
|
Make the history teaser message look like a modal.
|
2016-10-27 11:12:22 +01:00 |
|
Paulo Reis
|
04f8b3adfa
|
Adapt mark-up to history teaser, add some styles.
|
2016-10-27 10:30:10 +01:00 |
|
Shane Kilkelly
|
1538f140f3
|
update test timestamp
|
2016-10-27 09:41:51 +01:00 |
|
Paulo Reis
|
b5494c1730
|
Basic test mark-up structure.
|
2016-10-26 15:48:03 +01:00 |
|
Shane Kilkelly
|
dfd13e0815
|
Update AB test timestamp
|
2016-10-26 14:24:00 +01:00 |
|