Commit graph

27 commits

Author SHA1 Message Date
aignatov-bio 77b7b1b231 Add errors handling and i18n 2020-11-21 12:31:49 +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