Commit Graph

339 Commits

Author SHA1 Message Date
Vokhmin Alexey V 8032437585 remove crontab 2012-11-09 21:56:39 +04:00
Vokhmin Alexey V 8f9cd0ff8a updated logger on build product page 2012-11-09 21:42:25 +04:00
Alexander Machehin 6c8c1ca880 Merge branch 'master' into 579-code_line_comments
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-10-19 18:47:26 +06:00
Alexander Machehin 9bc9eab4f1 [refs #579] remove new comment form after close & fix focus 2012-10-19 18:39:11 +06:00
Julea Pikareva eda6ea4691 [refs #704] Fix height button "Clear" 2012-10-19 16:38:01 +04:00
Julea Pikareva 9c62029f6d [refs #619] Fix long title in the activity feed
not observant
2012-10-19 16:07:19 +04:00
Julea Pikareva 81c80b42e8 [refs #619] Fix long title in activity feed 2012-10-19 15:54:32 +04:00
Julea Pikareva ef77f16fac [refs #619] Fix end-of-line format 2012-10-19 14:38:38 +04:00
Julea Pikareva ad27738ce9 [refs #619] Fix radio-button in Opera 2012-10-19 14:27:14 +04:00
Alexander Machehin a807a22230 [refs #579] remove debug code 2012-10-16 14:07:26 +06:00
Alexander Machehin 5c7fb21511 [refs #579] add cursor pointer to arrow 2012-10-16 00:16:01 +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 afa6dd0706 [refs #579] fixed style 2012-10-05 15:39:07 +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
Vladimir Sharshov d2c338e4e4 Merge pull request #665 from warpc/90-ui
[refs #90] pull request ui + fixes
2012-10-02 10:41:06 -07:00
Vokhmin Alexey V c7fda1a810 #349: updated ability model according to Alexander comments, reverted some changes, added paging for projects on #show page 2012-10-02 19:14:08 +04:00
Alexander Machehin 948e0892bf [refs #90] markdown in create pull 2012-10-01 22:48:26 +06:00
Alexander Machehin eaf29713cc [refs #90] autoload refs 2012-10-01 22:03:08 +06:00
Alexander Machehin 9b9295ba4f [refs #90] change ui on create pull 2012-09-28 23:46:02 +06:00
Vokhmin Alexey V 3fdca32e0e #90: updated styles 2012-09-27 20:59:48 +04:00
Vokhmin Alexey V f41aaecd72 #90: added commits and comments for commits to pull-request discussion 2012-09-27 19:40:19 +04: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 ccb004bc03 Merge branch 'master' into 579-code_line_comments
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-09-26 16:27:46 +06:00
Vokhmin Alexey V d54a50e2e0 #90: added line-height style 2012-09-25 19:31:06 +04:00
Vokhmin Alexey V 0299c069c6 #90: style changes for header, increase performanse for #autocomplete_base_project action 2012-09-25 19:18:22 +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 1e468b5073 #648: updated styles, added icons for filters 2012-09-24 22:36:02 +04: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
Alexander Machehin fc672451c6 [refs #616] small changes in styles 2012-09-24 21:19:50 +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 b5bee35275 Revert "[refs #616] add table styles"
This reverts commit 1818f25de28de0e9efa8d1ae9e22649445d3953d.
2012-09-21 19:23:41 +06:00
Alexander Machehin 855f1f356d [refs #616] remove some inline styles 2012-09-21 18:10:47 +06:00
Alexander Machehin 651be997b3 [refs #616] add table styles 2012-09-21 17:46:44 +06: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 a85a95d18a [refs #616] markdown cheat sheet 2012-09-19 23:35:43 +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