Vladimir Sharshov
|
6f56a7787d
|
Merge pull request #267 from warpc/265-new_design_for_activity_feed
[Refs #265] Add first version of new design to activity feed
|
2012-03-11 10:33:47 -07:00 |
Alexander Machehin
|
35d1323549
|
[refs #265] fixed message format
|
2012-03-11 23:30:14 +06:00 |
Vladimir Sharshov
|
d86653e172
|
Split code and tracker options in notification center
|
2012-03-11 21:21:31 +04:00 |
Alexander Machehin
|
6d5120e5cc
|
Merge branch '3.2-master' into 265-new_design_for_activity_feed
|
2012-03-11 22:44:25 +06:00 |
Vladimir Sharshov
|
11434ff423
|
[Refs #285] Fix css style, rename button
|
2012-03-11 20:38:28 +04:00 |
Pavel Chipiga
|
41cd1ddaf3
|
Redo cusel assign to avoid side effects. Refactor and cleanup projects controller, routes, views. Apply new design and functionality for projcts list page. Add fork button and fix fork. Apply gap repo during repo fork. Apply attr_accessible for projects. Cleanup locales. Fix new_build link ability check. Refs #195
|
2012-03-07 23:34:49 +02:00 |
Vladimir Sharshov
|
e49551756c
|
Merge pull request #276 from warpc/194-issue_page
[Refs #194] Fix for manage labels and executor
|
2012-03-07 11:26:11 -08:00 |
Alexander Machehin
|
de62aaad53
|
[refs #257] fix user update registration page
|
2012-03-08 00:47:19 +06:00 |
George Vinogradov
|
464de82c68
|
[issue #274] Added some MIME types. Changed MIME ordering.
|
2012-03-07 17:36:39 +04:00 |
Alexander Machehin
|
c657efc338
|
[refs #194] show all project labels without searching
|
2012-03-07 19:36:17 +06:00 |
George Vinogradov
|
d6d8410b0f
|
[issue #274] Fixed file detection.
TODO.
1. Change MIME in editor
2. Change MIME sorting
|
2012-03-07 05:20:35 +04:00 |
Alexander Machehin
|
7588a318da
|
Merge branch '3.2-master' into 265-new_design_for_activity_feed
Conflicts:
app/models/user.rb
|
2012-03-07 03:58:35 +06:00 |
Alexander Machehin
|
4b9d0616d6
|
Merge branch '3.2-master' into 194-issue_page
Conflicts:
app/views/issues/_create_sidebar.html.haml
|
2012-03-07 01:19:34 +06:00 |
Pavel Chipiga
|
7308c4a0d2
|
Merge branch '3.2-master' into 255-search
Refactor avatars. Fix user bugs. Remove ssh_key delete migration
Conflicts:
app/assets/stylesheets/design/custom.scss
app/models/user.rb
|
2012-03-06 20:59:29 +02:00 |
Alexander Machehin
|
8ae7ebee2b
|
Merge branch '3.2-master' into 194-issue_page
|
2012-03-06 22:51:13 +06:00 |
konstantin.grabar
|
9565d58e8f
|
[refs #257] Merge 3.2-master into 257-new_design_for_profiles
|
2012-03-06 20:13:53 +04:00 |
Pavel Chipiga
|
d6f9b2c3e9
|
Minor gems update. Apply search design and controller. Add and refactor search scopes. Fix relations. Separate and refactor search translations. Refactor search form. Refs #255
|
2012-03-06 17:53:04 +02:00 |
konstantin.grabar
|
f54d889f74
|
[refs #265] Fix activity partials messages and locales. Fix observer.
|
2012-03-06 18:04:05 +04:00 |
konstantin.grabar
|
de6490346b
|
[refs #257] Change error messages logic. Fix avatar ru translation
|
2012-03-06 15:24:42 +04:00 |
Alexander Machehin
|
9e6d06f1c9
|
[refs #194] manage issue executer
|
2012-03-06 00:28:55 +06:00 |
konstantin.grabar
|
637edabb4c
|
[refs #257] Fix some locales and headers
|
2012-03-05 22:00:44 +04:00 |
Vladimir Sharshov
|
9d8eb8a3f2
|
Merge pull request #269 from warpc/195-new_design_for_projects
[Refs #195] Add blane functions. Fixed syntax highlighting. Stub for rpm-specs.
|
2012-03-05 09:07:36 -08:00 |
konstantin.grabar
|
9214f79d91
|
[refs #265] Fix one more wiki compare route
|
2012-03-05 20:48:59 +04:00 |
George Vinogradov
|
8845ec17ff
|
[issue #195] Added translations.
|
2012-03-05 20:31:09 +04:00 |
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
|
c176304088
|
Add first version of new design to activity feed. Add new scope to BuildList model. Fix one moment into observer.
|
2012-03-05 13:11:50 +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
|
0c194f5b50
|
Fix DJ deploy callbacks. Remove capistrano-ext. Refs #263
|
2012-03-03 03:54:56 +02: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 |
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
|
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 |
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
|
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 |
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
|
3aae663811
|
[refs #194] add comments to issues
|
2012-03-02 02:04:05 +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
|
4b024d1728
|
[issue #195] Fixes.
* Fixed translations
* Fixed blob display
* Fixed routes
|
2012-03-01 21:37:24 +04: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
|
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 |