scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-25 09:13:05 +08:00
Code Issues Projects Releases Packages Wiki Activity
6008 commits 39 branches 184 tags 168 MiB
Commit graph

179 commits

Author SHA1 Message Date
Jure Grabnar
d9f6c249f9 Fix CVE-2015-9284 omniauth security precautions 
Close SCI-3588
 2019-07-31 16:59:38 +02:00
Jure Grabnar
6546bd1532 Add omniauth-rails_csrf_protection gem 
Close SCI-3588
 2019-07-31 16:05:06 +02:00
Oleksii Kriuchykhin
028e647f4d Upgrade to Rails 5.2.3 [SCI-3651] 2019-07-03 11:15:13 +02:00
Jure Grabnar
4bdefda2af Upgrade webpacker to ~> 4.0.0 2019-07-02 13:30:13 +02:00
aignatov-bio
2793777463
Features/docx report (#1873) 
* Initial setup for docx report

* Add render for project, experiment, my_module

* Implement converter for RTE fields

* Add all report elements

* fix markup

* Change headers, remove empty blocks, refactored repository draw

* Add smart annotations support

* Fix justify fields

* Prepare for addons integration

* Fix markup

* Add comments to GemFile

* Fix TinyMCE error

* Change UI for new report download selector

* Fix file error in inventory cell for docx

* Fix i18n object for header
 2019-07-01 10:14:16 +02:00
Jure Grabnar
bbfe2b9c89
Merge pull request #1798 from biosistemika/jg_sci_3145_thumbnail_preview 
File preview on new attachments layout [SCI-3145]
 2019-06-10 17:59:12 +02:00
Urban Rotnik
17f987e7c8 Add rubocop-perfromance after Rubocop has been updated 2019-06-10 12:24:04 +02:00
Oleksii Kriuchykhin
e543a849d4 Add document file preview generation with LibreOffice [SCI-3145] 2019-06-05 14:52:30 +02:00
Anton Ignatov
995408e7fc Fix protocol update error, rollback bootstrap gems and fix step name 2019-05-08 17:18:19 +02:00
Anton Ignatov
d36160386f Merge branch 'master' into master-with-note-section 2019-05-07 13:26:55 +02:00
Oleksii Kriuchykhin
4522e6bf06 Update Ruby to 2.5.5, Rails to 5.1.7 and Devise to 4.6.2 [SCI-3401] 2019-04-30 17:04:48 +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
572f28f0b8 Remove unused devise_security_extension dependency [SCI-3347] 2019-04-16 13:08:15 +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
9fff93ab0e
Merge pull request #1576 from biosistemika/image-editor-prototype 
Feature/Image annotation
 2019-03-22 16:31:00 +01:00
Oleksii Kriuchykhin
a822227383 Add rich text editor to task and protocol description [SCI-3062][SCI-3071] 2019-03-14 16:27:33 +01:00
Oleksii Kriuchykhin
0b0141de5f Update Rails to 5.1.6.2 2019-03-13 20:32:29 +01:00
Anton Ignatov
b6480b04a9 Fixed conflicts 2019-03-11 15:36:56 +01:00
Oleksii Kriuchykhin
9bbdc8fc89 Include tui image editor with webpack [SCI-2856] 2019-03-11 15:12:38 +01:00
Urban Rotnik
d3d9868ba4 Set version for HTTParty dependency, add opts in mailer 2019-02-19 11:23:01 +01:00
Urban Rotnik
5b55860dea Add scheduler 2019-02-13 15:48:15 +01:00
Urban Rotnik
9f3187abdf Add service for sync system notifications 2019-02-13 15:48:15 +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
457e9990c5 Add overcommit gem for git hooks (rubocop) 2019-01-18 16:56:28 +01:00
Urban Rotnik
6cf4717ab3 Add envirnoments to run app without docker, reorder Gemfile 
- Reorder Gemfile into alphabet order (rule by Rubocop)
- Add extra ENV variable for custom DB settings locally
- Add extra ENV for disable spoof check on Paperclip
 2019-01-18 16:01:09 +01:00
Oleksii Kriuchykhin
1d4fc7172d Update Ruby to 2.4.5 and add jemalloc package 2019-01-15 17:10:10 +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
0e192cc830 Ensure that temporary report is always deleted [SCI-2834] 2018-11-06 09:33:18 +01:00
Alex Kriuchykhin
e9b64b65a3
Merge pull request #1330 from okriuchykhin/ok_SCI_2770 
Add request rate throttling for API [SCI-2770]
 2018-10-19 09:38:31 +02:00
Oleksii Kriuchykhin
b9320b3b1d Update sdoc gem [SCI-2765] 2018-10-16 16:50:42 +02:00
Oleksii Kriuchykhin
f6b039d54e Merge latest core-api branch [SCI-2765] 2018-10-16 12:07:47 +02:00
Oleksii Kriuchykhin
8cf59d8d22 Add request rate throttling for API [SCI-2770] 2018-10-11 09:48:06 +02:00
Oleksii Kriuchykhin
77e2371091 Add tests for inventory cell endpoints [SCI-2765] 2018-10-08 13:25:03 +02:00
Luka Murn
9f4cb02fba Update doorkeeper gem to >= 4.6 2018-10-05 11:50:17 +02:00
Luka Murn
5e797c5dae
Remove double 'kaminari' Gem inclusion in Gemfile 2018-09-28 10:47:33 +02:00
Luka Murn
00c714be07
Merge pull request #1299 from Ducz0r/lm-fix-rubocop 
Update rubocop to 0.59.0, fix the config to be compliant
 2018-09-24 10:27:19 +02:00
Oleksii Kriuchykhin
49e788a9ad Mergre latest core-api [SCI-2515] 2018-09-14 10:24:05 +02:00
Luka Murn
0a2be5072a Update rubocop to 0.59.0, fix the config to be compliant 2018-09-12 17:17:55 +02:00
Luka Murn
99c156de94 Fix (hopefully) the TinyMCE files from being cached 
Closes SCI-2717.
 2018-09-12 15:28:21 +02:00
Alex Kriuchykhin
1832c0e806
Merge pull request #1262 from okriuchykhin/ok_SCI_2614 
Add read inventories and inventory items endpoints [SCI-2614][SCI-2616][SCI-2617]
 2018-08-24 15:22:13 +02:00
Oleksii Kriuchykhin
ecde634a2c Add OAuth2 provider [SCI-2515] 2018-08-17 13:17:59 +02:00
Zanz2
2608561560
Merge branch 'master' into zz_protocols_edit_rtf_form_bug_sci2305_v2 2018-08-09 11:38:15 +02:00
Zanz2
1de9e4b360 changed version 2018-08-09 11:35:50 +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
Alex Kriuchykhin
6004f8411b
Merge pull request #1260 from okriuchykhin/ok_SCI_2611 
Add GET teams and team API endpoints [SCI-2611][SCI-2612]
 2018-08-08 16:59:42 +02:00
okriuchykhin
bb5d029c30
Merge pull request #1251 from okriuchykhin/ok_SCI_2253 
Upgrade to Turbolinks 5 [SCI-2253]
 2018-08-02 14:43:19 +02:00
Oleksii Kriuchykhin
22e12d8fc3 Add GET teams and team API endpoints [SCI-2611][SCI-2612] 2018-07-31 13:40:27 +02:00
Oleksii Kriuchykhin
b2bd1cb849 Upgrade to Turbolinks 5 [SCI-2253] 2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
0e372af729 Adds API authentication with Azure AD [SCI-2608] 2018-07-24 14:21:33 +02:00