Commit Graph

39 Commits

Author SHA1 Message Date
ca28e0aa87 updated rails from 4.1.13 to 4.2.5. This is required for rails to make use of new features in postgres 9.5
@Ralf
TODO: migration /Users/groucho/Documents/HPI/workspace/Xikolo-CodeOcean/codeocean/db/migrate/20160204111716_add_user_to_code_harbor_link.rb
is broken. A reference is made to table users which does not exist.
Workaround: run rake db:schema:load before running db:migrate. Still this should be fixed.
2016-12-31 00:05:23 +01:00
325ea25849 Replaced session[:lti_parameters] with proper LtiParameter object.
Removed all tests that would be failing

TODO: decision if all LtiParameter objects for a certain user/consumer will be deleted when the user/consumer is deleted from the session, or only the LtiParameter object for the current exercise of the user/consumer.

TODO: replace removed tests with proper tests
2016-12-30 09:45:39 +01:00
80e3453395 Merge branch 'master' into lti_param_model 2016-12-27 00:16:32 +01:00
f4c01879bf preparations to replace session with lti_parameters object 2016-12-27 00:13:41 +01:00
0a795b521f only show RFCs that have a question set 2016-12-19 18:30:06 +01:00
1511941d3d Merge branch 'master' into editor-frontend-refactor
Conflicts:
	codeocean-dockerconfig.md
2016-11-09 18:00:40 +01:00
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
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
e67f1f78c4 cleanup logging statements. 2016-09-09 14:11:38 +02:00
8f499b72da Feature: Auto-Completion in Source Code
+ allow flags for exercises
2016-09-07 17:34:20 +02:00
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
b0d468c0e0 remove rest of teams code -- NEED TO REMOVE TEAMS FROM DATABASE! 2016-06-30 12:17:19 +02:00
aba6d56a87 Enable exercise forms to manipulate file creation flag 2016-05-10 17:14:07 +02:00
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
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
f787445e5b Rename #import_thin_common_cartridge to #import_proforma_xml
- everywhere

(leoselig/codeocean#1)
2016-02-12 11:11:20 +01:00
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
855abe25a6 Merge branch 'issue-1-codeharbor-endpoint' 2016-02-04 12:26:15 +01:00
aa8870b8c8 Add endpoint for import (leoselig/codeocean#1)
- currently route is still named /thin_common_cartridge
- points to exercise controller for simplicity (open for discussion)
2016-02-04 09:28:50 +01:00
cb98f6d0fa Fix controller 2016-01-07 17:44:43 +01:00
e1e6eb04f4 Make user stats in exercise statistics faster 2016-01-07 17:01:47 +01:00
95ec5b0231 Routes, empty views and controller changes for statistics concerning external_users, exercises and external_users having exercises 2015-11-25 18:47:49 +01:00
10da12f950 option to hide the file tree in exercises. 2015-09-22 18:22:25 +02:00
cc400989ee added ids to new relic error messages 2015-04-24 18:12:42 +02:00
8697c8b23a Added mor new relic debugging 2015-04-23 18:14:20 +02:00
9c8d0b01eb Fix reset of tasks 2015-04-20 22:30:31 +02:00
4fe60d5f94 set correct user_id for internal users 2015-04-09 16:54:03 +02:00
b4679ebcbe merged qa into codeocean 2015-03-27 22:08:53 +01:00
c294e3b499 do not render the development environment for exercises without visible files 2015-03-21 18:46:02 +01:00
6ee0b6bf81 implemented partial batch update for exercises 2015-03-12 11:05:11 +01:00
acf03b1f51 added pagination for all resources 2015-03-11 16:13:45 +01:00
a8bda864df simplified some Active Record queries 2015-03-11 14:31:19 +01:00
a06e20b6c5 use eager loading to reduce the number of database queries 2015-03-11 14:24:24 +01:00
ae1d654a62 added the ability to customize the path for new files when implementing an exercise 2015-03-10 10:07:36 +01:00
1f5ed5b914 fixed broken exercise cloning 2015-02-21 10:05:00 +01:00
6d2b8e9acf reduced code complexity 2015-02-12 12:36:30 +01:00
a22a5af711 extracted common controller behavior in order to reduce code duplication 2015-02-05 12:28:09 +01:00
dd624b26c8 started implementing teams 2015-01-28 12:28:09 +01:00
4cbf9970b1 transferred Code Ocean from original repository to GitHub 2015-01-22 10:01:32 +01:00