Ralf Teusner
|
1dab25b636
|
fixed broken merge...
|
2015-08-31 19:43:16 +02:00 |
|
Ralf Teusner
|
67b0c9a930
|
Merge branch 'master' into rt/comments
Conflicts:
app/assets/javascripts/editor.js
|
2015-08-31 19:34:49 +02:00 |
|
Ralf Teusner
|
5650cf25b6
|
some bugfixes concerning comments, add first code for learning analytics
|
2015-08-31 19:33:03 +02:00 |
|
Ralf Teusner
|
e14ee6def3
|
Merge branch 'master' into rt/comments
Conflicts:
app/assets/javascripts/editor.js
|
2015-08-31 19:23:53 +02:00 |
|
Ralf Teusner
|
43d2428ca1
|
some bugfixes concerning comments, add first code for learning analytics
|
2015-08-31 19:19:19 +02:00 |
|
Ralf Teusner
|
73d01df9b7
|
copy and paste detection, + some cleanup
|
2015-08-27 17:38:42 +02:00 |
|
Ralf Teusner
|
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 |
|
Ralf Teusner
|
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 |
|
Ralf Teusner
|
aa64d0be43
|
Merge remote-tracking branch 'origin/master' into rt/comments
|
2015-08-13 15:57:20 +02:00 |
|
Ralf Teusner
|
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 |
|
Ralf Teusner
|
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 |
|
Ralf Teusner
|
eec5832a65
|
allow requesting comments only once per submission
|
2015-08-04 15:16:06 +02:00 |
|
Ralf Teusner
|
c67c6e38f7
|
Merge branch 'master' into rt/comments
Conflicts:
app/views/exercises/_editor_file_tree.html.slim
|
2015-07-16 15:19:31 +02:00 |
|
Felix Wolff
|
1d93e854f0
|
Merge branch 'master' of github.com:openHPI/codeocean
|
2015-07-16 15:10:59 +02:00 |
|
Ralf Teusner
|
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 |
|
Ralf Teusner
|
a49ffc978b
|
only allow comments on submissions, not on templates
|
2015-06-26 18:25:03 +02:00 |
|
Ralf Teusner
|
283bfb38d6
|
Merge branch 'master' into rt/comments
|
2015-06-26 10:59:45 +02:00 |
|
Ralf Teusner
|
04a22392b6
|
some cleanup
|
2015-06-26 10:59:12 +02:00 |
|
Ralf Teusner
|
8ad787b3fc
|
check whether QaApi is defined before accessing it to prevent page load failure
|
2015-06-25 11:42:28 +02:00 |
|
Ralf Teusner
|
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 |
|
Felix Wolff
|
4fa8f811cf
|
internationalization and feedback for RFC button
|
2015-05-05 11:23:31 +02:00 |
|
Jan Renz
|
cf19dfa7a2
|
Matrix Support
|
2015-04-30 18:22:20 +02:00 |
|
Jan Renz
|
892c36921d
|
Add depleted message on more more position
|
2015-04-20 17:26:10 +02:00 |
|
Jan Renz
|
99226207a3
|
fix indention
|
2015-04-17 12:57:29 +02:00 |
|
Jan Renz
|
ba50ed0b81
|
Working on non streaming output mode
|
2015-04-17 12:50:48 +02:00 |
|
Jan Renz
|
940eee5856
|
Show warning if all containers are depleted.
|
2015-04-15 17:17:39 +02:00 |
|
Ralf Teusner
|
172ca91329
|
bugfixes, policies, errors now have a link to the submissions
|
2015-04-10 20:23:38 +02:00 |
|
Ralf Teusner
|
e6f65dd853
|
some semicolons
|
2015-04-08 16:55:50 +02:00 |
|
Felix Wolff
|
d601878452
|
Show editor for code commenting, and allow commenting as well
|
2015-03-28 18:39:55 +01:00 |
|
Nicholas Wittstruck
|
b4679ebcbe
|
merged qa into codeocean
|
2015-03-27 22:08:53 +01:00 |
|
Nicholas Wittstruck
|
bad98cca1d
|
merged qa into codeocean
|
2015-03-27 21:27:40 +01:00 |
|
Felix Wolff
|
db1b94dcf0
|
Merge remote-tracking branch 'upstream/master'
|
2015-03-27 18:15:35 +01:00 |
|
Felix Wolff
|
b8ec3edef2
|
Show requests for comments and begin work on a view for executing them
|
2015-03-27 18:10:47 +01:00 |
|
Felix Wolff
|
de154a6f66
|
remove broken refactoring
|
2015-03-27 15:12:19 +01:00 |
|
Felix Wolff
|
ca63415533
|
Finalize merge of commenting functionality
|
2015-03-27 12:20:53 +01:00 |
|
Felix Wolff
|
e31675f136
|
Commit just for you, Ralf :)
|
2015-03-27 10:32:10 +01:00 |
|
Hauke Klement
|
780f6a4fa6
|
show flash message if permitted execution time is exceeded during test execution
|
2015-03-27 09:41:58 +01:00 |
|
Hauke Klement
|
49f5ab061a
|
added button state for files which no actions are available for
|
2015-03-21 12:40:58 +01:00 |
|
Hauke Klement
|
5ec0a82157
|
provide the leaner with information regarding exposed ports
|
2015-03-19 18:14:54 +01:00 |
|
Hauke Klement
|
9d6b79c919
|
replaced Glyphicon icons by Font Awesome icons
|
2015-03-18 10:19:39 +01:00 |
|
Hauke Klement
|
e52150651c
|
close the stream in case of SSE errors
|
2015-03-14 13:30:33 +01:00 |
|
Hauke Klement
|
814f0c9844
|
minor improvement
|
2015-03-14 12:50:45 +01:00 |
|
Hauke Klement
|
b28c95b2c7
|
warn in case of lacking client-side SSE support
|
2015-03-14 12:32:52 +01:00 |
|
Hauke Klement
|
ebc06c09db
|
moved method
|
2015-03-14 12:25:53 +01:00 |
|
Hauke Klement
|
4a14e93d2c
|
minor improvement
|
2015-03-14 12:23:14 +01:00 |
|
Hauke Klement
|
ca7679cb2d
|
extracted method
|
2015-03-11 17:30:29 +01:00 |
|
Hauke Klement
|
c811e1a78f
|
minor improvements for progress bars
|
2015-03-11 10:12:14 +01:00 |
|
Hauke Klement
|
a62253e21c
|
fix
|
2015-03-09 18:01:04 +01:00 |
|
Hauke Klement
|
dce400225f
|
fixed broken text input
|
2015-03-07 16:20:12 +01:00 |
|
Hauke Klement
|
64365025dc
|
minor improvements
|
2015-03-07 16:13:20 +01:00 |
|