Commit Graph

72 Commits

Author SHA1 Message Date
6151afcb55 some I18n, stop command for server send event code (score), updated readme 2015-10-16 17:06:23 +02:00
91cb2a3391 set correct newlines in output 2015-10-15 15:27:57 +02:00
6672491bc3 commented out translation to line breaks, as they seem not to be needed (and corrected the linebreak tag), thanks to martin for hinting at this. Discuss with janusch why he needed this. 2015-09-25 12:19:13 +02:00
632b41da23 editor has an option whether it should remember the last used tab and show it, or whether it should display the first tab. currently, it shows the first tab. (as users whished for this behaviour) 2015-09-25 12:13:08 +02:00
caf47a9251 correct tab shortcuts (following the removal of the introduction tab) 2015-09-25 12:11:17 +02:00
13be0f65dd Improve error and output handling
Display websocket and container status messages as well as line feeds
to the user.
2015-09-16 19:14:36 +02:00
e6eeebfd4b Filter and colour output, handle exit properly 2015-09-15 19:34:22 +02:00
c8253a6ba0 Manually merge changes from webpython branch. 2015-09-15 16:55:16 +02:00
1dab25b636 fixed broken merge... 2015-08-31 19:43:16 +02:00
67b0c9a930 Merge branch 'master' into rt/comments
Conflicts:
	app/assets/javascripts/editor.js
2015-08-31 19:34:49 +02:00
5650cf25b6 some bugfixes concerning comments, add first code for learning analytics 2015-08-31 19:33:03 +02:00
e14ee6def3 Merge branch 'master' into rt/comments
Conflicts:
	app/assets/javascripts/editor.js
2015-08-31 19:23:53 +02:00
43d2428ca1 some bugfixes concerning comments, add first code for learning analytics 2015-08-31 19:19:19 +02:00
73d01df9b7 copy and paste detection, + some cleanup 2015-08-27 17:38:42 +02:00
dc0b3a2294 cleanup of passed parameters, user_id and user_type are extracted from current user and not used from the passed POST values.. 2015-08-19 15:35:25 +02:00
e520914385 Some correction of column names.
Support for internal as well as external users. Added column user_type and used it where necessary
2015-08-18 17:44:31 +02:00
aa64d0be43 Merge remote-tracking branch 'origin/master' into rt/comments 2015-08-13 15:57:20 +02:00
b4527aef50 implemented autosave, save button is now hidden. there is a label to show the last save timestamp. Code is saved on browser close. 2015-08-12 17:38:34 +02:00
e49f0dc063 hide run success message, adjust wording of locales for run success and run failure (run_success, run_failure) 2015-08-07 16:13:35 +02:00
eec5832a65 allow requesting comments only once per submission 2015-08-04 15:16:06 +02:00
c67c6e38f7 Merge branch 'master' into rt/comments
Conflicts:
	app/views/exercises/_editor_file_tree.html.slim
2015-07-16 15:19:31 +02:00
1d93e854f0 Merge branch 'master' of github.com:openHPI/codeocean 2015-07-16 15:10:59 +02:00
81d2d69d11 Display request for comments button if we are working on a non binary submission. Introduced needed data attributes for that and assigned them to the frame (instead of the editor). Data Attributes get updated by the CreateSubmissionCallback. Adjusted comment checks to also use the attributes of the frame. 2015-07-09 12:03:03 +02:00
a49ffc978b only allow comments on submissions, not on templates 2015-06-26 18:25:03 +02:00
283bfb38d6 Merge branch 'master' into rt/comments 2015-06-26 10:59:45 +02:00
04a22392b6 some cleanup 2015-06-26 10:59:12 +02:00
8ad787b3fc check whether QaApi is defined before accessing it to prevent page load failure 2015-06-25 11:42:28 +02:00
3e04222367 setting correct ids for the files in the editor after creating a new submission. Still a bit clumsy concerning the passed json parameters, but does the job. 2015-06-24 20:22:53 +02:00
4fa8f811cf internationalization and feedback for RFC button 2015-05-05 11:23:31 +02:00
cf19dfa7a2 Matrix Support 2015-04-30 18:22:20 +02:00
892c36921d Add depleted message on more more position 2015-04-20 17:26:10 +02:00
99226207a3 fix indention 2015-04-17 12:57:29 +02:00
ba50ed0b81 Working on non streaming output mode 2015-04-17 12:50:48 +02:00
940eee5856 Show warning if all containers are depleted. 2015-04-15 17:17:39 +02:00
172ca91329 bugfixes, policies, errors now have a link to the submissions 2015-04-10 20:23:38 +02:00
e6f65dd853 some semicolons 2015-04-08 16:55:50 +02:00
d601878452 Show editor for code commenting, and allow commenting as well 2015-03-28 18:39:55 +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
b8ec3edef2 Show requests for comments and begin work on a view for executing them 2015-03-27 18:10:47 +01:00
de154a6f66 remove broken refactoring 2015-03-27 15:12:19 +01:00
ca63415533 Finalize merge of commenting functionality 2015-03-27 12:20:53 +01:00
e31675f136 Commit just for you, Ralf :) 2015-03-27 10:32:10 +01:00
780f6a4fa6 show flash message if permitted execution time is exceeded during test execution 2015-03-27 09:41:58 +01:00
49f5ab061a added button state for files which no actions are available for 2015-03-21 12:40:58 +01:00
5ec0a82157 provide the leaner with information regarding exposed ports 2015-03-19 18:14:54 +01:00
9d6b79c919 replaced Glyphicon icons by Font Awesome icons 2015-03-18 10:19:39 +01:00
e52150651c close the stream in case of SSE errors 2015-03-14 13:30:33 +01:00
814f0c9844 minor improvement 2015-03-14 12:50:45 +01:00