scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-05 23:17:33 +08:00
Code Issues Projects Releases Packages Wiki Activity
4238 commits 77 branches 180 tags 167 MiB
Commit graph

166 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
c8094f196c Add margin to clear button and fix case with new file in the cell [SCI-2403] 2018-05-16 11:25:43 +02:00
Oleksii Kriuchykhin
be5d481cdc Add clear file selector button to repository edit [SCI-2403] 2018-05-16 10:32:50 +02:00
okriuchykhin
62f0c21a79
Merge pull request #1140 from okriuchykhin/ok_SCI_2391 
Re-init file preview modal after inventory row editing [SCI-2391]
 2018-05-16 10:18:13 +02:00
okriuchykhin
ffddf3fd94
Merge pull request #1135 from okriuchykhin/ok_SCI_2394 
Fix editing of inventory rows with existing files [SCI-2394]
 2018-05-16 10:16:26 +02:00
Zmago Devetak
b771149477
Merge pull request #1133 from ZmagoD/zd_SCI_2337 
fixes error message for invalid file type [fixes SCI-2337]
 2018-05-16 08:26:11 +02:00
Oleksii Kriuchykhin
95b8821cc9 Re-init file preview modal after inventory row editing [SCI-2391] 2018-05-15 12:57:36 +02:00
Oleksii Kriuchykhin
a92abc5995 Fix editing of inventory rows with existing files [SCI-2394] 2018-05-14 14:26:01 +02:00
mlorb
b5649f0574
Merge branch 'ux-release-1' into ml-sci-2336-v1 2018-05-10 13:59:57 +02:00
zmagod
3db7cc437b fixes error message for invalid file type [fixes SCI-2337] 2018-05-10 13:52:01 +02:00
Luka Murn
8650edbbb9
Merge pull request #1129 from Ducz0r/lm-fix-repositories-index 
Fix merge conflict introduced in when merging master->ux-release-1
 2018-05-10 11:19:38 +02:00
okriuchykhin
ed8237484b
Merge pull request #1131 from okriuchykhin/ok_SCI_2379 
Re-init file preview modal after column visability change [SCI-2379]
 2018-05-10 10:45:56 +02:00
zmagod
e5c3fb6af2 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321 2018-05-10 10:38:56 +02:00
Oleksii Kriuchykhin
fa1fea634c Re-init file preview modal after column visability change [SCI-2379] 2018-05-09 17:41:52 +02:00
mlorb
7df40e56c7 UI/UX restyle - fixes throughout application part one 2018-05-08 16:33:42 +02:00
Luka Murn
f8295b60c9 Fix merge conflict introduced in when merging master->ux-release-1 
Bug was introduced in merge commit
cb6fe50832 and resulted in import
into inventories not working.
 2018-05-08 09:41:40 +02:00
zmagod
66b676b5ce Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321 2018-04-26 17:04:36 +02:00
zmagod
8dac887f10 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2261 2018-04-26 14:18:41 +02:00
zmagod
24acd5c779 fixes per @duco 's request 2018-04-26 14:13:46 +02:00
Luka Murn
cb6fe50832 Merge branch 'master' into ux-release-1 
Conflicts:
	app/assets/javascripts/repositories/index.js
 2018-04-26 11:38:54 +02:00
Luka Murn
bd6f97fabc Add initializer to include helpers in all assets (including .js) 2018-04-25 10:51:19 +02:00
zmagod
c2d19fee52 fixes images preview in repository/library [fixes SCI-2321] 2018-04-24 13:11:55 +02:00
zmagod
824962c084 propagate assigned repository items in workflow [fixes SCI-2261] 2018-04-23 11:33:16 +02:00
Luka Murn
caab0cf55c Update the ordering upon table load 2018-04-20 12:31:22 +02:00
Luka Murn
21e7e7057e Refactor all the methods into two new services 2018-04-20 12:31:22 +02:00
Luka Murn
5e2622ecfc Change default repository state to Ruby representation 
Also remove some dead code from repositories datatables
 2018-04-20 12:31:22 +02:00
Zmago Devetak
1290435372
Merge pull request #1086 from ZmagoD/zd_SCI_2207 
enables copying of repository items [fixes SCI-2207]
 2018-04-19 17:13:43 +02:00
mlorb
2627efe402 implement file column type when editing & creating new rows in inventories DataTables 2018-04-13 17:21:17 +02:00
zmagod
6291857bbf enables copying of repository items [fixes SCI-2207] 2018-04-11 17:17:19 +02:00
zmagod
233e73c709 adds asset preview link to repository row modal and to table row item [fixes SCI-2110] 2018-04-10 17:06:53 +02:00
zmagod
ea4bd8831f fixes bug with CSRF on file upload, fixes turbolink issues with remote form submition [fixes SCI-2284] 2018-04-10 13:19:53 +02:00
Zmago Devetak
eca69cfc75
Merge pull request #1080 from ZmagoD/zd_SCI_2076 
add asset field preview/sort/search in repository table [fixes SCI-2076]
 2018-04-09 14:29:45 +02:00
zmagod
b51ad84ee5 add asset field preview/sort/search in repository table [fixes SCI-2076] 2018-04-06 12:03:39 +02:00
zmagod
afc2a35557 move import export to dropdown 2018-04-05 09:32:34 +02:00
Zmago Devetak
d1f3a65279
Merge pull request #1073 from ZmagoD/zd_SCI_2206 
add ID column to repository [fixes SCI-2206]
 2018-04-04 15:39:59 +02:00
