zmagod
0ca65aeca5
fixed step comment sorting
2016-09-20 13:31:50 +02:00
zmagod
f48553e807
fixed ajax call
2016-09-19 16:12:07 +02:00
zmagod
938aa32190
js tweaks
2016-09-16 15:22:24 +02:00
zmagod
691ae94d2c
enabled to delete results in task archive [fixes SCI-370]
2016-09-13 13:26:04 +02:00
zmagod
1b31f8827d
set experiment description to 255
2016-09-08 14:35:52 +02:00
Zmago Devetak
1368716aa0
Merge pull request #130 from ZmagoD/zd_SCI_348
...
project overview - updating (or creating new) experiment details
2016-09-08 12:49:35 +02:00
zmagod
b672d85405
fixed error message duplication
2016-09-06 11:46:28 +02:00
Matej Zrimšek
9fb30c7661
Fixes files deletion when rails worker is running [fixes SCI-411] and fixes picture's style files deletion.
2016-09-06 10:40:01 +02:00
Mojca Lorber
740392c687
optimization
2016-09-05 10:58:37 +02:00
Mojca Lorber
4bce00ac61
fixes hound
2016-09-02 11:54:20 +02:00
Mojca Lorber
83034f705d
adds tasks, experiment and project category in protocol search results
2016-09-02 11:45:54 +02:00
Zmago Devetak
5b4eb07960
Merge pull request #118 from ZmagoD/zd_SCI_398
...
fixes workflow img bug [fixes SCI-398]
2016-08-30 14:55:33 +02:00
zmagod
a947354fb5
fixes update times [fixes SCI-398]
2016-08-30 13:23:48 +02:00
Luka Murn
2b382fee0f
Merge pull request #113 from Ducz0r/lm-add-first-time-activities
...
Fix first time data generator & fake data generator
2016-08-30 13:07:52 +02:00
Luka Murn
0e0228cb8c
Codestyle fixes
2016-08-30 13:06:49 +02:00
zmagod
95ab35e3d6
cleanup update timestamp
2016-08-30 12:58:52 +02:00
Luka Murn
c86d21d689
Fix bug in organization.rb
...
Bug was related to introduction of experiment level.
2016-08-30 09:46:54 +02:00
zmagod
17aacc8ff5
fixes step destroing bug and fixes reports [fixes SCI-247]
2016-08-29 12:04:46 +02:00
Matej Zrimšek
e3a7f45fdf
Merge branch 'master' into mz_file_upload_and_client_side_upgrade
...
Conflicts:
app/assets/javascripts/application.js
app/views/results/_result_asset.html.erb
app/views/steps/_step.html.erb
2016-08-26 11:13:40 +02:00
Matej Zrimšek
04d9163ff6
Paperclip file spoofing corrected/modified.
2016-08-25 18:57:06 +02:00
Luka Murn
a480c8d403
Styling fixes
2016-08-25 13:59:50 +02:00
Luka Murn
b0d7b9dc75
Generate activities when editing/deleting comments
2016-08-25 13:51:31 +02:00
Luka Murn
24dd25d9f5
Add edit/delete result comment functionality
...
Lessons learned during this fix:
Don't use dependant: :destroy on both ends of association
between 2 ActiveRecords, or you will run into stack overflow.
2016-08-25 13:51:31 +02:00
Luka Murn
9e3bb8edb7
Add dependant: :destroy to comments
2016-08-25 13:51:30 +02:00
Zmago Devetak
0de7ea31ea
Merge pull request #90 from ZmagoD/zd_SCI_376
...
fixes cloned experiment protocol [fixes SCI-376]
2016-08-24 14:12:19 +02:00
Jure Grabnar
00da7efb44
Merge remote-tracking branch 'origin/jg_SCI_328_moving_workflows'
...
Conflicts:
app/models/experiment.rb
SCI-328 #close
2016-08-24 13:11:10 +02:00
Jure Grabnar
dff5abf3d9
Fix module moving position not being updated
2016-08-24 11:42:21 +02:00
zmagod
2bbb439745
fixes cloned experiment protocol [fixes SCI-376]
2016-08-23 16:15:45 +02:00
Jure Grabnar
67768c8865
Fix Hound errors
2016-08-23 11:08:10 +02:00
Jure Grabnar
358f2b1c47
Add moving for newly created modules
2016-08-23 10:00:34 +02:00
Jure Grabnar
c0edf51054
Fix bounding box algorithm, can move new modules
2016-08-23 09:00:25 +02:00
Jure Grabnar
8940ba891b
Add initial position for moving workflows
2016-08-22 17:52:55 +02:00
zmagod
cac5033eba
set ajax for workflow img
2016-08-19 15:36:12 +02:00
Jure Grabnar
80498260e5
Add backend for moving task from canvas
2016-08-19 13:53:43 +02:00
Jure Grabnar
f575303d11
Update get_new_position for new canvas size
...
SCI-358 #close
2016-08-19 13:42:28 +02:00
Zmago Devetak
58930f3456
Merge pull request #73 from ZmagoD/zd_SCI_344
...
fixes user duplication [fixes SCI-344]
2016-08-18 13:28:59 +02:00
zmagod
2216a86db5
hound again
2016-08-18 13:27:46 +02:00
zmagod
d3f61bdd18
fixes hound alert
2016-08-18 13:24:44 +02:00
zmagod
4b5be7530c
fixed task archive
2016-08-18 11:53:57 +02:00
zmagod
da2b9ccf82
fixes user duplication [fixes SCI-344]
2016-08-18 11:26:52 +02:00
zmagod
fa08b861d0
fixed experiments archive bug
2016-08-18 10:55:29 +02:00
Zmago Devetak
b6ccecf478
Merge pull request #69 from ZmagoD/zd_SCI_335
...
cleans experiment form report if moved [fixes SCI-335]
2016-08-18 08:37:09 +02:00
Zmago Devetak
f2e08db106
Merge pull request #67 from ZmagoD/zd_SCI_337
...
Zd sci 337
2016-08-18 08:06:38 +02:00
Matej Zrimšek
4ad384df5a
Fixed hound alerts.
2016-08-17 21:02:05 +02:00
Matej Zrimšek
27a9dac412
File permissions corrected, with some refactoring.
2016-08-17 18:23:24 +02:00
Matej Zrimšek
e4a6a3944e
Added deleting of files on S3 server when editing/removing a file. Some refactoring.
2016-08-17 18:13:35 +02:00
Matej Zrimšek
854ef0d227
Special characters caused error [fixes SCI-315].
2016-08-17 18:10:47 +02:00
Matej Zrimšek
951cf67b3d
A lot of file uploading edge cases considered. File uploading is now actually redirected to S3 server, as before was not. Error functions changed and error output format specified, which should be used consistently throughout the application. Some other refactoring.
2016-08-17 18:08:21 +02:00
zmagod
c27c6c19e5
cleans experiment form report if moved [fixes SCI-335]
2016-08-17 15:21:53 +02:00
zmagod
6c5cc8aac9
fixes notification [fixes SCI-337]
2016-08-17 13:17:40 +02:00