Commit Graph

163 Commits

Author SHA1 Message Date
Alexander Machehin 8ed8e10cd6 [refs #90] moved update form lower 2012-05-31 23:30:10 +06:00
Alexander Machehin 60aba754ae [refs #90] pull title/body update 2012-05-31 22:57:52 +06:00
Alexander Machehin 3c3448e26f [refs #90] new/show views refactoring 2012-05-31 17:16:54 +06:00
Alexander Machehin 26baf999f4 [refs #90] diff stats 2012-05-29 23:09:43 +06:00
Alexander Machehin 11c67fb07d Revert "[refs #90] issue status -> state" & changed state -> status
This reverts commit 7470ee76e4783a0fbbd98607406d7b770a2980d1.

Conflicts:

	app/controllers/projects/issues_controller.rb
	db/migrate/20120412173938_create_pull_requests.rb
	db/schema.rb
2012-05-29 16:50:25 +06:00
Alexander Machehin df610931d7 [refs #90] commits tab 2012-05-25 16:48:44 +06:00
Alexander Machehin 4f1d23a2a4 [refs #90] branch, merge validation 2012-05-24 23:10:49 +06:00
Alexander Machehin d643bb3cd0 [refs #90] try to prevent create same pull 2012-05-21 19:24:16 +06:00
Alexander Machehin 6b6887250b Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-05-21 17:31:49 +06: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 74aee232f9 [refs #90] some fixes and merge button 2012-05-17 22:49:29 +06:00
Alexander Machehin f96990bd25 [refs #90] change view 2012-05-16 22:50:30 +06:00
konstantin.grabar 1385133ed5 [refs #461] Merge master into 461-rename_is_rpm_to_is_package 2012-05-16 14:37:35 +04:00
Pavel Chipiga c1b4a0639d Fix build list display 2012-05-15 13:12:07 +03:00
konstantin.grabar 1f088c0cfc [refs #461] Rename is_rpm to is_package 2012-05-15 14:00:57 +04:00
Pavel Chipiga 8470674c62 Apply basic build list packages store functionality. Display build list package content. Write specs. Refactor. Refs #444 2012-05-14 22:08:31 +03:00
Alexander Machehin ff016efe1c [refs #90] choose project 2012-05-14 23:09:18 +06:00
konstantin.grabar 8060a9b8a9 [refs #451] Fix partial name 2012-05-14 12:16:37 +04:00
Alexander Machehin 85d4489009 [refs #90] dont work pull 2012-05-12 00:23:09 +06:00
Alexander Machehin 3e0ebdc929 [refs #90] change route 2012-05-10 22:57:59 +06:00
George Vinogradov 9a0f582a16 [issue #428] Fixed typo in PlatformsHelper 2012-05-10 20:04:48 +04:00
Alexander Machehin 4040a486fe [refs #90] fix diff 2012-05-10 18:32:54 +06:00
Pavel Chipiga 52f5e01575 Fix build list controller bugs. Fix JS which controls checkboxes. Fix translations. Fix and refactor views. Refs #428 2012-05-06 00:43:04 +03:00
George Vinogradov 05ef799fa4 [issue #428] Added advisories list. Added translations. 2012-05-05 21:18:29 +04:00
Alexander Machehin 381ae0a8b9 [refs #90] diff - dont work 2012-05-05 22:57:12 +06:00
George Vinogradov 6fe0e5b530 [issue #428] Added AdvisoriesController & show view. 2012-05-05 02:53:45 +04:00
George Vinogradov 1f07332892 [issue #428] Merge branch 'master' into 428-advisory
Conflicts:
	app/controllers/projects/build_lists_controller.rb
	config/routes.rb
	db/schema.rb
2012-05-04 21:29:04 +04:00
Alexander Machehin 813afe53cf [refs #90] minor interface changes 2012-05-04 23:13:41 +06:00
Alexander Machehin c5731ff8dd [refs #90] fixed merging errors 2012-05-04 16:56:11 +06:00
Alexander Machehin 178dbdc5f0 [refs #90] move files 2012-05-03 23:55:08 +06:00
Alexander Machehin 36b4ce2d99 Merge branch 'master' into 90-pull
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/projects/issues_controller.rb
	app/models/project.rb
	config/locales/menu.en.yml
	config/routes.rb
	db/schema.rb
2012-05-03 23:19:43 +06:00
Alexander Machehin 9e5db741d3 Merge branch 'master' into 90-pull
Conflicts:
	app/models/project.rb
	db/schema.rb
2012-05-02 23:08:24 +06:00
Pavel Chipiga 2539ef4795 Great controllers and routes refactor - separate them to namespaces. Add user/group routes in github style, refactor. Implement templates inheritance. Refactor and cleanup views. Fix specs. Other minor fixes. Refs #263 2012-05-02 12:18:07 +03:00
Pavel Chipiga b957600eda Merge branch 'master' into 263-refactoring
Conflicts:
	app/models/project.rb
	app/views/projects/_repo_block.html.haml
	db/schema.rb
	spec/controllers/issues_controller_spec.rb
	spec/controllers/projects_controller_spec.rb
2012-05-01 15:54:13 +03:00
Alexander Machehin cb9588619a [refs #416] dont show zip menu for empty project 2012-04-24 22:36:52 +06:00
Pavel Chipiga 9cae595d77 Merge branch 'master' into 263-refactoring 2012-04-23 22:22:24 +03:00
Alexander Machehin a8ccf454ee [refs #90] first steps of pull rendering 2012-04-23 23:34:11 +06:00
Pavel Chipiga c0d2d67c73 Merge branch 'master' into 263-refactoring
Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
2012-04-23 17:58:45 +03:00
George Vinogradov af18f4404f [issue #347] Fixed artefacts in Add Collaborators form. 2012-04-22 13:17:33 +04:00
Pavel Chipiga 701da7e1f9 Disable bluepill. Update gems. Github project style URLs. Fix project load. Fix abilities. Fic urls generation. Fix some specs. Refs #263 2012-04-19 22:45:50 +03:00
George Vinogradov 510b0c0c50 [issue #347] Merge branch 'master' into 347-javascript_refactoring
Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/models/group.rb
	app/models/user.rb
2012-04-19 19:32:11 +04:00
Alexander Machehin f31b243ae9 [refs #385] zip image 2012-04-17 18:06:04 +06:00
George Vinogradov 871c8ed1f4 [issue #347] Fixed bugs. Some changes. 2012-04-16 23:22:08 +04:00
Alexander Machehin 5cfadcd723 [refs #385] add dropdown menu to choose archive format 2012-04-13 17:24:24 +06:00
Alexander Machehin b281cdf65b [refs #385] changed archive 2012-04-12 17:27:15 +06:00
Alexander Machehin 770030e180 [refs #385] zip archive 2012-04-12 00:29:08 +06:00
Alexander Machehin 96b3c831b7 [refs #358] br -> p 2012-04-06 02:21:19 +06:00
konstantin.grabar 39dd53ff9b [refs #358] Add git clone repo help hint 2012-04-05 11:26:03 +04:00
George Vinogradov fe053537c3 [fixed #377] Fixed Group.by_admin scope. 2012-04-03 17:08:22 +04:00
George Vinogradov 1e8021fe35 [issue #369] Added TOS page. 2012-03-31 17:18:22 +04:00