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

148 commits

Author SHA1 Message Date
Oleksii Kriuchykhin 572f28f0b8 Remove unused devise_security_extension dependency [SCI-3347] 2019-04-16 13:08:15 +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 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 37dc8298b7 Fix webpack config [SCI-2856] 2019-03-11 15:13:06 +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
Oleksii Kriuchykhin 7ccb42f493 Update rack version to 2.0.6 [SCI-2868] 2019-01-07 11:38:33 +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
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 cf37566e8f Update Gemfile.lock [SCI-2765] 2018-10-16 16:06:03 +02:00
Oleksii Kriuchykhin 8cf59d8d22 Add request rate throttling for API [SCI-2770] 2018-10-11 09:48:06 +02:00
Luka Murn 9f4cb02fba Update doorkeeper gem to >= 4.6 2018-10-05 11:50:17 +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
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
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 33c376c4df Update Sanitize gem [SCI-2253] 2018-07-27 17:26:46 +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
Zanz2 eab389c0dd Fixes tinymce editor not displaying, updated tinymce-rails gem to 4.7.11 2018-07-17 16:06:00 +02:00
Oleksii Kriuchykhin 78f44c48f8 Update bullet to version 5.7.5 2018-06-20 13:29:46 +02:00
Oleksii Kriuchykhin 6c914d2a73 Upgrade Rails to version 5.1.6, Sprockets to 3.7.2 2018-06-20 10:46:41 +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
Oleksii Kriuchykhin 39d594b0da Disable some validations in repository import to improve speed [SCI-2404] 2018-05-15 11:14:43 +02:00
Luka Murn cb6fe50832 Merge branch 'master' into ux-release-1 
Conflicts:
	app/assets/javascripts/repositories/index.js
 2018-04-26 11:38:54 +02:00
Luka Murn 9bf8b5d864 Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 
Conflicts:
	Makefile
	app/assets/javascripts/projects/index.js.erb
	app/assets/stylesheets/themes/scinote.scss
	config/locales/en.yml
 2018-04-12 13:16:46 +02:00
Luka Murn 159078170a Update Paperclip library to 5.3 version 2018-04-05 13:23:34 +02:00
Luka Murn dd961c408f Remove remotipart from Gemfile.lock 
This was forgotten when fixing SCI-2270.
 2018-04-04 15:56:08 +02:00
Oleksii Kriuchykhin 3b7977ee3b Merge latest changes from ux-release-1 [SCI-2217] 2018-04-04 14:20:34 +02:00
Oleksii Kriuchykhin 8ee98b7cf0 Update Capybara and dependencies [SCI-2217] 2018-04-04 14:13:37 +02:00
okriuchykhin 145f49de2d
Revert "Update turbolinks and fix repository table init [SCI-2251]" 2018-03-26 17:38:48 +02:00
Oleksii Kriuchykhin e42fc3117b Implement search in file repository cells and improve performance [SCI-2111] 2018-03-26 13:19:09 +02:00
Oleksii Kriuchykhin 83c7539156 Update turbolinks and fix repository table init [SCI-2251] 2018-03-25 19:44:58 +02:00
Oleksii Kriuchykhin a105e61d48 Remove tutorial [SCI-1860] 2018-03-18 13:18:05 +01:00
zmagod 1cdba5e0d3 Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2068 2018-03-16 11:05:16 +01:00
zmagod d69754af04 implement search on list items dropdown, update, create actions [fixes SCI-2070] 2018-03-15 15:43:16 +01:00
zmagod dd2f7dd417 Merge branch 'master' of https://github.com/biosistemika/scinote-web into samples_to_repositories_table_migration 2018-03-13 13:24:36 +01:00
zmagod 41db1a9ab3 update bootstrap to v 3.3.7 2018-03-12 08:57:02 +01:00
mlorb d4e62c3c13 add Gemfile.lock 2018-03-01 18:03:13 +01:00
Oleksii Kriuchykhin 16e1d072b9 Improve files handling in protocol clonning [SCI-2003] 2018-02-01 15:44:08 +01:00