Luka Murn
|
42f7b4f68d
|
Hound is love, Hound is life
|
2017-06-07 18:22:15 +02:00 |
|
Luka Murn
|
02dd6636ba
|
Allow saving & editing of reports with repository elements
Closes SCI-1279.
|
2017-06-07 16:55:00 +02:00 |
|
Luka Murn
|
b5f6d1da94
|
Allow custom repositories to be added to reports
|
2017-06-07 16:54:32 +02:00 |
|
Oleksii Kriuchykhin
|
c18bba9fbe
|
Fix rebase errors [SCI-1274]
|
2017-06-07 15:50:22 +02:00 |
|
Oleksii Kriuchykhin
|
ad8dd6d740
|
PR fixes [SCI-1274]
|
2017-06-07 15:23:25 +02:00 |
|
Oleksii Kriuchykhin
|
8b1190060e
|
Add custom repository table [SCI-1274]
|
2017-06-07 15:23:25 +02:00 |
|
Zmago Devetak
|
fcec42ae31
|
Merge pull request #645 from ZmagoD/zd_SCI_1278
generates samples csv file in background job [fixes SCI-1278]
|
2017-06-07 15:04:24 +02:00 |
|
zmagod
|
353c27da15
|
rename method
|
2017-06-07 13:51:16 +02:00 |
|
zmagod
|
c6bb20039b
|
adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285]
|
2017-06-07 13:29:39 +02:00 |
|
Mojca Lorber
|
51c4eeb106
|
renaming
|
2017-06-06 15:50:43 +02:00 |
|
Mojca Lorber
|
dde714d78f
|
fix hound
|
2017-06-06 13:33:57 +02:00 |
|
Mojca Lorber
|
39dda1ad5d
|
refactoring
|
2017-06-06 13:18:44 +02:00 |
|
Mojca Lorber
|
acdea2198d
|
code changes after rebasing
|
2017-06-06 11:10:55 +02:00 |
|
Mojca Lorber
|
da98788031
|
small code fixes
|
2017-06-06 09:57:50 +02:00 |
|
Mojca Lorber
|
13bf4ad229
|
create new repository
|
2017-06-06 09:54:39 +02:00 |
|
Matej Zrimšek
|
afce3010ef
|
After repository deletion, the next selected repository is the first one. [SCI-1269]
|
2017-06-05 17:56:09 +02:00 |
|
Matej Zrimšek
|
419d638163
|
Renamed reposiotry edit and destroy permission helper. [fix 1269]
|
2017-06-05 17:36:26 +02:00 |
|
Matej Zrimšek
|
f012779780
|
Renamed before_action for repository edit and destroy action. [fix 1269]
|
2017-06-05 10:02:16 +02:00 |
|
Matej Zrimšek
|
d8d54232c3
|
After repository renaming user is redirected to the same repository. Removed the unimplemented repository copy dropdown option. [SCI-1269]
|
2017-06-02 19:08:51 +02:00 |
|
Matej Zrimšek
|
73aaef0949
|
Fixe repository rename modal submit button. Consistent variable renaming. [SCI-1269]
|
2017-06-02 17:52:04 +02:00 |
|
Matej Zrimšek
|
5c9a453439
|
Added permissions for deleting and renaming of repositories. [SCI-1269]
|
2017-06-02 17:50:34 +02:00 |
|
Matej Zrimšek
|
21a72da84f
|
Added rename logic and improved remove logic. [SCI-1269]
|
2017-06-02 17:50:34 +02:00 |
|
Matej Zrimšek
|
cdaac6a01b
|
Added remove repository modal logic. [SCI-1269]
|
2017-06-02 17:50:33 +02:00 |
|
Matej Zrimšek
|
791bb934ca
|
Remove repository modal logic (WIP). [SCI-1269]
|
2017-06-02 17:50:33 +02:00 |
|
zmagod
|
1c021b11db
|
adds drag and drop files upload to steps [fixes SCI-1310]
|
2017-06-02 16:34:09 +02:00 |
|
Luka Murn
|
fcc3995049
|
Merge pull request #647 from biosistemika/master
Bring latest master changes into custom-repositories
|
2017-05-30 14:18:14 +02:00 |
|
zmagod
|
b527afd12b
|
generates samples csv file in background job [fixes SCI-1278]
|
2017-05-29 14:42:55 +02:00 |
|
mz3944
|
d83dcac894
|
Merge pull request #642 from mz3944/mz-SCI-1291
Fixed permission error while cloning workflows. [fixes SCI-1291]
|
2017-05-29 09:53:33 +02:00 |
|
Matej Zrimšek
|
853096634d
|
Fixed permission error while cloning workflows. [fixes SCI-1291]
|
2017-05-26 11:14:50 +02:00 |
|
Mojca Lorber
|
8540f88b7e
|
small fix - renaming of ids and hrefs
|
2017-05-25 10:06:48 +02:00 |
|
Oleksii Kriuchykhin
|
7310763184
|
Add missing include [SCI-1306]
|
2017-05-25 08:57:50 +02:00 |
|
mlorb
|
872f712be8
|
Merge branch 'custom-repositories' into ml_sci_1266_v2
|
2017-05-23 11:05:25 +02:00 |
|
mz3944
|
6b8c8deb16
|
Merge pull request #634 from mz3944/mz-SCI-414
Uncompleted steps not added to Reports
|
2017-05-23 09:58:05 +02:00 |
|
mz3944
|
9fe3b717c8
|
Merge pull request #626 from mz3944/mz-SCI-487
Simplify "Add contents to report" popup
|
2017-05-23 09:57:39 +02:00 |
|
Mojca Lorber
|
9ae615264d
|
add global repositories screen - tab control
|
2017-05-22 17:54:30 +02:00 |
|
Oleksii Kriuchykhin
|
e99e3edb7b
|
Add repositories dropdown to task navigation [SCI-1273]
|
2017-05-18 14:21:00 +02:00 |
|
Matej Zrimšek
|
20265ddd69
|
Readded result content modal for report creation and updated checkbox hierarchy logic accordingly. [fixes SCI-487]
|
2017-05-17 18:18:57 +02:00 |
|
Matej Zrimšek
|
f78c80b148
|
Added possibility to add uncompleted steps to report. [closes SCI-414]
|
2017-05-17 13:25:21 +02:00 |
|
Oleksii Kriuchykhin
|
f28df506f9
|
Fix bug in counting search results for assets [SCI-1284]
|
2017-05-17 09:08:40 +02:00 |
|
Matej Zrimšek
|
ba693c65a8
|
Fixed adding contents to report logic and removed unneeded code. [fixes SCI-487]
|
2017-05-15 18:20:42 +02:00 |
|
Zmago Devetak
|
39203a16f4
|
Merge pull request #622 from ZmagoD/zd_SCI_1261
fixes remove user action on project [fixes SCI-1261]
|
2017-05-15 15:28:39 +02:00 |
|
Zmago Devetak
|
a151bbdd7d
|
Merge pull request #623 from ZmagoD/zd_SCI_974
adds persistence to experiments order in project overview [fixes SCI-…
|
2017-05-15 15:28:18 +02:00 |
|
okriuchykhin
|
16325db1c6
|
Merge pull request #621 from okriuchykhin/ok_SCI_1263
Fix sorting in reports [SCI-1263]
|
2017-05-15 09:57:35 +02:00 |
|
zmagod
|
c35e2a4860
|
adds persistence to experiments order in project overview [fixes SCI-974]
|
2017-05-15 09:54:37 +02:00 |
|
okriuchykhin
|
8e523782d9
|
Merge pull request #619 from okriuchykhin/ok_SCI_617
Fixes error when cloning experiments with long names [SCI-617]
|
2017-05-12 16:53:38 +02:00 |
|
okriuchykhin
|
a8bbc3c3ba
|
Merge pull request #615 from okriuchykhin/ok_SCI_1008
Fix task and step ordering in reports [SCI-1008]
|
2017-05-12 16:44:57 +02:00 |
|
zmagod
|
b6367981c7
|
fixes remove user action on project [fixes SCI-1261]
|
2017-05-12 16:18:53 +02:00 |
|
Oleksii Kriuchykhin
|
5a2d618b1d
|
Fix sorting in reports [SCI-1263]
|
2017-05-12 16:04:19 +02:00 |
|
Oleksii Kriuchykhin
|
79efb34191
|
Fixes error when clonning experiments with long names [SCI-617]
|
2017-05-12 11:07:11 +02:00 |
|
Zmago Devetak
|
0dc4addd6c
|
fix typo
|
2017-05-12 10:10:50 +02:00 |
|
Oleksii Kriuchykhin
|
bb8c7c342c
|
Add additional info to samples info modal [SCI-960]
|
2017-05-11 22:20:06 +02:00 |
|
Oleksii Kriuchykhin
|
0ef9c7eff6
|
Fix task ordering in reports [SCI-1008]
|
2017-05-11 15:30:19 +02:00 |
|
okriuchykhin
|
ab0d882be1
|
Merge pull request #614 from okriuchykhin/ok_SCI_1254
Fix step actions in reports [SCI-1254]
|
2017-05-11 14:44:36 +02:00 |
|
Zmago Devetak
|
9911c0d148
|
Merge pull request #613 from ZmagoD/zd_SCI_1241_v3
replace all ActionController::Base.helpers.sanitize calls with custom…
|
2017-05-11 14:30:26 +02:00 |
|
Oleksii Kriuchykhin
|
fe134419a3
|
Fix step actions in reports [SCI-1254]
|
2017-05-11 13:51:43 +02:00 |
|
okriuchykhin
|
328c9292b1
|
Merge pull request #606 from okriuchykhin/ok_SCI_1235
Fix error messages display during file upload in steps and results [SCI-1235]
|
2017-05-11 13:00:36 +02:00 |
|
zmagod
|
80a0af8c9f
|
replace all ActionController::Base.helpers.sanitize calls with custom sanitize_input method [fixes SCI-1241]
|
2017-05-11 11:36:47 +02:00 |
|
zmagod
|
2081e0a94b
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into release-1.10.1
|
2017-05-10 15:14:17 +02:00 |
|
Zmago Devetak
|
ff0f85fce8
|
Merge pull request #592 from ZmagoD/zd_SCI_160
removes TempFile after 7 days [fixes SCI-160]
|
2017-05-10 09:32:18 +02:00 |
|
Oleksii Kriuchykhin
|
52ad5ecdc2
|
Fix error messages display during file upload in steps and results [SCI-1235]
|
2017-05-09 17:13:47 +02:00 |
|
zmagod
|
04ee24d553
|
refactor
|
2017-05-09 14:05:21 +02:00 |
|
okriuchykhin
|
ccc640f2bc
|
Merge pull request #593 from okriuchykhin/ok_SCI_1158
Add advanced search options [SCI-1158]
|
2017-05-09 10:23:34 +02:00 |
|
okriuchykhin
|
bd0b930382
|
Merge pull request #598 from okriuchykhin/ok_SCI_152
Add counters for users and comments on canvas [SCI-152]
|
2017-05-09 10:22:53 +02:00 |
|
Oleksii Kriuchykhin
|
7a61f5813c
|
Add comments to the code [SCI-152]
|
2017-05-09 10:22:01 +02:00 |
|
Oleksii Kriuchykhin
|
bd5a48b9c8
|
Improve code style [SCI-1158]
|
2017-05-08 18:00:14 +02:00 |
|
Oleksii Kriuchykhin
|
344b9c290a
|
Add counters for users and comments on canvas [SCI-152]
|
2017-05-08 17:32:55 +02:00 |
|
Zmago Devetak
|
4b816f5322
|
Merge pull request #568 from ZmagoD/zd_SCI_1119
Add images to fields with rich text formatting
|
2017-05-08 13:06:58 +02:00 |
|
zmagod
|
d6f303581f
|
refactor
|
2017-05-08 12:56:33 +02:00 |
|
ajugo
|
2973ead765
|
Missing files, comments, checklist in steps [fixes SCI-1224] (#591)
* Missing files, comments, checklist in steps [fixes SCI-1224]
* Code fixes
|
2017-05-08 10:44:15 +02:00 |
|
Oleksii Kriuchykhin
|
0ee7e11620
|
Add advanced search options [SCI-1158]
|
2017-05-05 16:41:23 +02:00 |
|
zmagod
|
f079a097c5
|
removes TempFile after 7 days [fixes SCI-160]
|
2017-05-05 14:54:22 +02:00 |
|
Zmago Devetak
|
f3415abe3e
|
Merge pull request #587 from ZmagoD/zd_SCI_1233
fixes bug with empty checklist item [fixes SCI-1233]
|
2017-05-05 10:11:52 +02:00 |
|
zmagod
|
f784844472
|
fixes bug with empty checklist item [fixes SCI-1233]
|
2017-05-04 16:15:00 +02:00 |
|
zmagod
|
8d0c22327b
|
adds asc order to checklists [fixes SCI-1228]
|
2017-05-04 15:17:34 +02:00 |
|
zmagod
|
acc5594f1b
|
add popup for approval to complete the Task [fixes SCI-1200]
|
2017-05-04 12:41:22 +02:00 |
|
zmagod
|
5b58824ec0
|
refactor
|
2017-05-03 15:30:08 +02:00 |
|
Zmago Devetak
|
cc6c2942c2
|
Merge pull request #574 from ZmagoD/zd_SCI_1194_v2
prevent to get nil as a param in checklist_item_annotation method [fi…
|
2017-05-03 10:56:21 +02:00 |
|
zmagod
|
d5abb52909
|
refactor
|
2017-05-03 10:55:11 +02:00 |
|
Oleksii Kriuchykhin
|
cf7d0ea248
|
Fix dowloand of export zip files from local storage [SCI-1128]
|
2017-04-26 13:23:30 +02:00 |
|
zmagod
|
0456393317
|
prevent to get nil as a param in checklist_item_annotation method [fixes SCI-1194]
|
2017-04-25 16:22:10 +02:00 |
|
zmagod
|
ed24448817
|
adds relation to team, adds rake task to delete obsolete images [fixes SCI-1203]
|
2017-04-25 14:24:05 +02:00 |
|
zmagod
|
1fefeee3d1
|
adds team space related methods
|
2017-04-25 13:44:31 +02:00 |
|
zmagod
|
66f43803c0
|
refactor, fix user annotation bug
|
2017-04-24 16:22:25 +02:00 |
|
zmagod
|
55c8c498e2
|
add image upload functionality to result text
|
2017-04-24 12:28:27 +02:00 |
|
mlorb
|
54f1c7b3e8
|
Merge pull request #566 from mlorb/ml_sci_365
New experiment redirection [SCI-365]
|
2017-04-24 08:55:55 +02:00 |
|
zmagod
|
550f563666
|
working version for steps first run
|
2017-04-21 16:09:04 +02:00 |
|
Mojca Lorber
|
cf00ecd62e
|
new experiment redirection
|
2017-04-20 17:55:28 +02:00 |
|
Mojca Lorber
|
0bae4657f6
|
add experiment level to user smart annotation notification
|
2017-04-20 13:21:02 +02:00 |
|
Mojca Lorber
|
b1e939e715
|
add experiment to activities
|
2017-04-20 13:16:11 +02:00 |
|
zmagod
|
0757563d02
|
adds step tiny_mce asset relation
|
2017-04-19 17:22:57 +02:00 |
|
mz3944
|
a0b5a94d67
|
Merge pull request #564 from mz3944/mz-SCI-856
Case insensitive email invitation
|
2017-04-19 09:36:46 +02:00 |
|
zmagod
|
37be04c09c
|
add tiny_mce controller
|
2017-04-19 09:13:16 +02:00 |
|
Matej Zrimšek
|
bafdbf4082
|
Email is now case insensitive when inviting users by it. [fixes SCI-856]
|
2017-04-18 18:01:29 +02:00 |
|
mz3944
|
0ebf294844
|
Merge pull request #562 from mz3944/mz-SCI-1187
Added general locale for cases when a name is optional and is not spe…
|
2017-04-18 15:26:35 +02:00 |
|
Matej Zrimšek
|
a889174938
|
Name of result tables should be nil, as it can't be specified. [fixes SCI-1187]
|
2017-04-18 15:08:13 +02:00 |
|
Zmago Devetak
|
e1a30cc17c
|
Merge pull request #558 from ZmagoD/zd_SCI_1192
fixes broken users search method for smart annotation [fixes SCI-1192]
|
2017-04-14 15:38:33 +02:00 |
|
zmagod
|
8af3858209
|
fix hound
|
2017-04-14 11:13:58 +02:00 |
|
zmagod
|
9ee971c24b
|
fixes broken users search method for smart annotation [fixes SCI-1192]
|
2017-04-13 16:14:12 +02:00 |
|
Mojca Lorber
|
27c661d7c4
|
fix bug with changing user own role from admin to normal user
|
2017-04-12 16:56:10 +02:00 |
|
zmagod
|
90faeec410
|
fixes typos and protocol step links
|
2017-04-10 11:21:28 +02:00 |
|