scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-06 15:05:26 +08:00
Code Issues Projects Releases Packages Wiki Activity
3828 commits 43 branches 185 tags 169 MiB
Commit graph

90 commits

Author SHA1 Message Date
zmagod
3e10ff7fc5 add custom method that generates smart annotations name from repository name [fixes SCI-2307] 2018-05-04 10:44:23 +02:00
Zmago Devetak
9ce071693d
Merge pull request #1116 from ZmagoD/zd_SCI_2310 
parse smart annotations in repository export [fixes SCI-2310]
 2018-05-03 14:34:29 +02:00
Zmago Devetak
4fe4fea4fc
Merge pull request #1122 from ZmagoD/zd_SCI_2339 
repository when sorting/searching bug fix [SCI-2339]
 2018-05-03 12:05:39 +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
zmagod
23f8f35a2c a shotgun surgery that fixes searching/filtering of repository_rows [fixes SCI-2339] 2018-04-26 11:05:02 +02:00
Luka Murn
cd04596c62
Merge pull request #1111 from Ducz0r/lm-sci-2276-fix 
Update the code for repository table states so it (hopefully) causes less errors [SCI-2276]
 2018-04-25 12:37:27 +02:00
zmagod
7d26ce561c parse smart annotations in repository export [fixes SCI-2310] 2018-04-24 14:53:49 +02:00
zmagod
efd1e470f6 rename smart annotations icons [fixes SCI-2307] 2018-04-23 12:38:54 +02:00
Luka Murn
c0da83c5de Add some additional nil guards 2018-04-20 12:31:22 +02:00
Luka Murn
d023db16af Update the destroy_column action so it properly updates all states 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
6b4d786acc
Merge pull request #1105 from ZmagoD/zd_SCI_2307 
change repository icon
 2018-04-19 17:58:48 +02:00
zmagod
bb3e1b4dcf change repository icon 2018-04-19 15:39:24 +02:00
zmagod
f3af8f4524 switch current_team to repository.team 2018-04-19 13:04:16 +02:00
zmagod
9baaad25b6 add current_user to cloned created_by, last_modified_by field 2018-04-16 12:38:25 +02:00
zmagod
4f21833373 changes per @duco 's request 2018-04-13 11:47:33 +02:00
zmagod
6291857bbf enables copying of repository items [fixes SCI-2207] 2018-04-11 17:17:19 +02:00
zmagod
b51ad84ee5 add asset field preview/sort/search in repository table [fixes SCI-2076] 2018-04-06 12:03:39 +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
zmagod
8a156ad91e change method name 2018-04-03 13:05:25 +02:00
zmagod
7dfec94ffc remove samples from smart annotations 2018-04-03 09:43:12 +02:00
zmagod
01a548e8b3 fix hound 2018-03-29 16:11:21 +02:00
zmagod
659a088058 refactor smart annotation parser, adds repository item to smart annotation parser [fixes SCI-2222] 2018-03-29 15:55:26 +02:00
okriuchykhin
13fed0411b
Merge pull request #1063 from biosistemika/release-1.12.11 
merge release 1.12.11 branch to master
 2018-03-27 16:19:57 +02:00
zmagod
064bd88584 fix assigned query 2018-03-19 17:49:09 +01:00
zmagod
fad4001273 fix edit row action 2018-03-16 12:27:19 +01:00
zmagod
1cdba5e0d3 Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2068 2018-03-16 11:05:16 +01:00
okriuchykhin
503617b42c
Merge branch 'samples_to_repositories_table_migration' into zd_SCI_2025 2018-03-13 14:44:20 +01:00
okriuchykhin
f14931f6a8
Update with latest changes on branch 2018-03-13 14:37:12 +01:00
okriuchykhin
262c21d145
Merge pull request #1036 from okriuchykhin/ok_SCI_2078 
Implement importable selector for repository columns [SCI-2078]
 2018-03-13 13:14:53 +01:00
Oleksii Kriuchykhin
be1ead22e0 Implement importable selector for repository columns [SCI-2078] 2018-03-13 11:36:05 +01:00
Oleksii Kriuchykhin
f5ecbecaf3 Fix bugs [SCI-1849] 2018-03-12 17:00:44 +01:00
Oleksii Kriuchykhin
60e3a836be Fix typo in regex [SCI-1849] 2018-03-11 22:11:12 +01:00
Oleksii Kriuchykhin
ac009a29cb Add annotations migrations and optimize queries [SCI-2016] 2018-03-11 22:06:44 +01:00
zmagod
22eb4121f0 follow @okriuchykhin 's suggestions 2018-03-09 15:44:42 +01:00
zmagod
0baa7a1f99 fix hound 2018-03-09 14:43:12 +01:00
zmagod
4f951f6679 adds unit specs for datatable service [fixes SCI-2068] 2018-03-09 14:22:00 +01:00
zmagod
26883af386 fix assigned ordering 2018-03-08 17:36:10 +01:00
zmagod
fb66131e29 setup endpoint for repository_rows paging/search 2018-03-06 16:32:39 +01:00
Oleksii Kriuchykhin
c933030b94 Add team export/import scripts [SCI-1849] 2018-03-06 11:26:30 +01:00
zmagod
fca01bd54f refactor repository export [fixes SCI-2025] 2018-03-05 15:54:04 +01:00
zmagod
83db7ed01d adds rake task to migrate the samples in custom repositories and tests [fixes SCI-2014] 2018-02-26 17:21:58 +01:00
zmagod
5922aa21a8 adds fetch_all_team_samples method/spec 2018-02-15 17:38:45 +01:00
zmagod
c53df21946 adds specs for sample_to_repository migration service 2018-02-15 16:56:38 +01:00
zmagod
e0ac8e8f91 extract helper methods in service 2018-02-15 09:36:09 +01:00
zmagod
f8a3fca2db Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling 2018-01-23 11:06:33 +01:00
Oleksii Kriuchykhin
2ddb0ea009 Improve XLSX parsing with Roo [SCI-1915] 2018-01-11 17:52:57 +01:00
Oleksii Kriuchykhin
1a81a99ff0 Remove Creek XLSX parser gem as it causes conflicts [SCI-1891] 2017-12-19 16:17:11 +01:00