Commit graph

14 commits

Author SHA1 Message Date
zmagod ac52e643be cleanup direct upload 2016-12-08 11:26:13 +01:00
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
Mojca Lorber 607f1381d0 fix mobile view 2016-11-15 10:58:15 +01:00
Oleksii Kriuchykhin 2fb3041784 Fixes edit avatar link area [SCI-649] 2016-11-11 13:17:44 +01:00
Matej Zrimšek 0fe5822825 Added profile statistics data hook. 2016-11-03 17:50:32 +01:00
Mojca Lorber a234c4c9d9 fix merge conflict problem with avatar on profile page 2016-11-03 15:23:09 +01:00
Mojca Lorber 44b51d087a merging 2016-11-02 14:06:20 +01:00
Mojca Lorber 91ec201fd0 make image clickable 2016-10-27 16:18:31 +02:00
Oleksii Kriuchykhin d28edfb488 Added statistics block in users profile [SCI-566] 2016-10-27 13:44:27 +02:00
Mojca Lorber 8309df0aaf fix hound 2016-10-26 13:51:05 +02:00
Mojca Lorber 878952f072 change edit avatar in profile 2016-10-26 13:41:17 +02:00
Matej Zrimšek 951cf67b3d A lot of file uploading edge cases considered. File uploading is now actually redirected to S3 server, as before was not. Error functions changed and error output format specified, which should be used consistently throughout the application. Some other refactoring. 2016-08-17 18:08:21 +02:00
Luka Murn 076b67620f Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
Luka Murn 055298fee8 Initial commit. 2016-02-12 16:52:43 +01:00