scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-11 07:03:34 +08:00
Code Issues Projects Releases Packages Wiki Activity
scinote-web/app
History
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
..
assets Merge branch 'features/export-all' 2018-11-13 09:14:02 +01:00
controllers Merge branch 'core-api' into 'master' 2018-11-14 16:59:04 +01:00
datatables
helpers Merge branch 'features/export-all' 2018-11-13 09:14:02 +01:00
javascript
mailers
middlewares
models Merge branch 'core-api' into 'master' 2018-11-14 16:59:04 +01:00
permissions Remove blank line 2018-10-26 11:00:13 +02:00
serializers Fix failing tests [SCI-2773] 2018-11-07 16:39:00 +01:00
services Merge branch 'core-api' into 'master' 2018-11-14 16:59:04 +01:00
utilities Fix failing tests [SCI-2688] 2018-08-24 15:48:49 +02:00
views Merge branch 'core-api' into 'master' 2018-11-14 16:59:04 +01:00