Commit graph

63 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
baf3151bb0 Fix notification settings accessors [SCI-1864] 2017-12-13 11:59:53 +01:00
Oleksii Kriuchykhin
84f4aba213 Pull latest master into gilson-iot-rails4 2017-11-15 15:15:26 +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
e078ae4f77 Merge branch 'rails-5.1' into decoupling-settings-page 2017-09-21 08:36:09 +02:00
Oleksii Kriuchykhin
c3fceb90df Backport API to Rails-4 [SCI-1579] 2017-08-30 13:30:41 +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
zmagod
f104444a0c adds additional explanations [fixes SCI-1103] 2017-04-12 16:56:47 +02:00
Luka Murn
f7bd62547e Refactor teams settings into its own controllers 2017-02-09 14:37:59 +01:00
Luka Murn
7bee3a4ea0 Move user profile to settings 2017-02-09 11:34:52 +01:00
Luka Murn
5cb3eb5e09 Refactor preferences -> move them to subcontroller, subroute 2017-02-09 11:07:16 +01:00