scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-15 01:13:43 +08:00
Code Issues Projects Releases Packages Wiki Activity
2440 commits 55 branches 189 tags 169 MiB
Commit graph

617 commits

Author SHA1 Message Date
Matej Zrimšek
f847b44067 Error is displayed and import is prevented in case repository name column is not mapped, when importing repository items from file. [SCI-1402] 2017-06-26 16:50:40 +02:00
Oleksii Kriuchykhin
e038bc58fa Add global search in custom repositories [SCI-1356] 2017-06-23 16:12:56 +02:00
zmagod
7367435c6d refactor 2017-06-22 17:32:12 +02:00
zmagod
2dd9b6ff19 fix update repository_row 2017-06-22 17:29:17 +02:00
zmagod
590135b9b3 refactor 2017-06-22 17:26:11 +02:00
zmagod
e7328c2e20 fixes row dupplication [fixes SCI-1385] 2017-06-22 16:01:37 +02:00
zmagod
28129ebb73 refactor 2017-06-21 17:39:20 +02:00
zmagod
bad52ceff1 Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1336 2017-06-21 15:56:07 +02:00
zmagod
18fd5b00ba fix hound 2017-06-21 15:01:55 +02:00
zmagod
f66fb49b56 adds import records to repositories [fixes SCI-1336] 2017-06-21 14:45:50 +02:00
Matej Zrimšek
d907819de5 Removed byebug calls. [SCI-1383] 2017-06-21 10:49:00 +02:00
zmagod
f64e1ac713 fix locales 2017-06-21 09:31:39 +02:00
Matej Zrimšek
47407ef40c Removed empty first column of repository export file. [SCI-1383] 2017-06-20 18:40:41 +02:00
mlorb
7cbc8a2f95 Merge pull request #694 from mlorb/ml_sci_1347 
Fix flash when deleting samples of other users [SCI-1347]
 2017-06-19 14:19:57 +02:00
mlorb
beaba6a92b Merge pull request #693 from mlorb/ml_sci_1351_v3 
Fix error msg when editing empty cell in repositories [SCI-1351]
 2017-06-19 14:19:27 +02:00
zmagod
70fa681519 split the import service 2017-06-19 14:05:37 +02:00
Mojca Lorber
9b941fe374 fix flash when deleting samples of other users 2017-06-16 17:12:04 +02:00
Mojca Lorber
1b683bc70e fix error msg when editing empty cell in repositories 2017-06-16 15:09:04 +02:00
Mojca Lorber
ea455d3596 fix no repository name in activity bug 2017-06-15 09:43:10 +02:00
Mojca Lorber
e6ec184dba fix multiple errors handling on fields in repositories tables 2017-06-14 13:09:23 +02:00
zmagod
2d3b5f4308 refactor 2017-06-14 10:55:24 +02:00
zmagod
cee052fc19 added service object 2017-06-14 09:11:20 +02:00
Matej Zrimšek
cea6d15d3e Fixed Hound warning. [SCI-1351] 2017-06-13 18:15:47 +02:00
Matej Zrimšek
1bc46fe0cb Reverted the part of the repository row controller code that didn't needed changes. [SCI-1351] 2017-06-13 18:12:42 +02:00
Mojca Lorber
849b269d87 fix errors in repo table 2017-06-13 16:56:34 +02:00
mlorb
074a47aae1 Merge pull request #675 from mlorb/ml_sci_1272 
Fix permissions [SCI-1272]
 2017-06-13 10:51:04 +02:00
zmagod
a865253a2e first run 2017-06-13 08:10:10 +02:00
Matej Zrimšek
e3db79b3cc Added repository permissions check when exporting repository records. Minor repositories refactoring and code style fixing. [SCI-1275] 2017-06-12 17:49:42 +02:00
Mojca Lorber
9108102b42 fix permissions 2017-06-12 17:34:36 +02:00
Matej Zrimšek
f46d8f6970 Refactored a bit repository records CSV export. Fixed the order of CSV rows to match the currently viewed datatable order. [SCI-1275] 2017-06-09 19:44:28 +02:00
Matej Zrimšek
773a55ffac Fixed CSV export of repository records. [SCI-1275] 2017-06-09 19:44:28 +02:00
rekonder
4df8e1ffe3 Fixed bugs with duplicated generated csv, toggle columns and exportig right columns of selected repository 2017-06-09 19:44:28 +02:00
rekonder
ede744849b Export repository [aj-SCI-1275] 2017-06-09 19:44:28 +02:00
Luka Murn
e26337d5ee Merge pull request #671 from biosistemika/custom-repositories 
Merge custom-repositories into master
 2017-06-09 18:46:47 +02:00
Zmago Devetak
4873624cec Merge pull request #658 from ZmagoD/zd_SCI_1011 
Multiple file upload with drag & drop capability in steps and results
 2017-06-09 10:03:33 +02:00
Mojca Lorber
be52af4e4f fix rename/delete/copy modals not working 2017-06-08 15:13:00 +02:00
Mojca Lorber
71c523c406 load tabs with javascript 2017-06-08 13:47:30 +02:00
Luka Murn
2ab31aba2f Merge pull request #660 from Ducz0r/lm-sci-1270 
Copy repository functionality [SCI-1270]
 2017-06-08 11:45:57 +02:00
Luka Murn
61eb52f86f Implement GUI for copying repositories 
Closes SCI.1270.
 2017-06-07 19:11:25 +02:00
Luka Murn
0aee11d6d8 Hound is love, Hound is life #2 2017-06-07 18:26:32 +02:00
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