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 |
|
mz3944
|
568e41f5fa
|
Merge pull request #701 from mz3944/mz-SCI-1383
Removed empty first column of repository export file [SCI-1383]
|
2017-06-21 10:57:46 +02:00 |
|
Matej Zrimšek
|
d907819de5
|
Removed byebug calls. [SCI-1383]
|
2017-06-21 10:49:00 +02:00 |
|
mz3944
|
d19bfc8fd8
|
Merge pull request #700 from mz3944/mz-SCI-1386
Fixed tooltip not showing on mouse over truncated cell text [SCI-1386]
|
2017-06-21 10:40:37 +02:00 |
|
mz3944
|
2ad27289c9
|
Merge pull request #699 from mz3944/mz-SCI-1378
Change repository icon on reports [SCI-1378]
|
2017-06-21 10:40:16 +02:00 |
|
mz3944
|
4d5136270a
|
Merge pull request #698 from mz3944/mz-SCI-1384
Fixed AJAX error when deleting custom columns in repository table [SCI-1384]
|
2017-06-21 10:39:53 +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 |
|
Matej Zrimšek
|
ce97d18e78
|
Fixed tooltip not showing on mouse over truncated cell text. [SCI-1386]
|
2017-06-20 17:51:51 +02:00 |
|
Matej Zrimšek
|
d49524a26f
|
Set correct repository icon on reports and done some needed refactoring with this. [SCI-1378]
|
2017-06-20 16:10:50 +02:00 |
|
Oleksii Kriuchykhin
|
115ce91d8d
|
Handle column mappings in task repository [SCI-1381]
|
2017-06-20 15:58:52 +02:00 |
|
Matej Zrimšek
|
6c7987681c
|
Updating repository table state of every user belonging to the team of the repository, when custom column is removed or added. [SCI-1384]
|
2017-06-20 14:52:41 +02:00 |
|
Oleksii Kriuchykhin
|
9a9f8b9c41
|
Fix total number of records in task repository [SCI-1381]
|
2017-06-19 16:45:57 +02:00 |
|
mlorb
|
14429a270c
|
Merge pull request #689 from mlorb/ml_sci_1354
Truncate and display text in tooltip in custom repository fields [SCI-1354]
|
2017-06-19 15:50:38 +02:00 |
|
Mojca Lorber
|
730c4738d5
|
fix tooltip in edit mode
|
2017-06-19 15:49:31 +02:00 |
|
Mojca Lorber
|
39dd6daabb
|
small fixes
|
2017-06-19 15:30:38 +02:00 |
|
mlorb
|
122ac7971f
|
Merge pull request #692 from mlorb/ml_sci_1348
Fix cog position on repositories page [SCI-1348]
|
2017-06-19 15:16:01 +02:00 |
|
mlorb
|
9a7669bf2a
|
remove empty line
|
2017-06-19 15:15:27 +02:00 |
|
mlorb
|
ff02c45f5f
|
Merge pull request #695 from mlorb/ml_sci_1353
Retain the same word case in repositories dropdown [SCI-1353]
|
2017-06-19 14:48:58 +02:00 |
|
mlorb
|
733f6267db
|
Merge pull request #696 from mlorb/ml_sci_1380
Fix ordering of repositories on task [SCI-1380]
|
2017-06-19 14:28:00 +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
|
4c3036af87
|
fix ordering of repositoris on task
|
2017-06-19 10:53:18 +02:00 |
|
Mojca Lorber
|
f77b1aa4e8
|
retain the same word case in repositories dropdown
|
2017-06-19 10:32:12 +02:00 |
|
Mojca Lorber
|
9b941fe374
|
fix flash when deleting samples of other users
|
2017-06-16 17:12:04 +02:00 |
|
mz3944
|
e027a871e9
|
Merge pull request #691 from mz3944/mz-SCI-1357-v2
Repository management - filter on custom columns [SCI-1357]
|
2017-06-16 16:04:47 +02:00 |
|
Matej Zrimšek
|
6b284d8c89
|
Filtering and sorting of records didn't work when sorting on custom columns in repository datatable. [SCI-1357]
|
2017-06-16 16:02:31 +02:00 |
|
mlorb
|
49ce08f1f5
|
Merge pull request #688 from mlorb/ml_sci_1375
Fix no repository name in activity bug [SCI-1375]
|
2017-06-16 15:13:42 +02:00 |
|
Mojca Lorber
|
1b683bc70e
|
fix error msg when editing empty cell in repositories
|
2017-06-16 15:09:04 +02:00 |
|
Matej Zrimšek
|
1f0eeeaecb
|
Optimized repository cells search by replacing Rails select statement with raw SQL statement. [SCI-1357]
|
2017-06-16 14:31:31 +02:00 |
|
okriuchykhin
|
05ea00a5d3
|
Merge pull request #690 from okriuchykhin/ok_SCI_1346_v2
Fix bug when reordering column to the first position in repositories [SCI-1346]
|
2017-06-16 14:29:08 +02:00 |
|
Mojca Lorber
|
b6f146f177
|
fix cog position on repositories page
|
2017-06-16 11:54:31 +02:00 |
|
Oleksii Kriuchykhin
|
94d74b8101
|
Make assigned column always visible in repositories [SCI-1346]
|
2017-06-16 11:47:41 +02:00 |
|
Mojca Lorber
|
a195c9a5af
|
truncate and display text in tooltip in custom repository fields
|
2017-06-15 15:08:33 +02:00 |
|
Luka Murn
|
3df034ff21
|
Merge pull request #687 from mz3944/mz-SCI-1357
Repository management - filter on custom columns [SCI-1357]
|
2017-06-15 13:30:42 +02:00 |
|
Mojca Lorber
|
ea455d3596
|
fix no repository name in activity bug
|
2017-06-15 09:43:10 +02:00 |
|
Matej Zrimšek
|
bae1e298d7
|
Fixed repositories search to only search the current repository. [SCI-1357]
|
2017-06-14 19:49:08 +02:00 |
|
Matej Zrimšek
|
092e82c722
|
Date search fix for repositories. [SCI-1357]
|
2017-06-14 19:36:15 +02:00 |
|
Matej Zrimšek
|
e38947b1f8
|
Minor repository search refactoring. [SCI-1357]
|
2017-06-14 19:28:53 +02:00 |
|
Matej Zrimšek
|
be4a8d494a
|
Search functionality added to custom columns of custom repositories. [SCI-1357]
|
2017-06-14 19:28:12 +02:00 |
|
mlorb
|
6e203d2f15
|
Merge pull request #685 from mlorb/ml_sci_1373
Fix bug with audit trail - ajax error [SCI-1373]
|
2017-06-14 17:59:34 +02:00 |
|
Zmago Devetak
|
ab24414bfe
|
Merge pull request #686 from ZmagoD/zd_SCI_1371
fixes bug with sorting columns [fixes SCI-1371]
|
2017-06-14 17:59:24 +02:00 |
|
zmagod
|
5d6fba7153
|
fixes bug with sorting columns [fixes SCI-1371]
|
2017-06-14 17:35:41 +02:00 |
|
okriuchykhin
|
374270bb10
|
Merge pull request #684 from okriuchykhin/ok_SCI_1349
Fix sorting in repositories when only assigned selected [SCI-1349]
|
2017-06-14 15:15:03 +02:00 |
|
Mojca Lorber
|
107aa76e55
|
fix bug with audit trail - ajax error
|
2017-06-14 14:48:22 +02:00 |
|
Oleksii Kriuchykhin
|
13fdbf8850
|
Fix sorting in repositories when only assigned selected [SCI-1349]
|
2017-06-14 14:29:59 +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 |
|
okriuchykhin
|
da87a41c86
|
Merge pull request #680 from okriuchykhin/ok_SCI_1365
Remove row selection after assign/unassign in repositories [SCI-1365]
|
2017-06-14 10:19:09 +02:00 |
|
zmagod
|
6dd85d6c39
|
fixes drag'n drop bug in results on safari [fixes SCI-1370]
|
2017-06-14 09:45:49 +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 |
|
Oleksii Kriuchykhin
|
2e98433abc
|
Remove row selection after assign/unassign in repositories [SCI-1365]
|
2017-06-13 16:56:28 +02:00 |
|
okriuchykhin
|
97a94ff4a3
|
Merge pull request #679 from okriuchykhin/ok_SCI_1345
Fix repository view permissions for team guests [SCI-1345]
|
2017-06-13 15:47:44 +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 |
|
Oleksii Kriuchykhin
|
2d693a3fb7
|
Fix repository view permissions for team guests [SCI-1345]
|
2017-06-13 10:33:08 +02:00 |
|
Luka Murn
|
2e2f07bf58
|
Merge pull request #668 from Ducz0r/lm-sci-1335
Fix sidebar for repositories [SCI-1335]
|
2017-06-13 09:37:33 +02:00 |
|
Zmago Devetak
|
f3f1a68070
|
Merge pull request #667 from ZmagoD/zd_SCI_1338
fixes long column names in repository dropdown [fixes SCI-1338]
|
2017-06-13 09:33:04 +02:00 |
|
Zmago Devetak
|
19adddbfdb
|
Merge pull request #666 from ZmagoD/zd_SCI_1337
truncate long repository names [fixes SCI-1337]
|
2017-06-13 09:32:43 +02:00 |
|
Zmago Devetak
|
21577cd0e9
|
Merge pull request #664 from ZmagoD/zd_SCI_1315
removes the delete function of uncompleted steps [fixes SCI-1315]
|
2017-06-13 09:32:26 +02:00 |
|
Oleksii Kriuchykhin
|
4b0d7acabe
|
Fix search when viewing only assigned repository records [SCI-1342]
|
2017-06-13 09:11:27 +02:00 |
|
Luka Murn
|
c3d289291f
|
Fix case statement
Closes SCI-1335.
|
2017-06-13 09:09:07 +02:00 |
|
okriuchykhin
|
d88de4009a
|
Merge pull request #674 from okriuchykhin/ok_SCI_1346
Fix reordering columns to the first position [SCI-1346]
|
2017-06-13 09:01:10 +02:00 |
|
okriuchykhin
|
56c3b891a5
|
Merge pull request #673 from okriuchykhin/ok_SCI_1350
Fix row selection info after record deletion [SCI-1350]
|
2017-06-13 09:00:48 +02:00 |
|
okriuchykhin
|
05c77e7298
|
Merge pull request #672 from okriuchykhin/ok_SCI_1341
Fix row selecton after column reorder in repositories [SCI-1341]
|
2017-06-13 09:00:33 +02:00 |
|
mlorb
|
d0d7dc7468
|
Merge pull request #677 from mlorb/ml_sci_1344
Change custom repositories icon [SCI-1344]
|
2017-06-13 08:57:22 +02:00 |
|
Zmago Devetak
|
6cdf37041f
|
Merge pull request #663 from ZmagoD/zd_SCI_1328
fixes bug with smart annotations in reports [fixes SCI-1328]
|
2017-06-13 08:57:09 +02:00 |
|
Luka Murn
|
28f78a0c6c
|
Merge pull request #670 from Ducz0r/lm-sci-1340
Fix assigned repository rows in task display [SCI-1340]
|
2017-06-13 08:55:55 +02:00 |
|
zmagod
|
a865253a2e
|
first run
|
2017-06-13 08:10:10 +02:00 |
|
Mojca Lorber
|
faa6456e28
|
change custom repositories icon
|
2017-06-12 18:00:28 +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 |
|
Oleksii Kriuchykhin
|
248fd7be06
|
Fix reordering columns to the first position [SCI-1346]
|
2017-06-12 17:16:49 +02:00 |
|
Oleksii Kriuchykhin
|
c081cda5f3
|
Fix row selection info after record deletion [SCI-1350]
|
2017-06-12 10:23:18 +02:00 |
|
Oleksii Kriuchykhin
|
aa42ca6b8b
|
Fix row selecton after column reorder in repositories [SCI-1341]
|
2017-06-12 10:07:16 +02:00 |
|
Matej Zrimšek
|
4ea8972a6c
|
Fixed rebasing mistake. [SCI-1275]
|
2017-06-09 19:48:20 +02:00 |
|
Matej Zrimšek
|
514aa6214b
|
Repository records minor JS refactoring. [SCI-1275]
|
2017-06-09 19:44:28 +02:00 |
|
Matej Zrimšek
|
29b721365a
|
Moved export form to proper place in the code. [SCI-1275]
|
2017-06-09 19:44:28 +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 |
|
Luka Murn
|
90ca6d9a76
|
Fix assigned repository rows in task display
Closes SCI-1340.
|
2017-06-09 13:50:13 +02:00 |
|
Luka Murn
|
481a48c953
|
Hound is love, Hound is life
|
2017-06-09 12:51:33 +02:00 |
|
Luka Murn
|
cfb734704e
|
Fix sidebar for repositories
Closes SCI-1335.
|
2017-06-09 12:49:23 +02:00 |
|
zmagod
|
d1977d0773
|
fixes long column names in repository dropdown [fixes SCI-1338]
|
2017-06-09 11:42:38 +02:00 |
|
zmagod
|
ee9eaea47c
|
truncate long repository names [fixes SCI-1337]
|
2017-06-09 11:20:57 +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 |
|
zmagod
|
33b996ffee
|
refactor
|
2017-06-09 09:49:57 +02:00 |
|
Luka Murn
|
7bb1af3692
|
Minor JS fix
|
2017-06-08 15:28:26 +02:00 |
|
Luka Murn
|
c7c3c46d9d
|
Fix dropdown
|
2017-06-08 15:26:57 +02:00 |
|
Mojca Lorber
|
be52af4e4f
|
fix rename/delete/copy modals not working
|
2017-06-08 15:13:00 +02:00 |
|
Mojca Lorber
|
0004c2b7d5
|
fix selection of tab after redirection
|
2017-06-08 14:17:27 +02:00 |
|