scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-30 20:23:14 +08:00
Code Issues Projects Releases Packages Wiki Activity
scinote-web/app
History
Luka Murn 9d3685f872 Merge branch 'gamification' into 'master' 
Conflicts:
	app/controllers/users/invitations_controller.rb
	app/controllers/users/settings_controller.rb
2016-11-17 16:30:18 +01:00
..
assets Merge branch 'gamification' into 'master' 2016-11-17 16:30:18 +01:00
controllers Merge branch 'gamification' into 'master' 2016-11-17 16:30:18 +01:00
datatables Fix bug with linked tasks 2016-08-24 17:22:16 +02:00
helpers refactoring 2016-11-08 11:20:14 +01:00
mailers Bugfix for notification emails 2016-10-13 12:12:28 +02:00
models Merge branch 'gamification' into 'master' 2016-11-17 16:30:18 +01:00
utilities Save first time tutorial Activity-s without callbacks 2016-11-14 15:55:44 +01:00
views Merge branch 'gamification' into 'master' 2016-11-17 16:30:18 +01:00