Commit Graph

199 Commits

Author SHA1 Message Date
Alexander Machehin 527dd210bf [refs #579] alpha version of inline comments for commit 2012-10-05 00:40:12 +06:00
Alexander Machehin 94029c3cda [refs #90] base -> to, head -> from 2012-10-03 17:58:34 +06:00
Alexander Machehin eaf29713cc [refs #90] autoload refs 2012-10-01 22:03:08 +06:00
Vokhmin Alexey V 37c9a906c4 Merge branch '90-pull' into 90-separate-issues-and-pull-requests 2012-09-26 18:45:26 +04:00
Vokhmin Alexey V 6070c276f6 Merge branch 'master' into 90-pull 2012-09-26 18:33:04 +04:00
Vokhmin Alexey V 07b27b934f #90: updated #index page for pull-requests 2012-09-26 15:46:23 +04:00
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
Vladimir Sharshov 06099a15b6 Merge pull request #657 from warpc/648-add-filters-to-projects-page
[refs #648]: Filters by owners in projects page
2012-09-25 03:41:11 -07:00
Alexander Machehin 06e15cf3fa [refs #616] remove unneeded code 2012-09-25 15:47:12 +06:00
Vokhmin Alexey V 9be978eb68 #648: updated models, JS, controller according to comments and discussions 2012-09-24 22:04:53 +04:00
Alexander Machehin 2c6d4bae9e [refs #616] add error messages to ajax 2012-09-24 23:34:14 +06:00
Vokhmin Alexey V c14f2851e3 #648: revert changes 2012-09-21 22:04:58 +04:00
Vokhmin Alexey V 2406423483 #648: added filters to Projects page 2012-09-21 21:57:22 +04:00
Alexander Machehin b65ca14131 [refs #616] small js refactoring 2012-09-21 16:31:55 +06:00
Alexander Machehin 378fe5847e [refs #616] ugly replaces 2012-09-20 23:10:50 +06:00
Alexander Machehin daf845705a [refs #616] comment update 2012-09-19 00:42:22 +06:00
Alexander Machehin a492367a17 [refs #616] some fixes and refactoring 2012-09-18 16:00:21 +06:00
Alexander Machehin a4c8e8eff8 Merge branch 'master' into 616-issues_and_comments
Conflicts:
	Gemfile
	app/assets/stylesheets/design/custom.scss
	app/controllers/projects/projects_controller.rb
2012-09-17 16:52:50 +06:00
Vokhmin Alexey V 7bb0ced8cb #645: fixed. 2012-09-14 18:49:08 +04:00
Vokhmin Alexey V 6bdaf06d86 #633: removed unnecessary code 2012-09-14 02:30:54 +04:00
Vokhmin Alexey V bdb3eb288c #633: removed checkbox from name of platform 2012-09-14 02:22:10 +04:00
Vokhmin Alexey V ba6805598f #633: small refactoring 2012-09-13 20:16:13 +04:00
Vokhmin Alexey V a99bfee4a6 #633: UI has been updated 2012-09-13 20:08:41 +04:00
Vokhmin Alexey V 71d14e43d6 #631: fixed misprint 2012-09-06 19:39:26 +04:00
Vokhmin Alexey V 4d1166e6b3 #631: updated UI and JS validation for build_lists, rewrote migration 2012-09-06 19:34:33 +04:00
Vladimir Sharshov ff20c0b199 Merge pull request #622 from warpc/620-maintainer_db
[refs #620] Maintainer DB
2012-08-31 11:50:02 -07:00
Alexander Machehin d775fa0d08 [refs #616] ugly md preview 2012-08-29 21:24:06 +06:00
Vladimir Sharshov 6bcff5ad6f Merge pull request #623 from warpc/616-issues_and_comments
[refs #616] Refactoring and fixed bugs with issue:
* could not remove all labels from issue;
* after update issue body now no need reload page to view changes;
* refactoring issues controller.
2012-08-27 03:46:27 -07:00
Alexander Machehin 2c0826a77d [refs #616] fixed showing body after update 2012-08-25 23:40:51 +06:00
George Vinogradov 2fbb72e537 [issue #620] Changes in Maintainer db:
*  Added maintainer selection on project page (see TODO in sources);
  *  Added `actual` field to BuildList::Package;
  *  Added rake task to set BuildList::Package.actual field.
     Run it after migration (see TODO in sources);
  *  Packages after publising of BuildList becomes actual;
  *  Added MaintainerPresenter to avoid long method chains.
2012-08-24 19:21:24 +04:00
George Vinogradov edd7bcdb6d [issue #590] JS hack to force SelectBox to render. 2012-08-21 01:33:54 +04:00
Alexander Machehin ec7d132a3f [refs #90] fixed update commits button 2012-08-08 23:57:03 +06:00
Alexander Machehin 910aac939e [refs #90] fixed changing tabs & anchors 2012-08-08 21:47:58 +06: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 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
konstantin.grabar 39dd53ff9b [refs #358] Add git clone repo help hint 2012-04-05 11:26:03 +04:00
George Vinogradov 9e31ae75b1 [issue #195] Added groups support to project. 2012-03-22 04:44:05 +04:00
Vladimir Sharshov ee867aa8d4 Merge pull request #324 from warpc/200-new_build_repos_rules
[refs #200] Fix chbx behaviour for repos and their platforms
2012-03-21 08:06:54 -07:00
konstantin.grabar 5abf64e353 [refs #200] Fix chbx behaviour for repos and their platforms 2012-03-21 19:04:01 +04:00
Vladimir Sharshov 81d18b5337 Merge pull request #323 from warpc/200-new_build_repos_rules
[Refs #200] Move some fields to rights part of the form. Hide empty platform. Fix checkbox checking on build list form.
2012-03-21 05:17:23 -07:00
konstantin.grabar f9850c6885 [refs #200] Fix checkbox checking on build list form 2012-03-21 15:34:11 +04:00
Vladimir Sharshov 375aa7e74e Merge pull request #322 from warpc/265-activity_feed_messages
[refs #265] add ajax to older messages
2012-03-21 03:50:25 -07:00
Alexander Machehin b678320638 [refs #265] add ajax to older messages 2012-03-21 16:29:45 +06:00
konstantin.grabar 31e0c9191c [refs #200] Fix build list form interface and include_repos logic 2012-03-20 14:36:31 +04:00
konstantin.grabar f0645be9c5 [refs #200] Change build list repos and platforms interface 2012-03-19 23:52:46 +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
George Vinogradov 952c9e46ea [issue #279] Added datatables pagination extension 2012-03-13 18:36:42 +04:00
Pavel Chipiga 41cd1ddaf3 Redo cusel assign to avoid side effects. Refactor and cleanup projects controller, routes, views. Apply new design and functionality for projcts list page. Add fork button and fix fork. Apply gap repo during repo fork. Apply attr_accessible for projects. Cleanup locales. Fix new_build link ability check. Refs #195 2012-03-07 23:34:49 +02:00
Vladimir Sharshov e49551756c Merge pull request #276 from warpc/194-issue_page
[Refs #194] Fix for manage labels and executor
2012-03-07 11:26:11 -08:00
Alexander Machehin 8df4fdfa5c [refs #194] remove labels search from js 2012-03-07 22:26:43 +06:00
Alexander Machehin c657efc338 [refs #194] show all project labels without searching 2012-03-07 19:36:17 +06:00
Alexander Machehin 9a6beef2da [refs #194] fix issue managing labels 2012-03-07 16:50:45 +06:00