scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-28 02:46:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
4210 commits 69 branches 179 tags 165 MiB
Commit graph

12 commits

Author SHA1 Message Date
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
mlorb b8e91e91a1 refactor settings into the new navigation bar 2018-04-05 16:30:02 +02:00
Oleksii Kriuchykhin a105e61d48 Remove tutorial [SCI-1860] 2018-03-18 13:18:05 +01:00
zmagod f8a3fca2db Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling 2018-01-23 11:06:33 +01:00
mlorb e577b363b2 byTheWay fix of Rails 5.1 bug 2017-12-14 14:18:17 +01:00
Oleksii Kriuchykhin baf3151bb0 Fix notification settings accessors [SCI-1864] 2017-12-13 11:59:53 +01:00
Luka Murn 4e06b5c397 Revert "Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]"" 2017-10-17 13:17:49 +02:00
Luka Murn 4d8f2665d3 Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]" 2017-10-17 13:10:02 +02:00
Luka Murn fe89b942e7 Add Add-ons page to User -> Settings -> Account 
Closes SCI-1675.
 2017-10-11 14:15:37 +02:00
Luka Murn 9227ea5854 Finish the user settings jsonb, also fix references throughout app 
Closes SCI-1475.
 2017-08-10 14:29:01 +02:00
Luka Murn c62002381b Add default settings migration and concern 2017-08-10 11:30:57 +02:00
Luka Murn 5cb3eb5e09 Refactor preferences -> move them to subcontroller, subroute 2017-02-09 11:07:16 +01:00