tstaubitz
216afb6c64
Update LOCAL_SETUP.md
2016-11-10 17:14:57 +01:00
tstaubitz
d69ab5dd98
Update LOCAL_SETUP.md
2016-11-10 17:08:16 +01:00
tstaubitz
822d4b67ae
Update LOCAL_SETUP.md
2016-11-10 17:06:10 +01:00
Ralf Teusner
f2db88f952
Merge branch 'master' into travis-green-docker
...
took all the newer versions. Only thing I deleted is the part #to pass the test "it executes the run command" ...
We need to shortly discuss this yqbk.
Conflicts:
lib/docker_client.rb
2016-11-09 18:25:02 +01:00
rteusner
b7bced65c5
Merge pull request #81 from openHPI/editor-frontend-refactor
...
Editor frontend refactor
2016-11-09 18:11:02 +01:00
Ralf Teusner
bfa12899a5
adjust german locales to comply with the standard form of address
2016-11-09 18:09:24 +01:00
Ralf Teusner
1511941d3d
Merge branch 'master' into editor-frontend-refactor
...
Conflicts:
codeocean-dockerconfig.md
2016-11-09 18:00:40 +01:00
Ralf Teusner
ff7446fde6
redirect to RFCs on max score: redirect users to their own RFCs if they are open, fixed wrong usage of user_id (external_id is not used in RFCs, normal id has to be used!).
2016-11-09 17:58:10 +01:00
Ralf Teusner
e8f93cb870
Removed bin folder from linked_dirs in deploy, otherwise no rails console can be started on the servers, because the directory will be empty (as stated on several stackoverflow questions, for example: http://stackoverflow.com/questions/29039927/rails-4-doesnt-detect-application-after-capistrano-deployment )
2016-11-09 17:56:56 +01:00
Ralf Teusner
b0ceeea650
fix retrieval of relative_url_root also for other calls.
2016-10-28 17:22:31 +02:00
Ralf Teusner
181578ca87
change call to retrieve relative_url_root
2016-10-28 17:13:21 +02:00
yqbk
c937a1a9ef
clean pull request
2016-10-24 23:02:44 +02:00
Jakub Syrek
595a2a009b
Working build
2016-10-24 14:52:45 +02:00
Jakub Syrek
0069841a96
DOCKER_HOST + DOCKER_OPTS
2016-10-23 16:18:26 +02:00
Jakub Syrek
13011e8a31
set DOCKER_OPTS
2016-10-23 15:29:30 +02:00
Jakub Syrek
88079008f3
export DOCKER_HOST
2016-10-23 15:12:02 +02:00
yqbk
3d3d4ec1ae
pull docker images on travis
2016-10-23 14:30:34 +02:00
yqbk
46cdbc3b4b
change workspace path to /tmp
2016-10-16 17:28:57 +02:00
yqbk
f055e6813d
changes in travis
2016-10-16 17:21:54 +02:00
yqbk
043ece68f4
enable container tests
2016-10-16 16:55:24 +02:00
Ralf Teusner
ac88956d27
Put blocking score submission call into a thread to keep the puma server responsive
2016-10-12 18:15:16 +02:00
Ralf Teusner
accf0550d7
reworked the exercise edit dialog. Moved javascript part from editor_edit.js.erb to exercises.js.erb.
...
Manipulated some further javascript as necessary. It is not super elegant, but this is due to the former structure of the code which uses cloned dummy forms.
Integrating the ace editor made some strange calls necessary.
Also fixed toggling the input area and the file upload dialog
2016-10-12 16:35:21 +02:00
Ralf Teusner
4cf192d0f3
fix wrong link in refactor, since "this" is no longer available in javascript calls.
2016-10-12 14:37:09 +02:00
yqbk
1f24e48c5c
enable docker initialize
2016-10-11 16:45:56 +02:00
yqbk
f24f7e0c05
remove docker tag to travis
2016-10-11 16:42:48 +02:00
yqbk
52be496e16
add docker tag to travis
2016-10-11 13:33:30 +02:00
yqbk
7a76c4c6f1
try out new code
2016-10-11 13:12:00 +02:00
yqbk
1945a47109
apply changes after review
2016-10-11 12:44:16 +02:00
yqbk
734a0324d4
Merge branch 'travis-green' of github.com:openHPI/codeocean into travis-green
2016-10-08 20:38:02 +02:00
yqbk
44aca293e9
make travis green again
2016-10-08 20:37:20 +02:00
yqbk
a694d0ca33
solve errors
2016-10-08 20:05:25 +02:00
yqbk
304358af5a
merge with master
2016-10-08 19:21:26 +02:00
yqbk
15b7986515
make travis green 4
2016-10-08 19:09:15 +02:00
yqbk
1e6cdd5f39
make travis green 3
2016-10-08 19:02:12 +02:00
yqbk
d7d9212de5
make travis green 2
2016-10-08 18:51:52 +02:00
yqbk
f2f51414b0
make travis green
2016-10-08 18:34:42 +02:00
yqbk
674a594fd6
change concurrent ruby version
2016-10-08 18:22:38 +02:00
yqbk
948e6f7e3e
only newest ruby
2016-10-08 18:18:17 +02:00
yqbk
3bae736dce
no firefox path
2016-10-08 18:16:06 +02:00
yqbk
d47a440838
changes in travis
2016-10-08 18:04:00 +02:00
yqbk
ea745cbb5b
require codeclimate
2016-10-08 17:48:28 +02:00
yqbk
c9d209775b
change ruby version in travis settings
2016-10-08 17:43:26 +02:00
Ralf Teusner
c88a57c410
some comments and update of gem conccurrent-ruby
2016-10-07 16:38:22 +02:00
Ralf Teusner
1dfd6f61dc
some more relative url roots in editor_edit, removed javascript uglifying for staging, added debug message for docker websocket connection url.
...
added doku for setting up docker daemon for codeocean
2016-10-07 14:16:24 +02:00
Ralf Teusner
59119e43d5
added relative_url_root to some more javascript calls (ace file path, file template path).
2016-10-06 16:32:20 +02:00
Ralf Teusner
58dac37d77
added relative_url_root to URL for websocket call, needed for staging server
2016-10-06 16:14:51 +02:00
Ralf Teusner
d26a0fa6a4
Enhance codeocean events with user agent and external-id if present
2016-09-27 17:56:16 +02:00
Alexander Kastius
31c4f4b608
FIxed typo.
2016-09-09 18:10:08 +02:00
Alexander Kastius
70040b3c6b
Reordered everything again.
2016-09-09 18:08:41 +02:00
Alexander Kastius
87d1b2388d
Moved codepilot into dedicated file.
...
Renamed prompt.js
Moved requestComments out of flowr.js
2016-09-09 17:24:04 +02:00
