agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-11-15 14:43:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,327 Commits 8 Branches 23 Tags
d1bb2d47554d3e34f59536de67f0308ab79a9653
Commit Graph
23327 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Shane Kilkelly b1f7bc2f12 Merge branch 'master' of github.com:sharelatex/sharelatex-docker-image 2017-01-26 10:27:40 +00:00
Shane Kilkelly c172455cd7 Add documentupdater config 2017-01-26 10:27:17 +00:00
Shane Kilkelly d18b1b0805 Un-pin doc-updater 2017-01-25 15:22:32 +00:00
James Allen 32b0c6a4fb Merge pull request #398 from sharelatex/ja-track-changes 
Fix style issues in IE 10
 2017-01-25 15:55:15 +01:00
James Allen 757c7002eb Merge pull request #397 from sharelatex/ja-modify-threads 
Allow editing/deleting of comments and threads
 2017-01-25 15:50:00 +01:00
James Allen 406181b05d Remove a console.log 2017-01-25 15:49:38 +01:00
Brian Gough 5a6f54e6b2 update image for docker tests 2017-01-25 14:12:19 +00:00
Brian Gough b4afaf9ea8 use local docker image for clsi test 2017-01-25 14:09:44 +00:00
Brian Gough 9461b28707 run tests outside container, add settings file 2017-01-25 14:08:39 +00:00
Paulo Reis a924794a5a Add expandable text area directive; apply it to review panel text areas. 2017-01-25 13:51:33 +00:00
James Allen a23919754f Merge pull request #5 from sharelatex/ja-modify-threads 
Allow editing/deleting of comments and threads
 2017-01-25 14:51:30 +01:00
James Allen 7cf5db4c63 No need to return message after editing 2017-01-25 14:47:45 +01:00
James Allen e0531d0272 Merge pull request #14 from sharelatex/ja-modify-threads 
Allow deleting of comment ranges
 2017-01-25 14:10:34 +01:00
Shane Kilkelly e2f4fc3653 Merge branch 'master' into sk-rate-limit-cluster 2017-01-25 10:52:34 +00:00
Shane Kilkelly 60500bc4ea update shrinkwrap 2017-01-25 10:52:08 +00:00
Henry Oswald 3eb13ccdd1 fix stupid mistake 2017-01-25 10:38:39 +00:00
Henry Oswald 2a00b9c7a2 use user._id for error log 2017-01-25 10:33:30 +00:00
Paulo Reis f11926d0a9 Make sure layout math is done on load. 2017-01-25 10:31:02 +00:00
Shane Kilkelly f7b4e00466 Restore npm-shrinkwrap.json 2017-01-25 10:30:53 +00:00
Shane Kilkelly 239164fe26 Merge branch 'master' into sk-rate-limit-cluster 2017-01-25 09:56:08 +00:00
Henry Oswald cc717f0357 domainAnnouncementsToShow -> domainAnnouncements 2017-01-25 09:44:13 +00:00
Henry Oswald 02e6eb4dd1 Merge pull request #399 from sharelatex/ho-promote-case-study 
promote domain alerts
 2017-01-25 09:41:50 +00:00
Henry Oswald 1280a2313d add check for id to exist in domain announcments 
null check user at start of getUnreadAnnouncements
fix spelling mistake
 2017-01-25 09:35:11 +00:00
Henry Oswald 69ab275404 Update list.jade 2017-01-25 09:14:21 +00:00
Brian Gough 0a3bd5fb07 upgrade to latest sqlite3 2017-01-24 16:06:32 +00:00
James Allen 59c40ea5cc Only show delete options when thread has more than one message! 2017-01-24 17:03:32 +01:00
Henry Oswald 13d21b881f use new annoncments feature for case study info 2017-01-24 16:03:05 +00:00
James Allen 798e09f011 Don't show 'no comments' when submitting 2017-01-24 16:56:08 +01:00
James Allen f9ba7392e9 Allow editing/deleting of comments and threads 2017-01-24 16:21:14 +01:00
Paulo Reis 1de8b3bce7 Disable text selection with right click on file tree. 2017-01-24 15:19:48 +00:00
James Allen 8725aeab03 Allow deleting of comment ranges 2017-01-24 15:57:11 +01:00
Henry Oswald 2341a8481a Merge branch 'master' into ho-promote-case-study 2017-01-24 14:49:35 +00:00
James Allen fa63eb6947 Allow editing/deleting of comments and threads 2017-01-24 15:44:32 +01:00
Brian Gough 0f92ef104a added docker script for acceptance tests 2017-01-24 12:18:30 +00:00
Brian Gough 08dc3bd744 fix acceptance tests 2017-01-24 11:07:54 +00:00
Shane Kilkelly 13c2fd794b Move web-sharelatex back to master branch. 2017-01-24 10:35:05 +00:00
Shane Kilkelly 9a3c1c7d22 Merge branch 'master' into ha-docker 
# Conflicts:
#	app/coffee/Features/Email/EmailBuilder.coffee
 2017-01-24 10:24:35 +00:00
Shane Kilkelly a148eb1f43 Merge branch 'master' into sk-rate-limit-cluster 2017-01-24 09:24:47 +00:00
Shane Kilkelly 0add3ed66e Merge branch 'master' into sk-upgrade-uuid 2017-01-23 10:04:31 +00:00
Shane Kilkelly abbffb8e4b Remove deprecated node-uuid package, replace with uuid. 2017-01-23 10:03:16 +00:00
James Allen dc976fd9e9 Use thread id for comment id 2017-01-23 09:45:46 +01:00
James Allen 2813b16ebf Use thread id for comment id 2017-01-23 09:45:37 +01:00
Henry Oswald 93bb7ee680 Merge pull request #396 from sharelatex/ho-rate-limit-email-send-2 
Ho rate limit email send 2
 2017-01-21 12:58:49 +00:00
Henry Oswald 9153ffac41 limit project name in email to 40 chars 2017-01-21 12:58:16 +00:00
Henry Oswald 74240e28c7 rate limit via ip the number of invite to project requests 2017-01-21 12:44:09 +00:00
Henry Oswald 6d35585847 limit number of invites each user can do 
done with the number of collaborators a user can add
prevents notifications getting filled up as well
 2017-01-21 12:43:15 +00:00
Henry Oswald 6f2c7ba6c6 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2017-01-20 14:51:23 +00:00
Henry Oswald 03555f0339 added chris and removed geri from pics 2017-01-20 14:50:38 +00:00
Shane Kilkelly cfa2777d62 Merge branch 'sk-launchpad' 2017-01-20 13:58:16 +00:00
Shane Kilkelly 36eb453aed Clarify logic of asyncform onsuccess and onerror handlers 2017-01-20 13:52:31 +00:00