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

267 commits

Author SHA1 Message Date
Oleksii Kriuchykhin efe5d8a6ea Remove the deprecated foreign keys from TinyMceAsset [SCI-3839] 2019-10-01 15:49:37 +02:00
Oleksii Kriuchykhin f00f594dbf Improve ActiveStorage migrations [SCI-3854] 2019-10-01 12:45:51 +02:00
Urban Rotnik 60a414c4ec Change migrations order back 2019-09-27 16:20:56 +02:00
Jure Grabnar c748513ca9 Rename Active storage migration to a later date 2019-09-26 13:55:30 +02:00
Oleksii Kriuchykhin b841d3dd6b Add override for ActiveStorage downloader to handle missing file checksums [SCI-3888] 2019-09-18 15:34:49 +02:00
aignatov-bio 64306cfb2a
Fix active storage migration script (#2060) 
* Fix active storage migration script

* Update check logic
 2019-09-18 09:20:04 +02:00
Oleksii Kriuchykhin 0475394b08 Fix test [SCI-3881] 2019-09-16 13:03:41 +02:00
Oleksii Kriuchykhin 3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +02:00
Oleksii Kriuchykhin bc38c6b29e Fix failing test [SCI-3745] 2019-09-16 10:26:13 +02:00
Oleksii Kriuchykhin c068901b00 Upgrade Rails to 6.0 [SCI-3745] 2019-09-12 17:24:08 +02:00
Oleksii Kriuchykhin 419a4c8e8c Update trim_html_tags Postgres function [SCI-3726] 2019-08-30 16:42:03 +02:00
Oleksii Kriuchykhin 267c53c2d2 Refactor inventory sharing logic [SCI-3803] 2019-08-29 17:21:49 +02:00
Urban Rotnik 0ce331227c Update permission and model to share repository over all teams 2019-08-13 14:07:24 +02:00
Urban Rotnik 1a77702fa7 Add uniq index for Repository and Team in TeamRepositories 2019-08-09 14:13:00 +02:00
Urban Rotnik f569411bc7 Add TeamRepository model 2019-08-09 14:12:59 +02:00
Oleksii Kriuchykhin d52df56fc4 Fix production build and update packages [SCI-3678] 2019-08-08 14:03:15 +02:00
Anton Ignatov ffd415d409 Inital refactor for Assets model 2019-07-12 15:02:06 +02:00
Anton Ignatov 57a273d5d0 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 11:34:41 +02:00
Oleksii Kriuchykhin 9d926dc956 Refactor TinyMce assets, user avatars, zip files [SCI-3539] 2019-07-05 16:56:05 +02:00
Anton Ignatov c9ae9f056e Merge branch 'okriuchykhin-ok_SCI_3539' into features/marvinjs-integration 2019-07-01 10:44:29 +02:00
Oleksii Kriuchykhin 5acb16d43e Update Asset helper methods [SCI-3539] 2019-06-28 08:17:09 +02:00
Oleksii Kriuchykhin ba2daede0b Add migration scripts [SCI-3539] 2019-06-24 15:17:42 +02:00
Anton Ignatov 7e5c39d3e4 Merge branch 'master' into features/marvinjs-integration 2019-06-21 14:51:45 +02:00
aignatov-bio 9653f16196
Convert image to base64 in PDF reports [SCI-3557] (#1835) 
* Convert image to base64 in PDF reports

* Fix typo error
 2019-06-19 13:57:04 +02:00
Oleksii Kriuchykhin 109793c7fb Upgrade to Rails 5.2.3 and add ActiveStorage [SCI-3539] 2019-06-13 12:10:44 +02:00
Anton Ignatov 16d00340cd Fix merge errors 2019-05-31 10:35:04 +02:00
Anton Ignatov c9a29b12ba Merge branch 'master' into features/marvinjs-integration 2019-05-31 10:27:14 +02:00
Oleksii Kriuchykhin d46d82d0f0 Fix Hound warning [SCI-3368] 2019-05-21 10:56:55 +02:00
Oleksii Kriuchykhin d3f29d5d72 Add type column to zip_exports for STI [SCI-3368] 2019-05-20 16:35:24 +02:00
Anton Ignatov 259b75a6ba Merge branch 'master' into features/marvinjs-integration 2019-05-16 09:28:48 +02:00
Anton Ignatov 652fba0e23 Merge branch 'master-with-note-section' 2019-05-13 11:08:11 +02:00
Urban Rotnik 2364c2653f Add bulk insert for UserSystemNotifications, New service for sending emails 2019-05-08 08:38:10 +02:00
Anton Ignatov f80d881847 Fix markup 2019-04-28 19:11:41 +02:00
Anton Ignatov 46f0e0c0c2 Add marvin js assets to assets sort and name field 2019-04-27 12:46:45 +02:00
Anton Ignatov fe620c4a63 Add marvin model and controller 2019-04-26 22:59:38 +02:00
Anton Ignatov 7d60eb5572 Fix migration issues 2019-04-23 11:11:22 +02:00
Anton Ignatov aa2dab2014 Merge branch 'features/note-section' into master-with-note-section 2019-04-23 10:31:37 +02:00
aignatov-bio 6ac620feb3
Migration for old tinymce assets [SCI-3176] (#1663) 
* adding rake task

* Addign test for update images

* Adding tests for tiny mce model
 2019-04-19 15:24:54 +02:00
Oleksii Kriuchykhin 4014f19665 Update schema.rb file 2019-04-17 14:57:38 +02:00
aignatov-bio 8d7cc57da1
Add zoom to image annotation and check jpeg file quality before save [SCI-3300] (#1654) 
* Add zoom to image annotation and check jpeg file quality before save
* Move compression to front end
* Move quality extractor to paperclip processor
 2019-04-15 09:49:44 +02:00
aignatov-bio 08263ab64e
adding filters for task activities [SCI-3076] (#1553) 
* update task activity screen
 2019-03-28 10:55:48 +01:00
Miha Mencin 4a87216a3d
Merge branch 'master' into features/global-activities 2019-03-25 14:35:24 +01:00
Anton Ignatov 5d6f009ee8 fix error for delay deleting 2019-03-20 15:20:31 +01:00
Anton Ignatov 55c93922ea markup fixes 2019-03-20 14:46:54 +01:00
Anton Ignatov 07c2819163 refactoring tinymce image uploading 2019-03-20 14:46:54 +01:00
Anton Ignatov 87280f083a [SCI-3166] Finalize global activities front end 2019-03-19 13:50:55 +01:00
Urban Rotnik ad8e5973fa Remove not null constraint from project_id in Activity table 2019-03-11 08:36:15 +01:00
Miha Mencin 6deaff6382 fixing hound errors 2019-03-04 18:36:32 +01:00
Miha Mencin fa7bba9de7 scheduling creation of demo project at the sign in time 
remove wrong schema, fix comment, add migration
 2019-03-04 18:26:15 +01:00
Miha Mencin 51b3aea49a added uniquness validator and index on user_projects and user_teams relations 
finxing typo, fixied failing test

fixing mistakenly commited file

fixing schema to include bigint migration
 2019-02-27 15:09:47 +01:00
Urban Rotnik 3ad6cee766 Fix tests, remove nullable field 2019-02-25 16:50:38 +01:00
Urban Rotnik 5b5c6c7122 Changes to Activity model 2019-02-25 16:49:55 +01:00
Urban Rotnik 7b6c6c414d Merge branch 'master' into features/templates 2019-02-19 14:46:15 +01:00
aignatov-bio c598541e09
System notification modal window [SCI-2957 and SCI-2958] (#1484) 
* Added new system notification modal

* Adding loading system notification on sign in
 2019-02-15 13:07:29 +01:00
aignatov-bio 5c85595ab4
System Notifications - View All Page [SCI-2956 and SCI-3001] (#1482) 
* System notification view and notification partial (SCI 2956 and SCI 3001)
 2019-02-13 13:06:14 +01:00
Urban Rotnik 8ebb7561d9 Add last_time_changed_at columnd to SystemNotifications 2019-01-31 16:44:20 +01:00
Oleksii Kriuchykhin cc92de3726 Merge latest features/templates [SCI-2939] 2019-01-30 10:43:54 +01:00
Urban Rotnik 3e2c9934d0 Add SystemNotification model 
- SystemNotifiction model with spec
- UserSystemNotification model for many-many association
 2019-01-29 11:40:26 +01:00
Oleksii Kriuchykhin f7b73c617a Fix code styling [SCI-2939] 2019-01-28 15:37:24 +01:00
Miha Mencin 4acd2a592d Adding previously forgotten schema file 2019-01-28 11:25:35 +01:00
Oleksii Kriuchykhin bd2efa55ac Add templates business logic [SCI-2939] 2019-01-25 10:55:08 +01:00
Miha Mencin 6e16a63dcd implementing suggestion from alex, now table and indices names are hardoced 2019-01-21 11:02:33 +00:00
Miha Mencin 7ade88cf92 SCI-2936 code style final 2019-01-18 09:38:04 +01:00
Miha Mencin 70b1852d64 SCI-2936 code style 2019-01-18 09:33:45 +01:00
Miha Mencin 2271e453df SCI-2936 minor refactor and code styling 2019-01-18 09:25:32 +01:00
Miha Mencin f6230b2c9a SCI-2936 added down method, make code more readable 2019-01-17 18:10:45 +01:00
Miha Mencin 4a6459000f SCI-2936 added migration 2019-01-17 17:54:15 +01:00
Alex Kriuchykhin aac5c101a5
Merge pull request #1431 from okriuchykhin/ok_SCI_2864 
Improve user's variables migration [SCI-2864]
 2018-12-19 19:19:23 +01:00
Oleksii Kriuchykhin 90b46c665d Refresh user's model in variables migration [SCI-2864] 2018-12-19 19:03:10 +01:00
Oleksii Kriuchykhin 70cc3742ad Improve user's variables migration [SCI-2864] 2018-12-19 18:30:27 +01:00
Alex Kriuchykhin ab0924c8e6
Merge pull request #1415 from okriuchykhin/ok_SCI_2864 
Use built-in methods for Postgres extensions enabling [SCI-2864]
 2018-12-16 19:45:56 +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 7cd1c12a4f Use built-in methods for Postgres extensions enabling [SCI-2864] 2018-12-10 14:14:49 +01:00
Luka Murn e9c0b34662 Merge branch 'core-api' into 'master' 
Conflicts:
	Gemfile
	app/services/api.rb
	config/initializers/api.rb
	config/initializers/extends.rb
	config/routes.rb
	db/schema.rb
	spec/controllers/api/api_controller_spec.rb
 2018-11-14 16:59:04 +01:00
Luka Murn 84df2c81f9 Merge branch 'features/export-all' 
Conflicts:
	app/controllers/experiments_controller.rb
	app/controllers/my_modules_controller.rb
	db/schema.rb
 2018-11-13 09:14:02 +01:00
Oleksii Kriuchykhin 02f536cd08 Merge latest features/export-all [SCI-2733] 2018-10-16 17:20:19 +02:00
Jure Grabnar 2558b7a313 Fix formatting according to HoundBot 2018-10-16 11:00:38 +02:00
Jure Grabnar 26df1e5a98 Add export project modal 
Closes [SCI-2645]
 2018-10-16 11:00:38 +02:00
Oleksii Kriuchykhin af02f29fb5 Implement user state saving for projects overview [SCI-2733] 2018-10-10 16:15:31 +02:00
Oleksii Kriuchykhin 49e788a9ad Mergre latest core-api [SCI-2515] 2018-09-14 10:24:05 +02:00
Luka Murn 586a442abc Refactor the settings page, rename setting to tooltips_enabled 2018-09-05 16:36:32 +02:00
Oleksii Kriuchykhin ecde634a2c Add OAuth2 provider [SCI-2515] 2018-08-17 13:17:59 +02:00
Oleksii Kriuchykhin 4df9a4c9ca Fix code style warnings [SCI-2614][SCI-2616][SCI-2617] 2018-08-08 17:01:49 +02:00
Oleksii Kriuchykhin 938ec5acb8 Change primary key to bigint on repositories [SCI-2614][SCI-2616][SCI-2617] 2018-08-08 17:01:49 +02:00
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