Commit Graph

566 Commits

Author SHA1 Message Date
konstantin.grabar 73296059eb [refs #257] Merge 3.2-master into 257-new_design_for_profiles 2012-03-05 13:42:39 +04:00
konstantin.grabar 9b68752ffd [refs #257] Change avatar helper and logic. Add paperclip avatar to users 2012-03-03 22:05:02 +04:00
konstantin.grabar f58e24b134 [refs #257] User edit pages fixes 2012-03-03 20:03:23 +04:00
konstantin.grabar ecff8d2d41 [refs #257] Add new design to notifier settings. Fix sidebar. Add edit btn to user profile 2012-03-03 13:23:30 +04:00
konstantin.grabar 0dc22bae82 [refs #257] Add new design for users edit and private settings edit. Add new fields and action. 2012-03-03 12:01:32 +04:00
Pavel Chipiga 159fbe65dc Re-add compass. Add flash messages design. Refactor and fix bugs after merge. Remove duplicates, sync and separate locales . Fix some specs. Refs #263 2012-03-03 02:28:27 +02:00
George Vinogradov ea0ecffd23 Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master 2012-03-03 04:27:07 +04:00
George Vinogradov 7e5e3ca609 [issue #195] Fixed another creating bug...
I feel like a slipper-man...
2012-03-03 04:24:57 +04:00
Pavel Chipiga a831a4aa63 Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master 2012-03-03 01:43:14 +02:00
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
George Vinogradov 9ee3942702 [issue #195] Fixed bug with project creating 2012-03-03 03:25:20 +04:00
Vladimir Sharshov 622d80c6d3 Merge pull request #261 from warpc/194-tracker
[Refs #194] Fix ACL and tests for issues
2012-03-02 11:48:10 -08:00
Alexander Machehin 7cd3e40efc [refs #194] fix accessible list 2012-03-03 01:23:45 +06: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 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
konstantin.grabar e147c2d6c5 [refs #257] Add new design for user public page. New field. Move locales to another file 2012-03-02 16:14:59 +04:00
konstantin.grabar 8677fa7493 [refs #232] Remove name field 2012-03-02 14:39:48 +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
George Vinogradov 6cfb5d0c3d [issue #195] Fixed bug with encodings. Added avatar. Stubbed blame. 2012-03-02 04:39:43 +04:00
George Vinogradov 900c1fe2f5 [issue #195] Fixes.
*  Fixed translations
  *  Fixed blob display
  *  Fixed routes
2012-03-02 02:07:04 +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
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 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
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
Alexander Machehin b8b68e8ad2 [refs #194] add space between list and create form 2012-03-02 01:11:21 +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
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
konstantin.grabar fc3d4c0b6d [refs #232] Add group members edit page design 2012-03-01 18:23:26 +04:00
George Vinogradov 6eb239385a [issue #195] Fixed bug with creating project 2012-03-01 17:37:35 +04:00
konstantin.grabar 71748ebddc [refs #232] Add design to group new page 2012-03-01 17:19:58 +04:00
konstantin.grabar f4a50b509c [refs #232] Add edit btn to group public page 2012-03-01 16:37:54 +04:00
konstantin.grabar 157f9a1a68 [refs #232] Add sidebar and group edit page 2012-03-01 16:28:38 +04:00
konstantin.grabar 55ff2c7f6b [refs #195] Change new project route and some other changes 2012-03-01 16:10:12 +04:00
George Vinogradov 2a4e978857 [issue #195] Merge branch '3.2-master' into 195-new_design_for_projects
Conflicts:
	app/assets/stylesheets/custom.scss
2012-03-01 14:22:39 +04:00
George Vinogradov bc96fcdcc3 [issue #195] Added missed translation. 2012-03-01 03:34:36 +04:00
George Vinogradov dedd64f976 [issue #195] Returned lost files. 2012-03-01 03:29:16 +04:00
Alexander Machehin bcef305228 [refs #230] change title style; remove unused js 2012-03-01 02:19:39 +06:00