0e39aae1bf
[ #343 ] use new ruby hash syntax
2014-01-21 10:51:49 +06:00
0cb585ef71
Merge branch 'master' into 29-migrate-to-ruby-2.1
...
Conflicts:
Gemfile
Gemfile.lock
app/controllers/activity_feeds_controller.rb
app/models/activity_feed_observer.rb
config/environments/development.rb
config/initializers/a_app_config.rb
config/initializers/airbrake.rb
lib/modules/models/git.rb
spec/controllers/activity_feeds_controller_spec.rb
spec/helpers/activity_feeds_helper_spec.rb
2014-01-10 08:31:31 +06:00
7a6facd316
[ #19 ] small avatar refactoring
2013-04-02 21:14:32 +06:00
e055d0080b
#29 : removed hack for encoding
2013-03-18 15:36:16 +04:00
04b2647ef0
#668 : added uploading avatars for groups
2012-10-03 20:38:42 +04:00
a68d4a2926
[issue #347 ] Many changes.
...
Changes includes:
* Changed Collaborator model;
* Autocomplete now works through backbone;
* Changed autocomplete styles;
* Groups have their own avatar;
* Changed previous backbone scripts;
2012-04-13 02:01:24 +04:00
ba437f7703
[refs #265 ] changed activity feed messages
2012-03-14 00:47:37 +06:00
6a7d9636f5
[refs #265 ] fixed user avatars
2012-03-11 23:06:41 +06:00
7308c4a0d2
Merge branch '3.2-master' into 255-search
...
Refactor avatars. Fix user bugs. Remove ssh_key delete migration
Conflicts:
app/assets/stylesheets/design/custom.scss
app/models/user.rb
2012-03-06 20:59:29 +02:00
796ff75857
Great models refactoring. Refactor some cancan abilities and controllers authorization. Move some common parts to modules. Fix lots bugs. Remove unused files and code. Drop ACL tables. Add more can? helpers. Refs #2249
2011-11-24 23:48:58 +02:00
0a7c0e4e9b
Platforms list + UI enchancements
2011-03-10 14:35:46 +03:00
Alexander Machehin
Vokhmin Alexey V
George Vinogradov
Pavel Chipiga
Alexey Nayden