Commit Graph

47 Commits

Author SHA1 Message Date
Alexander Machehin dd9c280d09 show a file diff when click on it in the header stats 2015-04-01 19:22:40 +05:00
Alexander Machehin 9870cfaa83 fix rendering projects/git/commits#diff; add shevrons to the diffs panel-heading 2015-04-01 16:49:43 +05:00
Alexander Machehin 7ab05491c2 [#369] fix commit diff 2015-02-04 21:47:24 +05:00
Alexander Machehin 33fd426afb [#369] pull request: diff tab 2015-01-20 18:40:52 +05:00
Alexander Machehin 30fab8f2be [#369] pull requests: collapse header list 2015-01-16 00:26:03 +05:00
Alexander Machehin 442b7f92dd [#369] pull request page: small fixes 2014-12-25 23:29:04 +05:00
Alexander Machehin 92bb6dcd08 fix mistype 2014-12-25 19:45:36 +05:00
Alexander Machehin b42766beb4 [#369] pull request page; some fixes, work in progress; 2014-12-25 01:14:03 +05:00
Alexander Machehin 8c061c19a6 [#369] pull request: diff tab 2014-12-23 22:49:00 +05:00
Alexander Machehin 9cc4e2d27c [#369] pull request page: discussion tab 2014-12-18 14:59:02 +05:00
Alexander Machehin 0e39aae1bf [#343] use new ruby hash syntax 2014-01-21 10:51:49 +06:00
Vokhmin Alexey V 015c0375e8 #29: updated gems, remove old code 2014-01-15 23:34:54 +04:00
Alexander Machehin 0cb585ef71 Merge branch 'master' into 29-migrate-to-ruby-2.1
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/activity_feeds_controller.rb
	app/models/activity_feed_observer.rb
	config/environments/development.rb
	config/initializers/a_app_config.rb
	config/initializers/airbrake.rb
	lib/modules/models/git.rb
	spec/controllers/activity_feeds_controller_spec.rb
	spec/helpers/activity_feeds_helper_spec.rb
2014-01-10 08:31:31 +06:00
Vokhmin Alexey V 58025f8681 small refactoring 2013-12-30 20:19:20 +04:00
Vokhmin Alexey V d04f276f1d updated concatenation operation 2013-12-30 20:08:42 +04:00
Alexander Machehin b10b990b47 Diff should be left alone by angular 2013-07-23 20:30:34 +06:00
Alexander Machehin ccdb2d170f dont show new inline comment buttons 2013-05-15 23:48:45 +06:00
Vokhmin Alexey V 9e7eb7af94 #29: merge master into branch 2013-04-03 16:10:22 +04:00
Vokhmin Alexey V 4f40327293 #52: updated JS and rendering discussion in pull_request 2013-03-28 15:04:07 +04:00
Vokhmin Alexey V e055d0080b #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
Alexander Machehin 7be2df7578 [refs #674] first step of the diff between commits 2012-11-20 01:15:15 +06:00
Alexander Machehin 95e5804358 [refs #90] fixed git timeout error on the big diff 2012-10-26 20:03:46 +06:00
Alexander Machehin 54f462f408 [refs #579] small refactoring 2012-10-19 15:50:15 +06:00
Alexander Machehin ecf8e7e5ee [refs #579] fixed wiki & refactoring 2012-10-18 18:51:28 +06:00
Alexander Machehin 7870ffef7d [refs #579] fixed some bugs 2012-10-18 00:38:42 +06:00
Alexander Machehin bb47567628 [refs #579] small improvements of the discussion 2012-10-13 00:12:04 +06:00
Alexander Machehin 993454fc29 [refs #579] alpha version of the pull discussion 2012-10-11 23:50:40 +06:00
Alexander Machehin 548f698526 [refs #579] add a line comment button 2012-10-08 20:42:38 +06:00
Alexander Machehin ed7aec602f [refs #579] alpha version of the pull inline comments 2012-10-06 01:19:05 +06:00
Alexander Machehin 2360a25a42 [refs #579] fixed many errors 2012-10-05 17:02:25 +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 910aac939e [refs #90] fixed changing tabs & anchors 2012-08-08 21:47:58 +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 5f50bacbe6 [refs #90] some refactoring with rtruncate method 2012-06-08 13:38:24 +06:00
Alexander Machehin 62128d2c72 [refs #90] change diff anchors to digits 2012-06-08 01:20:06 +06:00
Alexander Machehin 26baf999f4 [refs #90] diff stats 2012-05-29 23:09:43 +06:00
Pavel Chipiga 89f31e9782 Minor gems update. Prepare gemfile for jruby and rbx tests. Remove encoding hacks. Apply grit fixes for encoding support. Recode incorrect encodings. Refactor, cleanup and fix lots bugs in git section. Refactor and remove unused git routes. Translate some untranslated parts. Redo branch/tags selector. Fix files tree last commit message. Project section templates refactor and cleanup. Refs #190 2012-03-21 21:55:14 +02:00
George Vinogradov fe46e53ad8 [issue #195] Many changes.
*  Base presenter moved to lib
  *  Added diff display
  *  Changes in some views

TODO Add translations.
TODO Change commit page layout.
TODO Change representation of commit on commit page.
TODO Fix bug with tree/branch select.
2012-02-29 06:02:07 +04:00
George Vinogradov 85723f7da6 [issue #64] Fixed encodings bugs 2012-02-14 18:54:18 +04:00
George Vinogradov 99ee490e94 [issue #64] Added callback for notifications + some minor changes 2012-02-14 03:30:17 +04:00
George Vinogradov 8733c4dc34 [issue #64] Some dirty hacks.
Diff for file with russian name don't work yet.
2012-02-01 03:20:42 +04:00
Pavel Chipiga 13780a1b53 Add magic encodings. Refs #95 2012-01-30 22:39:34 +02:00
Timothy N. Tsvetkov efbd64e924 the aWeSOME commit view (with REALLY AWESOME view for git diffs) 2011-04-01 07:44:21 +04:00
Timothy N. Tsvetkov 5bc5638934 friday fixes lets drink vodka for your money very well 2011-03-11 20:19:47 +03:00
Timothy N. Tsvetkov 5d4ca333da commit and diff helpers 2011-03-10 16:33:50 +03:00