zmagod
e630d3113f add ID column to repository [fixes SCI-2206] 2018-04-04 11:55:11 +02:00
okriuchykhin
145f49de2d
Revert "Update turbolinks and fix repository table init [SCI-2251]" 2018-03-26 17:38:48 +02:00
Oleksii Kriuchykhin
5dc01a3d42 Fix code style [SCI-2251] 2018-03-26 13:59:45 +02:00
zmagod
3efe06a410 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-03-26 12:02:24 +02:00
Oleksii Kriuchykhin
83c7539156 Update turbolinks and fix repository table init [SCI-2251] 2018-03-25 19:44:58 +02:00
Oleksii Kriuchykhin
36302ad6e8 Refactor existing columns management to control only Column visibility and order [SCI-2220] 2018-03-21 16:56:36 +01:00
zmagod
62858bc14f Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-03-20 14:46:11 +01:00
zmagod
1ad8c259d1 add blank page for repositories [fixes SCI-2139] 2018-03-20 14:45:57 +01:00
zmagod
d69754af04 implement search on list items dropdown, update, create actions [fixes SCI-2070] 2018-03-15 15:43:16 +01:00
zmagod
e3ca782996 add info modal for repository items [fixes SCI-2066] 2018-02-27 16:21:46 +01:00
zmagod
78e902f316 fixes few Hound alerts 2018-02-15 11:06:59 +01:00
zmagod
27b7aff3ea fixed bug with assigned repository items [fixes SCI-2040] 2018-02-12 10:49:35 +01:00
Oleksii Kriuchykhin
74a62c41eb Fix task repository row selector [SCI-1940] 2018-01-17 11:21:41 +01:00
Luka Murn
beae1b05d8 Merge branch 'master' into rails-5.1 
Conflicts:
	Gemfile
	Gemfile.lock
 2017-09-21 08:27:38 +02:00
Luka Murn
85634b2fb6 Add 'off' before setting export button to 'on' 2017-08-07 14:04:39 +02:00
Luka Murn
ae5bccf709 Merge branch 'master' into rails-5.1 
Conflicts:
	Gemfile.lock
	app/datatables/repository_datatable.rb
	app/models/repository_cell.rb
 2017-08-07 08:45:53 +02:00
Matej Zrimšek
d90ca1b934 Fixed slow exporting of repositories - JS listeners which triggered function responsible for providing export data was bound more than once. [SCI-1481] 2017-08-02 16:49:53 +02:00
zmagod
dfc8ea7fbf don't hide modal [fixes SCI-1487] 2017-07-25 14:33:41 +02:00
Oleksii Kriuchykhin
6c33b46f6a Improve import of repository records plus tsv file import fixes [SCI-1487] 2017-07-20 11:44:10 +02:00
Zmago Devetak
7b898666da Merge pull request #745 from ZmagoD/zd_SCI_1485 
refactor repositories js files [fixes SCI-1485]
 2017-07-19 11:17:52 +02:00
zmagod
a2b7bcda4c refactor repositories js files [fixes SCI-1485] 2017-07-17 15:05:28 +02:00
Oleksii Kriuchykhin
036ee390ed Fix error messages in repository import and uploading files starting with hyphen[SCI-1484] 2017-07-14 16:19:03 +02:00
Zmago Devetak
69919359f1 Merge pull request #738 from ZmagoD/zd_SCI_1452 
fixes issue with smart annotations in repositories [fixes SCI-1452]
 2017-07-12 14:50:29 +02:00
zmagod
baaec67399 fixes issue with smart annotations in repositories [fixes SCI-1452] 2017-07-10 16:22:32 +02:00
Oleksii Kriuchykhin
a6b80589f2 Fix default order of the columns in repositories [SCI-1445] 2017-07-10 15:32:18 +02:00
Luka Murn
9f60ece25f Merge branch 'master' into rails-5.1 
Conflicts:
	app/models/repository.rb
	app/models/repository_row.rb
	app/views/projects/index.html.erb
	app/views/shared/_secondary_navigation.html.erb
 2017-07-06 15:12:15 +02:00
Oleksii Kriuchykhin
4c6690e59b Fix ordering of the columns after adding the new ones [SCI-1445] 2017-07-03 11:53:15 +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
zmagod
75507107fd migrate to 4.2.9 2017-06-23 08:50:12 +02:00
zmagod
1690d8ebe3 removed reload on hide modal 2017-06-22 16:47:50 +02:00
zmagod
a2e1aa5b36 fixes bug with long text in parse records modal [fixes SCI-1392] 2017-06-22 14:43:01 +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
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
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
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
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
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
zmagod
5d6fba7153 fixes bug with sorting columns [fixes SCI-1371] 2017-06-14 17:35:41 +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
cee052fc19 added service object 2017-06-14 09:11:20 +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
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
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
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
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
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
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
zmagod
d1977d0773 fixes long column names in repository dropdown [fixes SCI-1338] 2017-06-09 11:42:38 +02:00
Luka Murn
7bb1af3692 Minor JS fix 2017-06-08 15:28:26 +02:00