Commit Graph

116 Commits

Author SHA1 Message Date
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 c0036a1bb5 [refs #576] Fix should_show? method and template offsets 2012-07-25 16:41:12 +04:00
konstantin.grabar 15a86c2ecd [refs #576] Add flash notifies 2012-07-23 18:25:37 +04:00
Alexander Machehin b24a4a35b2 [refs #90] modify pull tab urls 2012-07-19 00:02:27 +06:00
Alexander Machehin b9e1f44fe8 [refs #90] remove old code 2012-07-17 23:02:55 +06:00
Alexander Machehin 77a67975b1 [refs #90] hide create pull button after change project or refs 2012-07-10 22:07:51 +06: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
Alexander Machehin 07e02d9a17 [refs #90] modified Update commits button 2012-07-10 00:41:39 +06:00
George Vinogradov 3c8b77027e [issue #428] Allowed any update_types when build for released platform. 2012-07-06 03:05:47 +04:00
George Vinogradov e00e88340b [issue #428] Merge branch 'master' into 428-advisory
Conflicts:
	app/assets/stylesheets/design/custom.scss
	db/schema.rb
2012-07-04 03:31:51 +04: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
Alexander Machehin 89abd20c95 Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-07-03 21:22:10 +06:00
konstantin.grabar 10aed58bdd [refs #442] Small refactor. Remove bootstrap collapse 2012-06-28 15:31:25 +04:00
Alexander Machehin 1ffb1b3940 Merge branch 'master' into 90-pull
Conflicts:
	Gemfile
	app/assets/stylesheets/design/custom.scss
	app/models/project.rb
	db/schema.rb
2012-06-27 16:20:38 +06:00
konstantin.grabar baec8a1016 [refs #525] Fix clear action rights 2012-06-25 18:26:01 +04:00
konstantin.grabar 904cfca5c9 [refs #529] Fix branch set for repository with dot in name 2012-06-19 18:52:29 +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
George Vinogradov e7c0eab736 [issue #428] Merge branch 'master' into 428-advisory
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-06-04 23:59:00 +04:00
George Vinogradov abe2b8a30d [issue #428] Work with existing advisories.
*  Added advisories page to platform
*  Added attacing of existing advisories to BuildList.
2012-06-04 23:49:20 +04:00
Alexander Machehin 60aba754ae [refs #90] pull title/body update 2012-05-31 22:57:52 +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
konstantin.grabar 2d1001f1c1 [refs #478] Fix js handler 2012-05-25 14:49:37 +04:00
konstantin.grabar e38bf98d54 [refs #478] Move js logic to another handler 2012-05-25 11:26:42 +04:00
konstantin.grabar 0958299f51 [refs #478] Change js handler logic 2012-05-24 16:51:39 +04:00
konstantin.grabar 3d2bcdd019 [refs #478] Add js handler to disable frozen platforms and their reps 2012-05-24 14:21:57 +04:00
Alexander Machehin 6b6887250b Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-05-21 17:31:49 +06:00
Alexander Machehin 3a2dc965c9 [refs #443] fixed dropmenu 2012-05-18 15:51:26 +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 7a011606a5 [refs #443] add pirobox popup 2012-05-12 19:17:07 +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
Alexander Machehin 628fed40ea [refs #90] issue status -> state 2012-04-23 23:34:11 +06:00
konstantin.grabar 89bfa8d0a9 [refs #415] Fix radio button click handler 2012-04-23 13:50:42 +04:00
George Vinogradov 678f7cc0ed [issue #347] Changed search field. 2012-04-20 00:35:31 +04: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
George Vinogradov f9d2baef5a [issue #347] Added filter. 2012-04-19 19:27:16 +04:00
George Vinogradov 618d1ecb49 [issue #408] Fixed bug with selectbox 2012-04-18 21:31:11 +04:00
George Vinogradov 9566855110 [issue #347] Added missed lib 2012-04-18 16:17:11 +04:00
George Vinogradov 9d96b2b565 [issue #408] Removed comment. 2012-04-18 14:46:34 +04:00
George Vinogradov 6c64125787 [issue #408] Changed behavior of build list for released platform 2012-04-17 22:18:39 +04:00
George Vinogradov 8204196275 [issue #347] Removed comments. Added filter field to collaborators
table.
2012-04-17 17:39:14 +04:00
George Vinogradov 871c8ed1f4 [issue #347] Fixed bugs. Some changes. 2012-04-16 23:22:08 +04:00
Vladimir Sharshov c339f2aee0 Merge pull request #403 from warpc/223-change_build_lists_new_js_handlers
[refs #223] Add platform branch auto select if this branch exist
2012-04-16 10:00:53 -07:00
konstantin.grabar d24422f757 [refs #223] Add branch auto select 2012-04-16 20:06:34 +04:00
Alexander Machehin 2dedbd92d0 [refs #194] assignee & user 2012-04-14 01:44:04 +06:00
George Vinogradov 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
konstantin.grabar f7e09c993d [refs #223] Optimise code by jQuery chains 2012-04-10 17:15:48 +04:00
konstantin.grabar d6dc51ba93 [refs #223] Choosen rep auto set 2012-04-10 13:05:42 +04:00
George Vinogradov 71c8efabf9 [issue #347] Added backbone. Changed collaborators page. 2012-04-09 21:11:39 +04:00
konstantin.grabar 6ccf7e8456 [refs #223] Change js handlers and some inputs logics 2012-04-09 18:33:51 +04:00
Alexander Machehin 96b3c831b7 [refs #358] br -> p 2012-04-06 02:21:19 +06:00