Commit graph

47 commits

Author SHA1 Message Date
aignatov-bio
ea661f3c19
Merge branch 'develop' into features/new_experiment_views 2022-12-22 13:33:25 +01:00
Anton
2ae8943d80 Update general canvas layout [SCI-7196] 2022-10-19 11:46:16 +02:00
Anton
1062fbc2fd Replace label template promo logo [SCI-7350] 2022-10-19 11:25:49 +02:00
Andrej
f3fdcc1204 Remove old label printer modal code [SCI-7305] 2022-10-13 16:49:06 +02:00
Anton
51cb951e06 Update labels index page [SCI-7048] 2022-08-08 11:15:46 +02:00
artoscinote
eb619184a5
Implement typed label templates [SCI-7046] (#4316)
* Implement typed label templates [SCI-7046]

* Add structure.sql, fix migration [SCI-7046]

* Fix method name [SCI-7046]

* Add dependent option to team - label_template relation [SCI-7046]

* Migration code style, add input sanitization [SCI-7046]

* Fix new label creation [SCI-7046]
2022-08-08 10:06:00 +02:00
Anton
8c080ea04c Add promo page for label templates [SCI-7029] 2022-08-02 14:51:18 +02:00
ajugo
ad4f52d912
Add Label template list screen - view mode [SCI-7018] (#4292)
* Initial label template datatable [SCI-7018]

* Add new columns to LabelTemplate and update datatable view [SCI-7018]

* Fix after rebase [SCI-7018]

* Fix migration, disable checkboxes in view mode and fix label template to team level [SCI-7018]
2022-07-27 10:10:32 +02:00
artoscinote
7c3904f4ac
Add missing icon [SCI-6492] (#3850) 2022-02-14 15:03:24 +01:00
ajugo
c570cef06c
Style corrections for printed protocol [SCI-6326] (#3782)
* Printed protocol display improvements [SCI-6326]

* Fix new line

* Fix hound [SCI-6326]

* Using image_tag helper [SCI-6326]

* Move pictures to asset folder [SCI-6326]
2022-01-14 15:02:04 +01:00
artoscinote
c746d6b761
Add missing icon [SCI-6314] (#3714) 2021-12-02 10:09:11 +01:00
Martin Artnik
57d5e6c2a7 Merge branch 'develop' into features/barcodes 2021-08-03 13:36:36 +02:00
aignatov-bio
a54f36a486
Add empty state for barcode printers [SCI-5935] (#3455) 2021-07-28 11:12:46 +02:00
Martin Artnik
96a5b97bdb Implement Save & Register molecule [SCI-5879] 2021-07-15 12:37:04 +02:00
aignatov-bio
786e74e4de
Add BioEddie integration [SCI-5654][SCI-5657][SCI-5658][SCI-5670] (#3391)
* Add backend for bioeddie [SCI-5654]

* Add modal for bioeddie [SCI-5654]

* Add bio eddie editor to steps and results [SCI-5654]

* Fix markup and code styling
2021-06-23 19:48:44 +02:00
aignatov-bio
df4297f6f7 Merge branch 'develop' into features/local_file_previews 2021-03-08 11:30:47 +01:00
aignatov-bio
b3faa170fb
PDF preview to file preview and inline view [SCI-5299][SCI-5298] (#3018)
* Add PDF Preview [SCI-5299]
2020-12-22 15:25:30 +01:00
Oleksii Kriuchykhin
67b3f853d7 Merge branch 'develop' into features/folders 2020-12-18 14:51:21 +01:00
aignatov-bio
f2ca55dbf8 Add new icons for assets 2020-11-24 15:37:45 +01:00
aignatov-bio
77b7b1b231 Add errors handling and i18n 2020-11-21 12:31:49 +01:00
aignatov-bio
eca39a00b5 Add attachments dropdown to step 2020-11-02 18:47:08 +01:00
aignatov-bio
ddfe8231d8 Merge branch 'features/2fa' into develop 2020-07-22 11:56:36 +02:00
Urban Rotnik
5d067077b1 Add logo and timestamp to PDF and Doc reports 2020-07-08 10:48:29 +02:00
aignatov-bio
7a9a25e6a9 Add 2fa wizzard tabs 2020-07-07 13:17:17 +02:00
aignatov-bio
b87d6a22a7 Add checkboard background for transparent images 2020-02-19 10:48:31 +01:00
aignatov-bio
cd471bfb25 Update delimiter dropdown for manage column modal 2020-01-20 14:26:17 +01:00
aignatov-bio
18a8be43f5 Add new logo 2020-01-06 10:40:20 +01:00
aignatov-bio
737f9e572c
Replace marvinJS logo and fix some merge issues [SCI-3731] (#1976)
* Replace marvinJS logo and fix some merge issues

* Fix tests
2019-08-13 11:04:19 +02:00
Oleksii Kriuchykhin
973efa55e1 Merge branch 'master' into ok_SCI_3678 2019-08-08 11:17:07 +02:00
Anton Ignatov
3339c1fbbf Add MarvinJS to Result and TinyMce MarvinJS refactor 2019-07-15 17:17:14 +02:00
Jure Grabnar
d103f8ffec Finish external protocols screen
Closes SCI-3534
2019-06-17 12:24:12 +02:00
Luka Murn
584cf4b93b Change Office icon on the create New Office buttons 2019-05-10 17:51:29 +02:00
Urban Rotnik
ea0368aa11 Attachments update for edit page 2019-04-23 13:50:47 +02:00
Jure Grabnar
cbf109f884 Fix create WOPI file button
Closes SCI-3137
2019-04-04 17:05:25 +02:00
Jure Grabnar
fddff9c627 Perform styling on the WOPI modal 2019-04-04 17:05:25 +02:00
Oleksii Kriuchykhin
0930277c4e Add views and helpers for global activities individual cards [SCI-2994][SCI-3024] 2019-02-27 16:02:53 +01:00
mlorb
c4ecfc4d38 Change icons throughout sciNote - navigation, project, task cards 2018-05-22 16:55:58 +02:00
Oleksii Kriuchykhin
1ed0b16d12 Rescale Linkedin buttons [SCI-2201] 2018-03-27 15:00:28 +02:00
Oleksii Kriuchykhin
37f675b32a Use larger LinkedIn sign-in button [SCI-2201] 2018-03-18 12:18:33 +01:00
mlorb
08439e7f58 sign up with linkedIn account 2018-02-28 18:12:21 +01:00
zmagod
68cfac4a38 adds images into assets folder 2017-06-29 11:04:31 +02:00
zmagod
819f47b450 setup sciNote for Rails 5.1 2017-06-23 15:19:08 +02:00
Luka Murn
cf72da5635 Merge branch 'improved-files-handling' into 'master'
Conflicts:
	app/assets/javascripts/protocols/steps.js.erb
	app/helpers/assets_helper.rb
	db/schema.rb
2017-01-18 11:29:40 +01:00
zmagod
8b0dab624d clear unneeded css, change processing image [fixes SCI-758] 2016-12-09 14:24:20 +01:00
zmagod
40fdfef67f setup delayed_paperclip gem 2016-12-08 15:24:14 +01:00
zmagod
9d91d2ce28 adds new samples columns dropdown [fixes SCI-698] 2016-11-25 17:29:30 +01:00
Luka Murn
055298fee8 Initial commit. 2016-02-12 16:52:43 +01:00