Commit Graph

313 Commits

Author SHA1 Message Date
ac113ec717 Restart container on timeout 2015-04-16 09:23:59 +02:00
635900b3cc Restart container on timeout 2015-04-15 19:54:15 +02:00
940eee5856 Show warning if all containers are depleted. 2015-04-15 17:17:39 +02:00
2146089a2b Change deploy username 2015-04-15 12:12:26 +02:00
48c9bbcea5 Changed the way we empty the working dir after continaer is returnned in pool 2015-04-15 08:17:26 +02:00
69bac3fe20 Avoid utf-8 trouble 2015-04-14 20:26:43 +02:00
95923a137e Do not create more containers as the pool count 2015-04-14 20:23:41 +02:00
9d7cb92931 Merge branch 'master' of https://github.com/openHPI/codeocean
Conflicts:
	lib/docker_client.rb
2015-04-14 20:19:12 +02:00
366f2b8ef0 backup 2015-04-14 20:17:36 +02:00
b46055eca3 added option to recycle Docker containers 2015-04-14 19:59:11 +02:00
7f7e538af2 Added comment to explain commented stuff 2015-04-14 19:49:46 +02:00
9187596f18 Do not create container if pooling is on and all containers are gone 2015-04-14 19:47:01 +02:00
91ac7e8e37 debugging 2015-04-14 17:10:05 +02:00
0b7ae86a69 debugging 2015-04-14 16:54:23 +02:00
a410696438 debugging 2015-04-14 16:53:56 +02:00
168df58cc7 debugging 2015-04-14 16:45:56 +02:00
a28b80b083 deactiveate stuff that breaks for now 2015-04-14 16:31:22 +02:00
0c8e93fb95 use latest api version 2015-04-14 14:55:43 +02:00
40aa3e1494 lets assume we are stable soon.. 2015-04-14 14:43:06 +02:00
c0fde51f6c Backup commit 2015-04-13 22:36:27 +02:00
cb98ef50fb Disable average count as this breaks on some exercises... 2015-04-13 16:25:48 +02:00
7e28a6c045 Add docker config for prod 2015-04-13 15:21:34 +02:00
d06e9a476a if we use this for cheching then there should be a valid false or nil return 2015-04-12 23:16:58 +02:00
b8284a7a26 fixed issue of default test feedback message not being localized correctly 2015-04-12 13:45:45 +02:00
51d93ae8c9 updated bundle 2015-04-11 21:36:59 +02:00
4979abfb55 Merge branch 'master' of github.com:openHPI/codeocean 2015-04-11 21:30:13 +02:00
6b025aeda9 added New Relic 2015-04-11 16:54:48 +02:00
5a4b647acb Merge branch 'pr/14'
Conflicts:
	app/views/exercises/_editor_file_tree.html.slim
2015-04-10 20:39:53 +02:00
623cd53dc3 Merge branch 'master' of github.com:flxw/codeocean 2015-04-10 20:23:58 +02:00
172ca91329 bugfixes, policies, errors now have a link to the submissions 2015-04-10 20:23:38 +02:00
5d5b175154 Implement internationalization 2015-04-09 17:20:36 +02:00
aff3da9bcd Merge branch 'master' of github.com:flxw/codeocean 2015-04-09 16:58:00 +02:00
4fe60d5f94 set correct user_id for internal users 2015-04-09 16:54:03 +02:00
5c89403689 even more semicolons... 2015-04-09 15:02:54 +02:00
f06a6e5489 fixed failing test (added assignment of current user) 2015-04-09 11:14:26 +02:00
4a6e8c7c0a Minor style changes 2015-04-09 09:50:39 +02:00
1f4f290de4 updated bundle 2015-04-08 21:48:52 +02:00
6ee3218ee6 updated Underscore to 1.8.3 2015-04-08 21:47:59 +02:00
518016d375 Smaller buttons 2015-04-08 18:19:33 +02:00
bce864ca84 Merge branch 'master' of github.com:flxw/codeocean 2015-04-08 16:59:03 +02:00
e6f65dd853 some semicolons 2015-04-08 16:55:50 +02:00
bb1c36148a some semicolons 2015-03-31 13:22:53 +02:00
ccda18f321 Disable breaking standard enable of CodePilot 2015-03-28 18:52:31 +01:00
d601878452 Show editor for code commenting, and allow commenting as well 2015-03-28 18:39:55 +01:00
8149f207fd Merge pull request #1 from nwittstruck/master
CodePilot integration
2015-03-28 17:18:59 +01:00
b4679ebcbe merged qa into codeocean 2015-03-27 22:08:53 +01:00
bad98cca1d merged qa into codeocean 2015-03-27 21:27:40 +01:00
db1b94dcf0 Merge remote-tracking branch 'upstream/master' 2015-03-27 18:15:35 +01:00
f73051eabd Amend db script 2015-03-27 18:15:18 +01:00
0100e6a9cc remove ugly css 2015-03-27 18:12:14 +01:00