George Vinogradov
19a962560a
[issue #279 ] Merge branch '3.2-master' into 279-new_design_for_platforms
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-03-12 01:38:20 +04:00
Vladimir Sharshov
b99be18466
Merge pull request #287 from warpc/265-new_design_for_activity_feed
...
[Refs #265 ] fixed multiple "All my projects" and last project size
2012-03-11 13:08:52 -07:00
Alexander Machehin
9c6ba7a584
[refs #265 ] fixed last project size
2012-03-12 02:04:49 +06:00
Alexander Machehin
de61bc8cee
[refs #265 ] fixed multiple "All my projects"
2012-03-12 02:00:54 +06:00
Vladimir Sharshov
a26aa9b919
Merge pull request #286 from warpc/265-new_design_for_activity_feed
...
[refs #265 ] fixed double wiki feed
2012-03-11 11:39:33 -07:00
Alexander Machehin
c4fd73b52b
[refs #265 ] fixed double wiki feed
2012-03-12 00:28:14 +06:00
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
6a7d9636f5
[refs #265 ] fixed user avatars
2012-03-11 23:06:41 +06:00
Alexander Machehin
6d5120e5cc
Merge branch '3.2-master' into 265-new_design_for_activity_feed
2012-03-11 22:44:25 +06:00
Alexander Machehin
37f4676bfb
[refs #265 ] fuuu fix logo
2012-03-11 22:40:09 +06:00
Vladimir Sharshov
11434ff423
[Refs #285 ] Fix css style, rename button
2012-03-11 20:38:28 +04:00
Vladimir Sharshov
877d82aa06
Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master
2012-03-11 20:02:35 +04:00
Vladimir Sharshov
e2b3eb7b7f
[Refs #285 ] Fix current_user avatar for all user, replace button Edit
2012-03-11 20:02:07 +04:00
Alexander Machehin
849cbce913
[refs #265 ] add link to root
2012-03-11 21:30:45 +06:00
Alexander Machehin
66b57f7a0a
[refs #265 ] fixed issue assignee
2012-03-11 17:56:56 +06:00
Alexander Machehin
cc6390f3a1
[refs #265 ] fixed partial name
2012-03-11 16:18:11 +06:00
Pavel Chipiga
1cf2660cda
Fix search order. Refs #255
2012-03-08 02:32:12 +02:00
Vladimir Sharshov
22005f00d8
Merge pull request #281 from warpc/195-1-new_design_for_projects
...
[Refs #195 ] and [Refs #263 ]
* 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
2012-03-07 13:45:40 -08: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
Vladimir Sharshov
57c4c7032b
Merge pull request #280 from warpc/257-new_design_for_profiles
...
[refs #257 ] fix user update registration page
2012-03-07 11:07:36 -08:00
George Vinogradov
9c78a917a1
[issue #279 ] Added platforms page.
2012-03-07 22:59:37 +04:00
Alexander Machehin
de62aaad53
[refs #257 ] fix user update registration page
2012-03-08 00:47:19 +06:00
Alexander Machehin
185962890f
[refs #194 ] issue executor
2012-03-07 22:27:12 +06:00
Alexander Machehin
8df4fdfa5c
[refs #194 ] remove labels search from js
2012-03-07 22:26:43 +06:00
Alexander Machehin
b70e8db695
[refs #194 ] fix selected labels in the index page
2012-03-07 22:04:37 +06:00
Vladimir Sharshov
48c803c7eb
Merge pull request #278 from warpc/195-change_input_repo_url
...
[Refs #195 ] change repo url to readonly
2012-03-07 07:44:35 -08:00
Alexander Machehin
db8e1881ba
[refs #195 ] change repo url to readonly
2012-03-07 20:56:25 +06:00
Vladimir Sharshov
1cb109119d
Merge pull request #277 from warpc/274-file_detection_fixes
...
[Refs #274 ] file detection fixes
2012-03-07 06:53:16 -08: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
Alexander Machehin
324a407161
[refs #223 ] move New build button to sidebar
2012-03-07 17:12:00 +06:00
Alexander Machehin
9a6beef2da
[refs #194 ] fix issue managing labels
2012-03-07 16:50:45 +06:00
Alexander Machehin
4b173932e5
[refs #194 ] fix managing issue executor
2012-03-07 16:44:42 +06:00
Vladimir Sharshov
d797b40866
Merge pull request #275 from warpc/223-fix_includes_repository
...
[refs #223 ] Fix selector for Includes repository
2012-03-07 02:38:22 -08:00
Alexander Machehin
82d26b08b9
[refs #223 ] fix selector
2012-03-07 16:27:29 +06:00
Alexander Machehin
7fbee6e90e
[refs #194 ] fix user avatar
2012-03-07 14:31:55 +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
13ba125dc0
[refs #265 ] add project_id to comment & fix email notification
2012-03-07 03:49:29 +06:00
George Vinogradov
396540ffe3
[issue #193 ] Updated
2012-03-07 00:54:02 +04:00
George Vinogradov
0289f7cc3e
[issue #193 ] Fixed wiki history table.
2012-03-07 00:53:09 +04:00
Alexander Machehin
0f823bd9f3
[refs #265 ] fix security & commit to comments
2012-03-07 02:51:51 +06:00
Pavel Chipiga
e3f0b2fce2
Fix gravatar url
2012-03-06 22:16:31 +02:00
Pasha
2735b324ac
Merge pull request #271 from warpc/194-issue_page
...
#194 Управление назначением исполнителя и метками задачи
2012-03-06 11:54:45 -08: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
Vladimir Sharshov
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
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