alois/Verso
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,975 Commits 7 Branches 11 Tags
msm-github-codespaces
Commit Graph

6049 Commits

Author SHA1 Message Date
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