Commit graph

307 commits

Author SHA1 Message Date
okriuchykhin
d126391940 Merge pull request #710 from okriuchykhin/ok_SCI_1356
Add global search in custom repositories [SCI-1356]
2017-06-27 13:41:53 +02:00
mz3944
ca59ac5e36 Merge pull request #714 from mz3944/mz-SCI-1402
Missing error message when not selecting name in case of import repository file [SCI-1402]
2017-06-27 11:54:26 +02:00
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
84556cf744 Fix naming of repository items in modal and messages [SCI-1404] 2017-06-26 16:03:02 +02:00
Oleksii Kriuchykhin
e038bc58fa Add global search in custom repositories [SCI-1356] 2017-06-23 16:12:56 +02:00
Matej Zrimšek
be855e98db Changed repository records filter naming. [SCI-1398] 2017-06-23 10:16:50 +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
f66fb49b56 adds import records to repositories [fixes SCI-1336] 2017-06-21 14:45:50 +02:00
zmagod
f64e1ac713 fix locales 2017-06-21 09:31:39 +02:00
Mojca Lorber
86530bbda0 fix flash text 2017-06-16 14:41:50 +02:00
Mojca Lorber
4566fc7191 fix text in activity for assign/unassign records message 2017-06-15 10:06:12 +02:00
Mojca Lorber
77d922a5e8 change the name of add record/repository in repositories 2017-06-13 09:45:18 +02:00
zmagod
a865253a2e first run 2017-06-13 08:10:10 +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
Luka Murn
810599bef2 Fix en.yml localization bug 2017-06-08 13:36:37 +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
27feb46d8f Merge pull request #659 from Ducz0r/lm-sci-1279
Include repositories in reports [SCI-1279]
2017-06-08 11:24:21 +02:00
Luka Murn
61eb52f86f Implement GUI for copying repositories
Closes SCI.1270.
2017-06-07 19:11:25 +02:00
Luka Murn
38361e4bb4 Setup initial GUI 2017-06-07 18:43:48 +02:00
Matej Zrimšek
77a225ec31 Added toggle between assigned and all repository records. [SCI-1276] 2017-06-07 18:13:25 +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
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
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
ajugo
887d9a4f52 Samples - show all/show assigned [SCI-1277] (#644)
* Samples - show all/show assigned [SCI-1277]

* Some fixes in code

* Some minor fixes in code

* Omit present

* Correct missed present

* Fixing hound warnings
2017-06-06 12:46:56 +02:00
Mojca Lorber
acdea2198d code changes after rebasing 2017-06-06 11:10:55 +02:00
Mojca Lorber
13bf4ad229 create new repository 2017-06-06 09:54:39 +02:00
zmagod
67d902db52 refactor 2017-06-05 10:43:58 +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
21a72da84f Added rename logic and improved remove logic. [SCI-1269] 2017-06-02 17:50:34 +02:00
Matej Zrimšek
791bb934ca Remove repository modal logic (WIP). [SCI-1269] 2017-06-02 17:50:33 +02:00
Matej Zrimšek
b92a760a5c Added dropdown GUI for editing repository. [SCI-1269] 2017-06-02 17:47:28 +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
689587c4fc Merge pull request #643 from mz3944/mz-SCI-1305
Handled user removal from the team for user smart annotation [fixes SCI-1305]
2017-05-29 12:52:19 +02:00
Matej Zrimšek
e8f842c29f Forgot to add the updated locales. [fixes SCI-1305] 2017-05-29 11:39:17 +02:00
Zmago Devetak
2224c6511d Merge pull request #630 from ZmagoD/zd_SCI_1240_v2
fix label [fixes SCI-1240]
2017-05-29 09:01:30 +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
f78c80b148 Added possibility to add uncompleted steps to report. [closes SCI-414] 2017-05-17 13:25:21 +02:00
zmagod
b8b47542a6 fix label [fixes SCI-1240] 2017-05-16 16:08:29 +02:00
zmagod
e0397f8a54 fix search label [fixes SCI-1285] 2017-05-16 14:58:39 +02:00
Matej Zrimšek
dbb79ebab1 Refactoring of specific modals for adding content to report and fixing their inconsistencies. [fixes SCI-487] 2017-05-15 17:43:12 +02:00