Commit Graph

254 Commits

Author SHA1 Message Date
Alexander Machehin d130409640 Merge branch 'master' into 90-pull
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-07-20 15:33:11 +06:00
Alexander Machehin 35b953ac11 [refs #90] add commit/pull lines ref 2012-07-19 22:42:37 +06:00
Alexander Machehin b24a4a35b2 [refs #90] modify pull tab urls 2012-07-19 00:02:27 +06:00
Alexander Machehin 0ac1f52e31 [refs #569] fixed hr style 2012-07-17 23:43:13 +06:00
Alexander Machehin b9e1f44fe8 [refs #90] remove old code 2012-07-17 23:02:55 +06:00
Alexander Machehin dc521f5844 [refs #90] link to refs 2012-07-17 22:40:48 +06:00
Alexander Machehin 08534810f6 [refs #569] tuning fork modal 2012-07-17 20:25:02 +06:00
Alexander Machehin cd681ab0ae [refs #569] fixed fork modal 2012-07-17 19:49:13 +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
konstantin.grabar b6d769ad66 [refs #442] Change mass builds table 2012-06-27 18:07:05 +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 bdb97b8891 [refs #442] Add statistics data to mass builds. Small refactor for report 2012-06-25 19:20:35 +04:00
konstantin.grabar baec8a1016 [refs #525] Fix clear action rights 2012-06-25 18:26:01 +04:00
George Vinogradov e4f62ea592 [issue #428] Added filter by advisory_id to Advisories 2012-06-20 21:51:08 +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
Alexander Machehin 89bc8954e2 [refs #90] smaller font for diff 2012-06-08 14:31:33 +06: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
Vladimir Sharshov c119ae0d20 Merge pull request #504 from warpc/442-mass_build
[refs #442] Add sidebar for mass rebuild page in platform
2012-05-28 05:45:48 -07:00
konstantin.grabar 82b5999e32 [refs #442] Add sidebar 2012-05-28 14:28:19 +04:00
Vladimir Sharshov 3ed195bb86 Merge pull request #502 from warpc/442-mass_build
[refs #442] Mass build refactor and fixes
2012-05-28 02:00:30 -07:00
konstantin.grabar a79d946b6b [refs #442] Mass build refactor and fixes 2012-05-25 19:56:26 +04: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
Alexander Machehin 4f1d23a2a4 [refs #90] branch, merge validation 2012-05-24 23:10:49 +06: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
konstantin.grabar 9aefce6b68 [refs #442] Merge master into 442-mass_build 2012-05-21 18:33:12 +04:00
Alexander Machehin 6b6887250b Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-05-21 17:31:49 +06:00
konstantin.grabar be2ab9154c [refs #442] Fix checkboxes styles. Return delay for build all. Add mass build select and more fixes 2012-05-21 14:18:29 +04:00
Vladimir Sharshov 241efb95b1 Merge pull request #486 from warpc/443-tour
[refs #443] fix dropmenu in tours pages for registered users
2012-05-18 03:17:01 -07:00
Alexander Machehin 3a2dc965c9 [refs #443] fixed dropmenu 2012-05-18 15:51:26 +06:00
Pavel Chipiga bea7ed26d6 Fix advisory template. Fix rosa tour. Refs #428, #482 2012-05-18 01:38:43 +03: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
Vladimir Sharshov 2892689807 Merge pull request #469 from warpc/443-tour
[refs #466] Add localization for system tour. Fix for auto detecting users language.
2012-05-16 05:19:59 -07:00
Alexander Machehin 2651f0dc52 [refs #443] localize top image 2012-05-16 17:10:22 +06:00
Alexander Machehin 05746ea449 [refs #466] add i18n 2012-05-15 21:35:48 +06:00
Vladimir Sharshov 64d5600e6f Merge pull request #447 from warpc/443-tour
[refs #443] Tour about the system
2012-05-12 10:11:16 -07:00
Alexander Machehin 7a011606a5 [refs #443] add pirobox popup 2012-05-12 19:17:07 +06:00
Alexander Machehin 0e5b2ba25d [refs #443] compact styles 2012-05-12 15:54:24 +06:00