c657efc338
[refs #194 ] show all project labels without searching
2012-03-07 19:36:17 +06:00
9a6beef2da
[refs #194 ] fix issue managing labels
2012-03-07 16:50:45 +06:00
4b173932e5
[refs #194 ] fix managing issue executor
2012-03-07 16:44:42 +06:00
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
9df6b23e52
Merge pull request #273 from warpc/255-search
...
[Refs #255 ] Global search
* Minor gems update
* Apply search design and controller
* Add and refactor search scopes
* Fix relations
* Separate and refactor search translations
* Refactor search form
2012-03-06 11:10:22 -08:00
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
8ae7ebee2b
Merge branch '3.2-master' into 194-issue_page
2012-03-06 22:51:13 +06:00
1791160b09
[refs #194 ] fix manage issue executor
2012-03-06 22:31:07 +06:00
c3d78a6786
Merge pull request #266 from warpc/257-new_design_for_profiles
...
[Refs #257 ] New design for profiles and settings
2012-03-06 08:25:17 -08:00
9565d58e8f
[refs #257 ] Merge 3.2-master into 257-new_design_for_profiles
2012-03-06 20:13:53 +04:00
61a896c8b3
Merge pull request #272 from warpc/193-new_design_for_wiki
...
193 new design for wiki
2012-03-06 08:03:15 -08:00
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
b9de81f4df
[refs #194 ] managing labels in the issue
2012-03-06 21:21:13 +06:00
f070a9d729
[issue #193 ] Merge branch '3.2-master' into 193-new_design_for_wiki
...
Conflicts:
app/assets/stylesheets/custom.scss
2012-03-06 17:40:44 +04:00
2b1b5504cd
[issue #193 ] Added fullname to history table.
2012-03-06 17:20:30 +04:00
cd57da0946
[issue #193 ] Fixed searchbar in wiki.
2012-03-06 17:08:19 +04:00
af69c02a6d
[refs #194 ] render user name
2012-03-06 18:29:42 +06:00
de6490346b
[refs #257 ] Change error messages logic. Fix avatar ru translation
2012-03-06 15:24:42 +04:00
9e6d06f1c9
[refs #194 ] manage issue executer
2012-03-06 00:28:55 +06:00
325497d040
Merge branch '3.2-master' into 194-issue_page
2012-03-06 00:11:32 +06:00
637edabb4c
[refs #257 ] Fix some locales and headers
2012-03-05 22:00:44 +04:00
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
8845ec17ff
[issue #195 ] Added translations.
2012-03-05 20:31:09 +04:00
91ba8b1543
[Refs #257 ] Fix password change, refactoring.
2012-03-05 19:36:23 +04:00
93e2caccc8
[issue #195 ] Added blame view.
2012-03-05 19:29:05 +04:00
5290f0c712
[issue #195 ] Fixed syntax highlighting. Stub for rpm-specs
2012-03-05 19:27:16 +04:00
e5d5ef11e3
[refs #194 ] fix submenu highlight
2012-03-05 20:00:49 +06:00
695bacd4d2
[refs #194 ] fix rendering 'New issue' label
2012-03-05 19:57:01 +06:00
c76a3e148f
[refs #194 ] more obvious name to partial
2012-03-05 19:55:15 +06:00
6e02d50664
Merge pull request #268 from warpc/228-fix_remember_me
...
[Refs #228 ] Fix checking remember me button
2012-03-05 03:14:24 -08:00
dab45f9afe
[refs #228 ] fix checking remember me button
2012-03-05 16:49:31 +06:00
73296059eb
[refs #257 ] Merge 3.2-master into 257-new_design_for_profiles
2012-03-05 13:42:39 +04:00
9b68752ffd
[refs #257 ] Change avatar helper and logic. Add paperclip avatar to users
2012-03-03 22:05:02 +04:00
f58e24b134
[refs #257 ] User edit pages fixes
2012-03-03 20:03:23 +04:00
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
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
0c194f5b50
Fix DJ deploy callbacks. Remove capistrano-ext. Refs #263
2012-03-03 03:54:56 +02:00
ce633f5838
Fix group owner. Refs #232
2012-03-03 03:34:24 +02:00
a0f0c24f88
Fix flash messages. Add styles. Refs #263
2012-03-03 03:05:19 +02:00
914f469fb2
Merge pull request #264 from warpc/263-refactoring
...
[Refs #263 ]
* Re-add compass
* Add flash messages design
* Refactor and fix bugs after merge
* Remove duplicates, sync and separate locales
* Fix some specs
2012-03-02 16:45:12 -08:00
13f0d8223d
Remove compass-bootstrap. Take back DJ fix. Refs #263
2012-03-03 02:42:10 +02:00
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
ea0ecffd23
Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master
2012-03-03 04:27:07 +04:00
7e5e3ca609
[issue #195 ] Fixed another creating bug...
...
I feel like a slipper-man...
2012-03-03 04:24:57 +04:00
a831a4aa63
Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master
2012-03-03 01:43:14 +02:00
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
9ee3942702
[issue #195 ] Fixed bug with project creating
2012-03-03 03:25:20 +04:00
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
7cd3e40efc
[refs #194 ] fix accessible list
2012-03-03 01:23:45 +06:00
403a8a19ce
Merge pull request #262 from warpc/194-nice_radio_change
...
[Refs #194 ] Fix triggering change event for niceRadio buttons
2012-03-02 10:27:27 -08:00
Alexander Machehin
Vladimir Sharshov
Pavel Chipiga
konstantin.grabar
George Vinogradov
konstantin.grabar