Commit Graph

27 Commits

Author SHA1 Message Date
Alexander Machehin dfbf8a8d58 Merge branch 'master' into 90-pull
Fucking conflicts:
	app/controllers/projects/issues_controller.rb
	app/models/ability.rb
	app/views/projects/issues/show.html.haml
	config/routes.rb
	db/schema.rb
	lib/tasks/import.rake
	spec/models/comment_for_commit_spec.rb
	vendor/assets/javascripts/bootstrap-tab.js
	vendor/assets/stylesheets/bootstrap.css
2012-09-25 17:55:30 +06:00
Alexander Machehin d775fa0d08 [refs #616] ugly md preview 2012-08-29 21:24:06 +06:00
Alexander Machehin b299a51610 Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-08-01 13:06:41 +06:00
Pavel Chipiga 8e91159b5b Improve and refacror huge blob display. Fix wiki create and display. Fix build_lists test. Refs #263 2012-07-31 20:32:49 +03:00
Alexander Machehin 944c6fc0e2 Merge branch 'master' into 90-pull
Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/controllers/projects/git/commits_controller.rb
	app/helpers/git_helper.rb
	app/models/project.rb
	app/views/projects/git/commits/_commit_diff.html.haml
	db/schema.rb
	lib/ext/core/string.rb
2012-07-27 18:37:25 +06:00
konstantin.grabar 15a86c2ecd [refs #576] Add flash notifies 2012-07-23 18:25:37 +04:00
Alexander Machehin 10b828c644 Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
	vendor/assets/javascripts/vendor.js
2012-07-10 18:35:49 +06:00
George Vinogradov 094f25c049 [issue #428] Changed attaching advisory to BuildList.
Removed Chosen. Added text field with incremental search.
2012-07-04 02:52:13 +04:00
George Vinogradov ecd4498484 [issue #428] Changes in advisories.
*  Added Many2Many relation between advisories and projects.
*  Added autocompletion to build list's advisory
*  Bootstrap's JS moved to vendor/
2012-06-19 02:49:17 +04:00
Alexander Machehin fcffff4178 Merge branch 'master' into 90-pull
Conflicts:
	app/assets/stylesheets/design/custom.scss
	config/locales/title.en.yml
	config/locales/title.ru.yml
	config/routes.rb
	db/schema.rb
2012-05-17 22:58:29 +06:00
Alexander Machehin 7a011606a5 [refs #443] add pirobox popup 2012-05-12 19:17:07 +06:00
Alexander Machehin a8ccf454ee [refs #90] first steps of pull rendering 2012-04-23 23:34:11 +06:00
Alexander Machehin 5cfadcd723 [refs #385] add dropdown menu to choose archive format 2012-04-13 17:24:24 +06:00
Alexander Machehin 7a8de3e1f4 [refs #353] disabling fork button after click 2012-04-11 00:48:13 +06:00
Alexander Machehin e349a69883 [refs #353] can fork project to group 2012-04-09 23:56:03 +06:00
Pavel Chipiga 1f57d88957 Fix IE design. Refs #263 2012-03-30 01:52:34 +03:00
George Vinogradov d3184b846b [issue #195] Fixed <Tab> in edit blobs. 2012-03-22 20:16:07 +04:00
George Vinogradov 304141b1ba [issue #279] Added views and removed datatables plugin
*  Datatables plugin moved to lib.
  *  Added views to platform and repositories.
2012-03-13 19:12:06 +04:00
Pavel Chipiga d6f9b2c3e9 Minor gems update. Apply search design and controller. Add and refactor search scopes. Fix relations. Separate and refactor search translations. Refactor search form. Refs #255 2012-03-06 17:53:04 +02:00
George Vinogradov 900c1fe2f5 [issue #195] Fixes.
*  Fixed translations
  *  Fixed blob display
  *  Fixed routes
2012-03-02 02:07:04 +02:00
George Vinogradov 4b024d1728 [issue #195] Fixes.
*  Fixed translations
  *  Fixed blob display
  *  Fixed routes
2012-03-01 21:37:24 +04:00
konstantin.grabar e9ae923b60 [refs #195] Merge 3.2-master into 195-new_design_for_projects 2012-02-28 20:10:31 +04:00
Pavel Chipiga 7508bb1339 Fix bugs to force new design work. Minor refactor and improvements. Refs #193 2012-02-27 20:58:37 +02:00
George Vinogradov 582063d066 [issue #195] Commits history, editing, showing... 2012-02-27 21:40:46 +04:00
konstantin.grabar d8a3983b07 [refs #193] Add new design to wiki 2012-02-17 15:13:54 +04:00
Pavel Chipiga b7b69a86d8 Minor gems update. Sync with newest styles, javascripts, images. Refactor assets. Merge and fix wiki assets, temporary disable buggy ones. Change subscribeable_id type from string to decimal to avoid bugs. Auto convert commit subscribe subscribeable_id from hex to decimal. Refactor commentable. Fix bugs and some specs. Refactor application.yml. Refs #96 2012-02-14 18:05:41 +02:00
Pavel Chipiga 7223b7deb9 Upgrade rails, devise, delayed_jobs and other gems. Fix dependencies. Apply assets pipeline, add to deploy. Refactor and cleanup Gemfile. Fix after upgrade bugs. Redo commentable_id from string to decimal. Refactor and code cleanup. Apply basic new design. Refactor main template. Automate menus. Improve translations. Refs #96 2012-02-09 01:46:25 +02:00