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
14661 commits 31 branches 181 tags 166 MiB
Commit graph

109 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
7e86c61227 Add migration for fixing checklist items with duplicated positions [SCI-9444] 2023-10-05 14:55:18 +02:00
Anton
86f413cc71 Add title to text component [SCI-9141] 2023-09-04 14:13:29 +02:00
Alex Kriuchykhin
dbbc5775d4
Add unit column to ledger records, fix stock update records and their creation logic [SCI-9021] (#6034) 2023-08-22 10:47:58 +02:00
Anton
2d64d2fcbf Merge branch 'develop' into features/september-release 2023-08-21 11:25:27 +02:00
Anton
6e5fa5ccd7 Add create actions [SCI-8953] 2023-08-11 15:04:49 +02:00
Alex Kriuchykhin
4299cce08b Migrate results to the new data model with ResultOrderableElements [SCI-8878] (#5869) 2023-08-07 16:07:20 +02:00
ivanscinote
242df0632d
Merge branch 'features/august-release' into SCI-8807-notifications 2023-08-02 13:40:06 +02:00
Ivan Kljun
18fb319351 Drop system notifications tables and remove logic 2023-07-25 14:48:03 +02:00
Soufiane
c12023f8aa
Remove user_team model and related code [SCI-8815] (#5815) 2023-07-20 10:57:29 +02:00
Oleksii Kriuchykhin
66b361c689 Upgrade Rails to version 7.0.5 [SCI-8632] 2023-06-21 14:38:32 +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
Anton Ignatov
ffd415d409 Inital refactor for Assets model 2019-07-12 15:02:06 +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
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
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
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
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
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
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
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
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
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
Oleksii Kriuchykhin
02f536cd08 Merge latest features/export-all [SCI-2733] 2018-10-16 17:20:19 +02:00