Commit Graph

15 Commits

Author SHA1 Message Date
Alexander Machehin 87802c8ba1 activity feed: show a "pull request" instead a "issue"; small refactoring 2015-05-08 15:47:30 +05:00
Alexander Machehin d7727fe6a5 improve activity feed 2015-05-05 17:25:29 +05:00
Alexander Machehin 2b9434f346 Merge branch 'master' into 369-bootstrap
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/angular-new/models/build_list.js.erb
	app/assets/javascripts/extra/build_list.js
	app/controllers/projects/build_lists_controller.rb
	app/controllers/projects/projects_controller.rb
	app/models/platform.rb
	app/views/projects/base/_layout.html.haml
	app/views/projects/build_lists/_new_form.html.haml
	app/views/projects/build_lists/show.html.haml
	app/views/projects/git/base/_fork.html.haml
	app/views/projects/git/commits/_commits.html.haml
	config/locales/en.yml
	config/locales/ru.yml
2014-10-16 16:41:29 +06:00
Alexander Machehin 4aec2ba061 fix UrlGenerationError: No route matches for the wiki feed 2014-09-12 13:35:42 +06:00
Alexander Machehin 225de8d440 [#369] refactoring 2014-05-12 14:19:10 +06:00
Alexander Machehin 297dd4bd44 [#345] fix "No route matches missing required keys: [:id]" error 2014-03-27 13:17:29 +06:00
Vokhmin Alexey V a15353e460 #345: fixed: usage of name_with_owner 2014-03-27 00:02:28 +04:00
Vokhmin Alexey V f04c1105d3 #345: fixed: /modify, /projects search 2014-03-21 22:22:05 +04:00
Vokhmin Alexey V 2cd612e733 #345: updated views 2014-03-17 20:43:42 +04:00
Alexander Machehin 718c8bb08c [#345] remove url_for hack 2014-03-13 22:35:00 +06:00
Alexander Machehin 0e39aae1bf [#343] use new ruby hash syntax 2014-01-21 10:51:49 +06:00
Alexander Machehin 7da70b5f12 [#277] profile projects 1 ver. 2013-09-08 17:56:43 +06:00
Alexander Machehin 65885efe5e add time ago in the activity feed 2013-09-01 18:59:05 +06:00
Vokhmin Alexey V 4226af0a5d #168: fixed specs, refactoring of ActivityFeed 2013-07-01 16:30:54 +04:00
Alexander Machehin f8f53b198b [#98] create home controller; move activity, common issues/pull_requests & root pages here 2013-05-15 23:28:39 +06:00