Commit Graph

155 Commits

Author SHA1 Message Date
Alexander Machehin 9bc9eab4f1 [refs #579] remove new comment form after close & fix focus 2012-10-19 18:39:11 +06:00
Alexander Machehin a807a22230 [refs #579] remove debug code 2012-10-16 14:07:26 +06:00
Alexander Machehin 1ee9e3f00e [refs #579] fixed updating comment 2012-10-15 18:30:34 +06:00
Alexander Machehin bb47567628 [refs #579] small improvements of the discussion 2012-10-13 00:12:04 +06:00
Alexander Machehin 548f698526 [refs #579] add a line comment button 2012-10-08 20:42:38 +06:00
Alexander Machehin e085784d51 Merge branch 'master' into 579-code_line_comments
Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/helpers/diff_helper.rb
	app/models/ability.rb
	app/views/projects/comments/_list.html.haml
	app/views/projects/git/commits/_commit_diff.html.haml
	lib/ext/git/inline_callback.rb
2012-10-05 15:32:29 +06:00
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