Commit Graph

447 Commits

Author SHA1 Message Date
Alexander Kastius
3fd43fdee2 Sending command 'client_kill' on stop button click now.
Killing a container only if command client_kill was send.
Moved propmpt to prompt.js
2016-09-09 16:41:20 +02:00
Ralf Teusner
0f76b1cb90 Merge branch 'master' into editor-frontend-refactor
Conflicts:
	app/assets/javascripts/editor.js.erb
---> kept refactored one
2016-09-09 14:17:42 +02:00
Ralf Teusner
e67f1f78c4 cleanup logging statements. 2016-09-09 14:11:38 +02:00
Ralf Teusner
8f499b72da Feature: Auto-Completion in Source Code
+ allow flags for exercises
2016-09-07 17:34:20 +02:00
Ralf Teusner
0d550a44af send exit commands from rails server when score or test have finished - this is needed to reset the buttons in the frontend correctly. 2016-09-01 17:15:44 +02:00
Ralf Teusner
6e6c9143cd Some tidy up in request for comments (bugfix: removed leftover parts of requested_at attribute, some UI changes in comment dialog)
Redirect to open rfc if an exercise has been solved
2016-08-11 18:13:33 +02:00
yqbk
41b0c1e530 solve extension probelm 2016-08-03 17:21:49 +02:00
yqbk
4183a16178 merge with master 2016-08-03 12:09:58 +02:00
Ralf Teusner
87901bd89b Merge branch 'master' into score-websocket
Conflicts:
	app/assets/javascripts/editor.js.erb
2016-07-28 15:32:22 +02:00
Ralf Teusner
ed3526a578 Merge branch 'master' into feature-file-templates
Conflicts:
	app/views/application/_navigation.html.slim
	config/locales/de.yml
	config/locales/en.yml
	db/schema.rb
