b66e9fc05d
Add Testrun to schema
2016-03-02 14:52:39 +01:00
551552279b
Update schema.rb
2016-03-02 12:17:20 +01:00
f17ae9ad2f
Merge remote-tracking branch 'origin/master' into statistics
2016-03-02 12:01:16 +01:00
7dee100665
Hide actions that are not available to teachers
2016-03-02 11:55:26 +01:00
da3339ecbb
Hide file types, execution environments, and teams from teachers
2016-03-02 10:57:13 +01:00
ebdc5dcd6e
Merge pull request #41 from leoselig/master
...
Import exercise meta data from CodeHarbour
2016-03-01 13:03:12 +01:00
ed63a9dfd8
accidentially added websocket_gem on master branch. This commit removes it again.
2016-03-01 11:39:41 +01:00
fe37cdce77
Merge branch 'master' of https://github.com/openHPI/codeocean
2016-03-01 11:34:59 +01:00
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
b269a738f5
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:30:03 +01:00
94c31e35a4
Some comments and cleanup of exercise.rb percentage calculation
2016-03-01 11:14:53 +01:00
0a5301a595
Make statistics teacher-safe
2016-02-24 14:23:15 +01:00
1c5cf0facb
Deserialize feedback message
...
- this fixes the validation error for test files
(leoselig/codeocean#4 )
2016-02-18 18:32:03 +01:00
f8c5d2ad96
Serialize test files from ProFormA-XML
...
(leoselig/codeocean#4 )
2016-02-18 17:26:29 +01: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
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
943355d9c7
Add #from_proforma_xml to exercise (only meta data import)
...
- method only considers title and description for now
- sets up relation to execution environment with id 1, just to pass
validation for now
(leoselig/codeocean#1 )
2016-02-12 11:05:14 +01:00
5a190c0c79
Fix wrong belongs_to :user
...
- because of polymorphic user model this didn't work
- changed to :internal_user because that's anyway the only type of user we
want to impoprt from
(leoselig/codeocean#1 )
2016-02-12 10:57:44 +01:00
63502831aa
Change forgotten schema.rb
...
(leoselig/codeocean#2 )
2016-02-04 13:34:55 +01:00
c3df7ff482
Remove empty .coffee file
...
- was scaffolded
(leoselig/codeocean#2 )
2016-02-04 13:34:18 +01:00
aee5585189
Change German i18n "CodeHarbor-Verknüpfung(en)" to "...Link(s)"
...
(leoselig/codeocean#2 )
2016-02-04 13:32:50 +01:00
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
855abe25a6
Merge branch 'issue-1-codeharbor-endpoint'
2016-02-04 12:26:15 +01:00
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
057b19cf2a
Translate CodeHarbor links (en/de)
...
- model name (singular/plural)
- attribute oauth2token
(leoselig/codeocean#2 )
2016-02-04 11:57:54 +01:00
c947bbf152
Add CodeHarbor links to administation navigation
...
(leoselig/codeocean#2 )
2016-02-04 11:43:27 +01:00
e534a8cb2d
Add authorization to CodeHarborLink controller
...
(leoselig/codeocean#2 )
2016-02-04 11:42:03 +01:00
4ebaee8931
Add working time delta for each submission
2016-02-04 11:36:00 +01:00
ca9a9c7e85
Merge branch 'master' of https://github.com/openHPI/codeocean
2016-02-04 11:02:56 +01:00
76bf3dd3f0
Scaffold CodeHarbourLink with field oauth2token
...
(leoselig/codeocean#2 )
2016-02-04 11:02:26 +01:00
92f6c7a06f
Revert "Add CodeHarborLink controller"
...
This reverts commit b5b8b3ab68leoselig/codeocean#2 )
2016-02-04 11:02:11 +01:00
b5b8b3ab68
Add CodeHarborLink controller
...
(leoselig/codeocean#2 )
2016-02-04 10:28:13 +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
d343e74287
Add sorting to external user statistics table
2016-01-28 17:52:34 +01:00
491bcc9bde
Merge pull request #40 from openHPI/statistics
...
Statistics
2016-01-28 16:35:58 +01:00
d1ece64ee3
Link user "profile" to their statistics
2016-01-28 14:51:57 +01:00
4ee474a7d2
Speed up external user statistics
2016-01-28 14:46:25 +01:00
de84638979
Try to re-combine websocket message chunks containing an image tag.
2016-01-27 16:42:25 +01:00
61426e8f2e
uncomment some logging, and recreate folder for local workspace path in the docker client.
2016-01-27 15:49:38 +01:00
ecad5b80fa
re-enable data submission via shared folders.
2016-01-27 10:16:13 +01:00
898074be3f
Added render command, outputs the content in a div.
2016-01-26 14:26:18 +01:00
825a975921
Merge pull request #38 from openHPI/statistics
...
Statistics
2016-01-25 11:25:44 +01:00
2a1862f39a
Merge branch 'master' into statistics
2016-01-25 11:22:58 +01:00
8edb70cddc
Merge pull request #37 from openHPI/docker-file-copy
...
instead of relying on shared folders, use docker api archive function…
2016-01-25 11:21:23 +01:00
f53457644c
just remove subfolders of CONTAINER_WORKSPACE_PATH, do not create target folder manually.
2016-01-25 11:19:56 +01:00
d1e0f31963
uncomment sleep 1000
2016-01-25 11:10:41 +01:00
113f765246
docker_client file copy work in progress
2016-01-25 11:07:52 +01:00
