Commit Graph

1563 Commits

Author SHA1 Message Date
Pavel Chipiga 56a12dc9ea Merge branch 'master' into 3.2-master
Conflicts:
	app/models/comment.rb
	app/models/issue.rb
	config/locales/en.yml
2012-03-03 01:38:43 +02:00
Vladimir Sharshov 51fe026b44 Merge pull request #260 from warpc/195-new_design_for_projects
[Refs  #195] * Fixed line numbers
* Fixed branch selector
2012-03-02 09:07:43 -08:00
George Vinogradov 6522650c5a [issue #195] Merge branch '3.2-master' into 195-new_design_for_projects
Conflicts:
	app/views/git/blobs/_show.html.haml
2012-03-02 20:58:28 +04:00
George Vinogradov b3750f8644 [issue #195] Fixed branch selector. 2012-03-02 20:48:19 +04:00
George Vinogradov 7b37846a54 [issue #195] Fixed line numbering with files contains <> 2012-03-02 19:50:17 +04:00
Vladimir Sharshov a2d338b6cd Merge pull request #259 from warpc/228-fix_login_page
[refs #228] Fix error: couldn't login in to system
2012-03-02 07:39:30 -08:00
Alexander Machehin 50fc094bce [refs #228] fuuuuu... 2012-03-02 21:32:00 +06:00
Vladimir Sharshov 6bb3d36c81 Merge pull request #258 from warpc/230-error_messages
[refs #230] Fix error messages + some refactoring
2012-03-02 04:55:55 -08:00
Alexander Machehin 7164dd580e [refs #230] fix error messages + some refactoring 2012-03-02 18:27:38 +06:00
Vladimir Sharshov 88bcf7fe95 Merge pull request #256 from warpc/232-new_groups_design
[refs #232] Remove name field
2012-03-02 02:47:39 -08:00
konstantin.grabar 8677fa7493 [refs #232] Remove name field 2012-03-02 14:39:48 +04:00
Vladimir Sharshov fd51ab15a1 Merge pull request #248 from warpc/232-new_groups_design
[ Refs #232] new design for groups
2012-03-02 01:47:19 -08:00
konstantin.grabar 3369953b4c [refs #232] Remove unused commented code from groups controller 2012-03-02 13:46:16 +04:00
konstantin.grabar 1700588b97 [refs #232] Merge 3.2-master into 232-new_groups_design 2012-03-02 13:44:54 +04:00
konstantin.grabar d376b55a57 [refs #232] Move groups locales to another files. Remove unsused commented code. On small sidebar fix 2012-03-02 12:47:16 +04:00
George Vinogradov 4218006f47 [issue #195] Returned code highlighting. 2012-03-02 05:10:39 +04:00
Vladimir Sharshov c04d949510 Merge pull request #253 from warpc/195-new_design_for_projects
[Refs #195] Fixes for new project design
2012-03-01 16:42:10 -08:00
George Vinogradov 6cfb5d0c3d [issue #195] Fixed bug with encodings. Added avatar. Stubbed blame. 2012-03-02 04:39:43 +04:00
Pavel Chipiga e66f0110fc Merge branch '3.2-master' into 195-new_design_for_projects
Conflicts:
	app/assets/javascripts/extra/syntax.highlighter-init.js
	app/assets/stylesheets/design/common.scss
	vendor/assets/stylesheets/vendor.scss
2012-03-02 02:12:11 +02:00
George Vinogradov 900c1fe2f5 [issue #195] Fixes.
*  Fixed translations
  *  Fixed blob display
  *  Fixed routes
2012-03-02 02:07:04 +02:00
Pavel Chipiga accf38a088 Fix build_list display width. Refs #223 2012-03-02 02:04:07 +02:00
Pavel Chipiga b1ea9fe57f Upgrade gems. Hide uncancelable and unpublishable lins. Add duplicate build_list search link. Fix build_list display. Refs #223 2012-03-02 02:04:07 +02:00
Vladimir Sharshov f0e9f6b43d Update Rails to 3.2.2 for security fixes 2012-03-02 02:04:06 +02:00
Alexander Machehin cea7bc79bb [refs #194] fix notification line style 2012-03-02 02:04:06 +02:00
Alexander Machehin f79c8d6f16 [refs #230] shorter error messages 2012-03-02 02:04:06 +02:00
Alexander Machehin d7dbe79357 [refs #230] edit password page 2012-03-02 02:04:06 +02:00
Alexander Machehin de177f1d03 [refs #194] add space between list and create form 2012-03-02 02:04:05 +02:00
Alexander Machehin c30cd83c33 [refs #194] add default scope for comments 2012-03-02 02:04:05 +02:00
Alexander Machehin 3aae663811 [refs #194] add comments to issues 2012-03-02 02:04:05 +02:00
Alexander Machehin 790ea38ba6 [refs 194] fix comments 2012-03-02 02:04:04 +02:00
Pavel Chipiga 036dfb6dd5 Fix build_lists bugs. Add build list display and new build list pages design, apply compass. Refactor and cleanup assets. Refactor abilities. Refactor build_list search. Improve layout_class helper. Change defaul build_lists index filter and fix specs. Fix assets path. Refs #223 2012-03-02 02:04:04 +02:00
Vladimir Sharshov bd7c9d81c7 Merge pull request #254 from warpc/223-monitoring_design
[Refs #223] Fix build_list display
* Add duplicate build_list search link
* Upgrade gems
* Hide uncancelable and unpublishable links
2012-03-01 15:42:18 -08:00
Pavel Chipiga 84a7a9fe2d Fix build_list display width. Refs #223 2012-03-02 01:37:05 +02:00
Pavel Chipiga c177662e41 Upgrade gems. Hide uncancelable and unpublishable lins. Add duplicate build_list search link. Fix build_list display. Refs #223 2012-03-02 01:26:42 +02:00
George Vinogradov 318dc72d29 [issue #195] Fixes.
*  Added border to gutter in file preview
  *  Added "empty repo" message
  *  Fixed one of bugs with tree/branch selector
2012-03-02 02:23:53 +04:00
George Vinogradov 43c10ee812 [issue #195] Fixed long comments displaying. 2012-03-02 00:33:48 +04:00
Vladimir Sharshov 4e4130257f Update Rails to 3.2.2 for security fixes 2012-03-02 00:17:10 +04:00
Vladimir Sharshov 9e11a20f71 Merge pull request #249 from warpc/230-registration_page
[refs #230] Edit password page
2012-03-01 11:43:53 -08:00
Vladimir Sharshov 86581a6fdf Merge pull request #251 from warpc/194-tracker
[Refs #194] Add comments to Issue and fix bugs
2012-03-01 11:37:34 -08:00
Alexander Machehin 2f0981c12f [refs #194] fix notification line style 2012-03-02 01:33:22 +06:00
Alexander Machehin b0b53edf48 [refs #230] shorter error messages 2012-03-02 01:16:50 +06:00
Alexander Machehin 4931dc773b [refs #230] edit password page 2012-03-02 01:16:49 +06:00
Alexander Machehin b8b68e8ad2 [refs #194] add space between list and create form 2012-03-02 01:11:21 +06:00
Alexander Machehin 56b9371ee2 [refs #194] add default scope for comments 2012-03-02 01:10:12 +06:00
Alexander Machehin ecc2e1f181 [refs #194] add comments to issues 2012-03-02 00:57:59 +06:00
Alexander Machehin 20417241a8 [refs 194] fix comments 2012-03-02 00:57:59 +06:00
Vladimir Sharshov 53c7fc0424 Merge pull request #250 from warpc/223-monitoring_design
[Refs #223]
* Fix build_lists bugs
* Add build list display and new build list pages design, apply compass
* Refactor and cleanup assets
* Refactor abilities
* Refactor build_list search
* Improve layout_class helper
* Change defaul build_lists index filter and fix specs
* Fix assets path
2012-03-01 09:41:11 -08:00
George Vinogradov 4b024d1728 [issue #195] Fixes.
*  Fixed translations
  *  Fixed blob display
  *  Fixed routes
2012-03-01 21:37:24 +04:00
Pavel Chipiga 7d112d0524 Fix build_lists bugs. Add build list display and new build list pages design, apply compass. Refactor and cleanup assets. Refactor abilities. Refactor build_list search. Improve layout_class helper. Change defaul build_lists index filter and fix specs. Fix assets path. Refs #223 2012-03-01 19:33:46 +02:00
konstantin.grabar eb689b7f18 [refs #232] Add new design and logic refactor for group members action 2012-03-01 19:41:40 +04:00