2016-07-28 15:16:11 +02:00
Ralf Teusner
09533a5556 download complete submission as one zip file 2016-07-15 18:25:58 +02:00
Ralf Teusner
f5868a4fa2 merge master 2016-07-14 13:22:24 +02:00
Ralf Teusner
223df2ffa8 some cleanup of request for comments. Work in progress.
Noticed a flaw when fetching the last submission, which is caused by timezone differences. First step to solve this.
Existing Request for Comments still need to be updated with their current submissionId, the SQL to do that is not yet finished.
2016-07-04 17:44:22 +02:00
Ralf Teusner
2a52b66daa rfc can now be solved.
show.html still needs to be finished
2016-06-24 16:44:34 +02:00
Ralf Teusner
7c1be5594a also handle testcommand via websocket 2016-06-17 17:23:47 +02:00
Ralf Teusner
96de763b83 Handle scoring presentation to client via websockets 2016-06-17 16:42:07 +02:00
Ralf Teusner
ec26a095f6 First working version of mails on comments. 2016-06-17 14:48:57 +02:00
yqbk
d921f90a65 solved logger error 2016-06-15 15:13:31 +02:00
yqbk
195fd9c3f9 submission controller spec - problem with Rails.logger.error 2016-06-14 16:07:44 +02:00
yqbk
4e5c3ba071 In files_controller.rb: deleted .file_extension call due to the error: undefined method `file_extension' for nil:NilClass 2016-06-14 12:25:23 +02:00
Maximilian Grundke
8d030e42e9 Allow templates to include the file name as a macro 2016-06-10 18:08:57 +02:00
Maximilian Grundke
4d2676fea7 Only show file templates which are available for the selected file type 2016-06-10 17:48:04 +02:00
Maximilian Grundke
4f8feb38e1 Use file template to generate new file content 2016-06-10 13:41:38 +02:00
Maximilian Grundke
1cd879bcb6 Scaffold file templates 2016-06-09 22:38:19 +02:00
Ralf Teusner
8158d60d30 also write "parsable json" to the frontend console if it does not have a valid command set (solves the issue when just printing an array in java, it is not shown anywhere). 2016-06-01 11:30:42 +02:00
rteusner
3cd29556bb Merge pull request #53 from openHPI/fix-file-creation-behavior
Fix file creation behavior
2016-05-10 18:34:21 +02:00
Maximilian Grundke
87d4eb8b0d Let everyone see all comments and polish request for comments overview 2016-05-10 18:17:02 +02:00
Maximilian Grundke
aba6d56a87 Enable exercise forms to manipulate file creation flag 2016-05-10 17:14:07 +02:00
Maximilian Grundke
9fc974af20 Implement file name validation based on path, name, and filetype upon file creation 2016-05-10 16:03:52 +02:00
Maximilian Grundke
d97d92347c Fix typo 2016-05-07 15:06:47 +02:00
Ralf Teusner
af077d10c4 forgot to replace the name with the displayname... 2016-05-01 12:13:19 +02:00
Maximilian Grundke
c4405e24b9 Show question in overview 2016-04-30 13:57:23 +02:00
Maximilian Grundke
8ef615ffaa Correctly authorize comment deletion 2016-04-27 17:16:23 +02:00
Maximilian Grundke
57b773698b Fix comment policy 2016-04-26 17:42:53 +02:00
Maximilian Grundke
dcb05b9169 Fix testrun result for docker container depletion 2016-03-09 16:21:32 +01:00
Maximilian Grundke
087b2bdf93 Persist assessments in the testrun model 2016-03-09 14:49:44 +01:00
Maximilian Grundke
948de1ebb9 Order requests for comment 2016-03-02 17:07:16 +01:00
rteusner
ebdc5dcd6e Merge pull request #41 from leoselig/master
Import exercise meta data from CodeHarbour
2016-03-01 13:03:12 +01:00
Ralf Teusner
b31a5b37f4 renamed execute_websocket_command to open_websocket_connection, because we now run the command after all listeners in the submissions controller were attached 2016-03-01 11:34:07 +01:00
leo.selig
7cc612ddaf Deserialize exercises files in ProFormA-XML
- includes determining main file property via comment and template
  attributes in XML

(closes leoselig/codeocean#3)
2016-02-18 16:03:25 +01:00
leo.selig
773088798c Fix array to string cast error
- accidental trailing comma caused this (apparently that's a thing in
  Ruby...)
- cleaned up attribute assignments a little bit
  (persisted/validated/neither assignments)

(leoselig/codeocean#1)
2016-02-13 11:54:30 +01:00
leo.selig
f787445e5b Rename #import_thin_common_cartridge to #import_proforma_xml
- everywhere

(leoselig/codeocean#1)
2016-02-12 11:11:20 +01:00
leo.selig
1c3a1a6aab Authenticate action import_proforma_xml via OAuth2
- currently done manually, we should definitely consider a gem here
  (doorkeeper)
- right now, the provided Bearer token from the Authorization header is
  just looked up in the configured code harbor links of the current user,
  if one is found -> authenticated -> exercise gets imported

(leoselig/codeocean#1)
2016-02-12 11:11:09 +01:00
leo.selig
71dda088d1 Associate code harbor links with current user always
- this applies to creations and updates
- code harbor links are only every edited in the context of the
  authenticated user

(leoselig/codeocean#1)
2016-02-12 11:05:30 +01:00
leo.selig
68e74a9d85 Add association User has many CodeHarborLink
- add migration tht associates User with CodeHarborLink
- add belongs_to from CodeHarborLink to User
- changed CodeHarborLinkController#index to only serve current user's
  CodeHarborLinks

(leoselig/codeocean#2)
2016-02-04 12:38:46 +01:00
leo.selig
855abe25a6 Merge branch 'issue-1-codeharbor-endpoint' 2016-02-04 12:26:15 +01:00
leo.selig
f2a1a748d5 Replace CodeHarbourLink .erb wtih .slim templates
- this is consistent with the remaining view architecture

(leoselig/codeocean#2)
2016-02-04 12:06:59 +01:00
leo.selig
e534a8cb2d Add authorization to CodeHarborLink controller
(leoselig/codeocean#2)
2016-02-04 11:42:03 +01:00
leo.selig
ca9a9c7e85 Merge branch 'master' of https://github.com/openHPI/codeocean 2016-02-04 11:02:56 +01:00
leo.selig
76bf3dd3f0 Scaffold CodeHarbourLink with field oauth2token
(leoselig/codeocean#2)
2016-02-04 11:02:26 +01:00