scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
4054 commits 70 branches 179 tags 165 MiB
Commit graph

133 commits

Author SHA1 Message Date
zmagod b45717185a removes unneeded migrations 2018-05-28 13:12:27 +02:00
zmagod b13e39a0d9 adds discard gem, move deletion of repositories in a rake task to run in background worker [fixes SCI-2448] 2018-05-24 14:39:25 +02:00
zmagod b8098093ee migrations that fixes the bug with smart annotations [fixes SCI-2426] 2018-05-18 13:57:52 +02:00
zmagod 9d282d1800 adds new reports index page [fixes SCI-2124] 2018-04-18 16:47:52 +02:00
Oleksii Kriuchykhin a105e61d48 Remove tutorial [SCI-1860] 2018-03-18 13:18:05 +01:00
mlorb 64e26e1c60 add file custom column type to db 2018-03-09 17:04:54 +01:00
Oleksii Kriuchykhin 66c1901f96 Fix migration for better search [SCI-2108] 2018-03-09 15:46:38 +01:00
zmagod d12f8403e4 add reference to repository column 2018-02-12 09:05:41 +01:00
zmagod ae99c92516 follow @okriuchykhin 's suggestions 2018-02-09 16:28:21 +01:00
zmagod 557aeca049 refactor relations 2018-02-09 14:11:56 +01:00
zmagod 7c13c5a1f4 fixes typo, follows @okriuchykhin 's suggestions 2018-02-09 11:38:52 +01:00
zmagod 6b7ff11bcf setup models for repository list column [fixes SCI-2015] 2018-02-07 15:28:28 +01:00
Zmago Devetak 4716fc7752
Merge pull request #955 from biosistemika/decoupling 
Decoupling
 2018-01-25 11:33:06 +01:00
zmagod 88d7429041 1. fixes failing unit and integration tests 
2. fixes gem dependencies issues
3. fixes failing migrations
4. updates depricated factory_girl => factory_bot and fixes related issues

Signed-off-by: zmagod <zmago_devetak@yahoo.com>
 2018-01-23 14:54:15 +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 d1a515da90 Allow first user seeding from env variables [SCI-1949] 2018-01-18 16:23:33 +01:00
Luka Murn cf291bf887 Merge branch 'gilson-iot-rails4' 
Conflicts:
	Gemfile.lock
 2017-12-19 10:56:39 +01:00
Oleksii Kriuchykhin 6256acdfea Rename notifications settings accessor [SCI-1864] 2017-12-07 13:59:33 +01:00
Oleksii Kriuchykhin 84f4aba213 Pull latest master into gilson-iot-rails4 2017-11-15 15:15:26 +01:00
mlorb 126f278308
Merge pull request #853 from Zanz2/ZZ_import_protocolsio_json 
Scinote protocols IO base branch
 2017-11-06 14:53:01 +01:00
Zanz2 04c6f0c20d schema missing space 2017-11-03 21:50:06 +01:00
Zanz2 0dc0109d91 reverted schema 2017-11-03 21:47:52 +01:00
zmagod 55d05b013b fix typo 2017-11-03 10:11:23 +01:00
zmagod 3d22a5404d add scenic gem, teams datatables sql view 2017-10-26 16:59:00 +02:00
Zanz2 49501b3d3d Finished review refactor 2017-10-24 19:24:53 +02:00
Luka Murn 6c2c5aff17 Additional fixes required by latest merge from master 2017-10-23 09:51:13 +02: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
Oleksii Kriuchykhin 6820511ea0 Further canvas optimizations [SCI-1642] 2017-10-06 12:43:27 +02:00
Oleksii Kriuchykhin b26b963e54 Optimize update canvas SQL and remove module group name [SCI-1642] 2017-10-05 16:19:25 +02:00
Zanz2 b7432b336a added file upload popup modal, rails routes and controller functions, deleted old standalone model and controller 2017-09-13 15:15:08 +02:00
Luka Murn e5bfb3c42d Rollback migration version 2017-09-01 09:06:25 +02:00
Oleksii Kriuchykhin c3fceb90df Backport API to Rails-4 [SCI-1579] 2017-08-30 13:30:41 +02:00
Luka Murn c62002381b Add default settings migration and concern 2017-08-10 11:30:57 +02:00
Zmago Devetak a423315800 Merge pull request #729 from ZmagoD/zd_SCI_1418 
fixes bug with devise_security_extension [fixes SCI-1418]
 2017-07-25 14:36:05 +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
zmagod de78a1681a fixes bug with devise_security_extension [fixes SCI-1418] 2017-07-04 11:14:25 +02:00
zmagod 6dd21e87a7 fixes bug with indexes 2017-07-03 14:48:13 +02:00
zmagod bc33883c3c first run fixing addons 2017-06-30 10:23:28 +02:00
Oleksii Kriuchykhin 4060ba2ac3 Code style fixes [SCI-1356] 2017-06-27 13:23:51 +02:00
Oleksii Kriuchykhin e038bc58fa Add global search in custom repositories [SCI-1356] 2017-06-23 16:12:56 +02:00
Luka Murn 9e45d197df Change some stuff for repos to work, fix some bugs 
Closes SCI-1279.
 2017-06-07 18:07:49 +02:00
Luka Murn 02dd6636ba Allow saving & editing of reports with repository elements 
Closes SCI-1279.
 2017-06-07 16:55:00 +02:00
Luka Murn bb20d2661f Add association between repository rows & my modules 2017-06-07 16:54:32 +02:00
Oleksii Kriuchykhin ad8dd6d740 PR fixes [SCI-1274] 2017-06-07 15:23:25 +02:00
Oleksii Kriuchykhin 8b1190060e Add custom repository table [SCI-1274] 2017-06-07 15:23:25 +02:00
Luka Murn fcc3995049 Merge pull request #647 from biosistemika/master 
Bring latest master changes into custom-repositories
 2017-05-30 14:18:14 +02:00
Oleksii Kriuchykhin 85e81e9ea2 Improve repository models and migration [SCI-1267] 2017-05-17 10:04:07 +02:00
Oleksii Kriuchykhin 72a651c7de Add migrations and models for custom repositories [SCI-1267] 2017-05-16 15:27:36 +02:00
Matej Zrimšek ba693c65a8 Fixed adding contents to report logic and removed unneeded code. [fixes SCI-487] 2017-05-15 18:20:42 +02:00
zmagod c35e2a4860 adds persistence to experiments order in project overview [fixes SCI-974] 2017-05-15 09:54:37 +02:00