Commit graph

2270 commits

Author SHA1 Message Date
mlorb
09b3bfb927 Merge pull request #703 from mlorb/ml_sci_1389
Allign no. of pages and showing entries per page [SCI-1389]
2017-06-22 15:53:48 +02:00
Mojca Lorber
1ba32e19cb allign no. of pages and showing entries per page 2017-06-22 14:23:03 +02:00
Zmago Devetak
b5649d3d5b Merge pull request #702 from ZmagoD/zd_SCI_1336
Repositories - import functionality
2017-06-21 17:44:40 +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
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
okriuchykhin
164d41c8c5 Merge pull request #697 from okriuchykhin/ok_SCI_1381
Fix total number of records in task repository [SCI-1381]
2017-06-20 16:39:42 +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
Mojca Lorber
86530bbda0 fix flash text 2017-06-16 14:41:50 +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
4566fc7191 fix text in activity for assign/unassign records message 2017-06-15 10:06:12 +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