scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-18 23:21:30 +08:00
Code Issues Projects Releases Packages Wiki Activity
15762 commits 31 branches 181 tags 166 MiB
Commit graph

93 commits

Author SHA1 Message Date
Miha Mencin
4a87216a3d
Merge branch 'master' into features/global-activities 2019-03-25 14:35:24 +01:00
aignatov-bio
ec2dbb897f
Adding side pane filter and top pane tags [SCI - 3008, 3009, 3010, 3011, 3012, 3018, 3019, 3020] (#1521) 
* Adding side pane filtering and top pane
 2019-03-06 10:34:04 +01:00
Oleksii Kriuchykhin
a0d2f7c676 Move templates project creation for new team to delayed job [SCI-3101] 2019-02-26 13:32:00 +01:00
Urban Rotnik
5a123d26ac Activity model update 2019-02-26 07:15:05 +01:00
Urban Rotnik
7b6c6c414d Merge branch 'master' into features/templates 2019-02-19 14:46:15 +01:00
Oleksii Kriuchykhin
da30d187a6 Create templates project when syncing templates if team doesn't have it [SCI-3039] 2019-02-13 15:17:33 +01:00
Mojca Lorber
0adb8b2b61 Fix failing tests 2019-02-13 14:31:26 +01:00
Oleksii Kriuchykhin
05edfae766 Fix failing tests [SCI-2939] 2019-01-25 14:13:00 +01:00
Oleksii Kriuchykhin
bd2efa55ac Add templates business logic [SCI-2939] 2019-01-25 10:55:08 +01:00
Mojca Lorber
fa1dff6352 refactor Demo project generation 2019-01-24 13:40:53 +01:00
Oleksii Kriuchykhin
311189a2e9 Replace reports materialized view with normal queries and re-enable fragment caching [SCI-2894] 2018-12-13 11:18:09 +01:00
Oleksii Kriuchykhin
1cafbd8c50 Move generic code to Viewable Concern [SCI-2733] 2018-10-12 16:14:24 +02:00
Oleksii Kriuchykhin
f221d71bbc Fix datatables state restore [SCI-2733] 2018-10-12 15:15:43 +02:00
Oleksii Kriuchykhin
af02f29fb5 Implement user state saving for projects overview [SCI-2733] 2018-10-10 16:15:31 +02:00
zmagod
199a2a23bf fixes per @mlorb 's request 2018-04-23 12:26:21 +02:00
zmagod
9d282d1800 adds new reports index page [fixes SCI-2124] 2018-04-18 16:47:52 +02: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
f202687291 Allow import of the sample with missing non mandatory fields [SCI-1819] 2017-11-15 16:40:14 +01:00
Luka Murn
8254153bb9 Merge branch 'master' into rails-5.1 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/connection.rb
	app/models/experiment.rb
	app/models/my_module.rb
 2017-10-23 08:57:57 +02:00
okriuchykhin
8e90e041b9 Merge pull request #825 from okriuchykhin/ok_SCI_1665 
Optimize memory usage in samples/repositories import [SCI-1665]
 2017-10-17 17:26:00 +02:00
Oleksii Kriuchykhin
c8d2ae70fa Move duplicated code to service [SCI-1665] 2017-10-17 14:46:16 +02:00
Oleksii Kriuchykhin
d266034406 Use case insensitive sample types and groups in import [SCI-1689] 2017-10-13 17:15:51 +02:00
Oleksii Kriuchykhin
56f52ebfa7 Optimize memory usage in samples/repositories import [SCI-1665] 2017-10-12 14:43:25 +02:00
Luka Murn
beae1b05d8 Merge branch 'master' into rails-5.1 
Conflicts:
	Gemfile
	Gemfile.lock
 2017-09-21 08:27:38 +02:00
Mojca Lorber
0e14420193 fix bugs with importing samples 2017-09-06 14:41:14 +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
Oleksii Kriuchykhin
efd03db6db Further samples import improvement [SCI-101] 2017-07-25 10:56:07 +02:00
Oleksii Kriuchykhin
67b0c78593 Improve samples import speed [SCI-101] 2017-07-24 17:33:13 +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
zmagod
525c9770ac fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
zmagod
819f47b450 setup sciNote for Rails 5.1 2017-06-23 15:19:08 +02:00
Oleksii Kriuchykhin
e99e3edb7b Add repositories dropdown to task navigation [SCI-1273] 2017-05-18 14:21:00 +02:00
Zmago Devetak
4b816f5322 Merge pull request #568 from ZmagoD/zd_SCI_1119 
Add images to fields with rich text formatting
 2017-05-08 13:06:58 +02:00
zmagod
0e383109a1 refactor query 2017-04-26 13:32:03 +02:00
zmagod
615bbb9967 make search for users case insensitive [fixes SCI-1192] 2017-04-25 15:33:51 +02:00
zmagod
ed24448817 adds relation to team, adds rake task to delete obsolete images [fixes SCI-1203] 2017-04-25 14:24:05 +02:00
zmagod
55c8c498e2 add image upload functionality to result text 2017-04-24 12:28:27 +02:00
zmagod
9ee971c24b fixes broken users search method for smart annotation [fixes SCI-1192] 2017-04-13 16:14:12 +02:00
Oleksii Kriuchykhin
42ccefe2ce Remove logs table and old unused logging code [SCI-1127] 2017-03-30 11:47:57 +02:00
zmagod
be5faad97c fixes hound 2017-01-31 13:33:55 +01:00
zmagod
f04a2f663a renamed organizations in config/ 2017-01-25 12:30:11 +01:00
zmagod
a193850ae6 rename models where org/organization 2017-01-24 16:34:21 +01:00
Renamed from app/models/organization.rb (Browse further)