Commit graph

228 commits

Author SHA1 Message Date
Shane Kilkelly
13c2fd794b Move web-sharelatex back to master branch. 2017-01-24 10:35:05 +00:00
Shane Kilkelly
afcd6b9f53 Add a dummy rollback, clean up. 2016-12-02 14:12:52 +00:00
Shane Kilkelly
e2570a06d2 Merge branch 'master' into sk-user-features 2016-12-02 14:01:46 +00:00
Shane Kilkelly
cc878e4caf Add an update_user_features migration. 2016-12-02 14:01:19 +00:00
Henry Oswald
b1a3be4510 change how grunt splits tasks up which fix broken migrate call 2016-11-23 15:32:44 +00:00
Henry Oswald
241918c2d0 Merge pull request #493 from hyperdo/patch-1
Update +1 to 👍
2016-11-22 09:34:45 +00:00
Ethan
3aecf9abe4 Update +1 to 👍
Change comment with a +1 to modern github reaction (👍)
2016-11-19 19:02:27 -08:00
Henry Oswald
62849c79ee Update README.md 2016-11-17 15:42:51 +00:00
Henry Oswald
6f98918910 Update README.md 2016-11-15 10:29:06 +00:00
Henry Oswald
fc868f0025 Update docker-compose.yml 2016-11-15 10:27:21 +00:00
Henry Oswald
d94b622a8e Update ISSUE_TEMPLATE 2016-11-15 10:19:58 +00:00
Henry Oswald
5d69513fe8 Create ISSUE_TEMPLATE 2016-11-15 10:19:20 +00:00
Henry Oswald
a5c4efd052 Merge branch 'master' of https://github.com/sharelatex/sharelatex 2016-11-03 15:13:41 +00:00
Henry Oswald
3b2cbfd743 should check SHARELATEX_REDIS_HOST not SHARELATEX_REDIS_URL 2016-11-03 15:13:02 +00:00
Henry Oswald
78008cd2a6 comment out project size for test 2016-11-03 10:59:17 +00:00
Henry Oswald
1707ea187d Update docker-compose.yml 2016-10-19 12:10:27 +01:00
Henry Oswald
3e13565a84 added coffeescript and moved admin require to bottom of file 2016-10-19 11:39:40 +01:00
Henry Oswald
bdea2e3236 Merge branch 'master' of https://github.com/sharelatex/sharelatex 2016-10-19 11:32:32 +01:00
Henry Oswald
3eeeccc0ec log out which version is being checked out 2016-10-19 11:30:10 +01:00
Henry Oswald
75364f058a Create ProjectSize.coffee 2016-10-13 15:46:18 +01:00
Henry Oswald
1fca396be2 fix comments for user create 2016-09-22 12:45:45 +01:00
Henry Oswald
1c3be11b8c Update docker-compose.yml 2016-09-22 12:32:25 +01:00
Henry Oswald
5e1f7d86fd make errors more clear 2016-09-22 12:30:43 +01:00
Henry Oswald
1e81ab7bef throw errors in grunt when checking 2016-09-21 12:43:58 +01:00
Henry Oswald
2443aa9e75 added check make back in and list of make grunt tasks 2016-09-21 12:08:11 +01:00
Henry Oswald
c41540fc02 remove helpers we don’t use 2016-09-20 17:08:38 +01:00
Henry Oswald
7d4286d368 add checkMongoConnect and checkRedisConnect funcs to grunt 2016-09-20 17:07:52 +01:00
Henry Oswald
0dfd8f9d88 remove calls to dirs 2016-08-15 13:39:34 +01:00
Henry Oswald
c9c43ad628 added logging 2016-08-05 17:35:46 +01:00
Henry Oswald
21317b68fc change command to create and delete users 2016-08-05 15:36:27 +01:00
Henry Oswald
906a47cecb added notifications and package for multi config files 2016-08-05 15:35:43 +01:00
Henry Oswald
1695a1bf39 move create-admin-user and delete-user to grunt folder 2016-08-05 13:29:11 +01:00
Henry Oswald
ba6d553de1 Merge branch 'master' of https://github.com/sharelatex/sharelatex 2016-08-05 12:51:53 +01:00
Henry Oswald
c85ae09331 deletd undeeded tasks 2016-08-05 12:51:48 +01:00
Henry Oswald
2e9561d126 Delete CHANGELOG.md 2016-08-05 11:36:02 +01:00
Henry Oswald
e375c7a842 Merge branch 'master' of https://github.com/sharelatex/sharelatex 2016-07-22 15:54:48 +01:00
Henry Oswald
c167eec53b added contacts to service list 2016-07-22 15:54:31 +01:00
Henry Oswald
03bfbe8d44 Update docker-compose.yml 2016-07-18 16:11:04 +01:00
Henry Oswald
e35303decf Update docker-compose.yml 2016-07-18 16:08:33 +01:00
Henry Oswald
e5808c2933 added example docker compose file 2016-06-30 16:35:26 +01:00
Henry Oswald
5bc0e529d5 upgrade east and check for null ids 2016-06-30 14:52:45 +01:00
Henry Oswald
3f63497d9d Merge branch 'master' of https://github.com/sharelatex/sharelatex 2016-06-23 21:36:07 +01:00
Henry Oswald
49eb1c6ac4 don't clone via branch 2016-06-23 20:47:44 +01:00
Henry Oswald
62eddf8982 checkout the correct version 2016-06-23 17:13:12 +01:00
Henry Oswald
5584abf117 Merge pull request #416 from heukirne/master
add services file
2016-06-22 20:55:13 +01:00
Henrique Dias
b5c59a9ce5 Merge remote-tracking branch 'upstream/master'
Conflicts:
	Gruntfile.coffee
2016-06-22 16:50:53 -03:00
Henry Oswald
240280a0ae get rid of config commands 2016-06-09 16:59:57 +01:00
Henry Oswald
7d5382f668 don't instal config with grunt 2016-06-09 16:43:18 +01:00
Henry Oswald
307f21287f Merge branch 'master' of https://github.com/sharelatex/sharelatex 2016-06-08 17:03:34 +01:00
Henry Oswald
2fa60e86f3 removed old files no longer used 2016-06-08 17:03:19 +01:00