a562219706
[refs #270 ] some fixes when creating new user
2012-03-21 23:52:27 +06:00
a6a5b722d2
[refs #270 ] use devise lockable to ban
2012-03-21 23:45:51 +06:00
ee867aa8d4
Merge pull request #324 from warpc/200-new_build_repos_rules
...
[refs #200 ] Fix chbx behaviour for repos and their platforms
2012-03-21 08:06:54 -07:00
5abf64e353
[refs #200 ] Fix chbx behaviour for repos and their platforms
2012-03-21 19:04:01 +04:00
72c02282aa
[refs #232 ] Add mass-assignment fixes. Add create and mass-assig tests.
2012-03-21 17:52:35 +04:00
3c7dec3b97
Merge branch '3.2-master' into 270-user_control
2012-03-21 19:39:55 +06:00
8b252d8c14
Add and tune devise lockable strategy. Refs #270
2012-03-21 15:37:16 +02:00
81d18b5337
Merge pull request #323 from warpc/200-new_build_repos_rules
...
[Refs #200 ] Move some fields to rights part of the form. Hide empty platform. Fix checkbox checking on build list form.
2012-03-21 05:17:23 -07:00
e6622d29ea
[refs #200 ] Remove unused code
2012-03-21 15:53:54 +04:00
f9850c6885
[refs #200 ] Fix checkbox checking on build list form
2012-03-21 15:34:11 +04:00
2df89c6ae3
Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master
2012-03-21 14:50:38 +04:00
375aa7e74e
Merge pull request #322 from warpc/265-activity_feed_messages
...
[refs #265 ] add ajax to older messages
2012-03-21 03:50:25 -07:00
4393e8b30f
[Refs #263 ] Fix activity feed menu display
2012-03-21 14:48:06 +04:00
b678320638
[refs #265 ] add ajax to older messages
2012-03-21 16:29:45 +06:00
4a6ce6c8a8
Merge branch '3.2-master' into 270-user_control
...
Conflicts:
app/views/users/index.html.haml
2012-03-21 15:29:44 +06:00
7bf107f287
[Refs #263 ] Fix styles (layout and menu)
2012-03-21 03:11:58 +04:00
d2da4fc0ba
[Refs #263 ] Fix css
2012-03-21 02:53:56 +04:00
ba140c67f9
[Refs #263 ] Align the menu, change colors for text and background
2012-03-21 02:47:51 +04:00
e2c1e59350
Merge pull request #314 from warpc/270-admins_menu
...
[Refs #270 ] created admins menu aside
2012-03-20 15:17:51 -07:00
5c408540ff
[refs #270 ] can ban user
2012-03-21 02:06:51 +06:00
347b5283b0
Merge pull request #320 from warpc/279-new_design_for_platforms
...
[issue #279 ] Disable members for personal platforms
2012-03-20 11:49:21 -07:00
cd42c912d8
[issue #279 ] Fixed permissions for personal platforms.
2012-03-20 22:41:14 +04:00
20ff998f08
[refs #270 ] user control
2012-03-21 00:12:18 +06:00
eb4a18c0ff
Merge pull request #319 from warpc/279-new_design_for_platforms
...
[issue #279 ] Fixed bugs
2012-03-20 11:03:32 -07:00
f958c56a3e
[issue #279 ] Fixed typos
2012-03-20 21:44:56 +04:00
047425a27f
Merge pull request #318 from warpc/279-new_design_for_platforms
...
[Refs #279 ] new design for platforms(add control for members, fix bugs)
2012-03-20 09:48:57 -07:00
77e8a4fe4b
[issue #279 ] Fixed "no method gsub for Nil class" bug
2012-03-20 20:29:05 +04:00
7c0585ee87
[issue #279 ] Added members and other changes.
2012-03-20 20:24:18 +04:00
7f6f68872e
[refs #200 ] Move some fields to rights part of the form. Hide platforms with no repos
2012-03-20 19:45:01 +04:00
6886bf4e46
[issue #279 ] Fixed some bugs in views
2012-03-20 17:12:56 +04:00
09fcc04489
Merge pull request #315 from warpc/200-new_build_repos_rules
...
[refs #200 ] Change build list repos and platforms interface
2012-03-20 06:02:49 -07:00
981ea7d69f
[refs #200 ] Remove debug code from build_lists controller
2012-03-20 17:01:18 +04:00
d3c3726a84
[Refs #66 ] Add priority in build list
2012-03-20 14:56:51 +04:00
31e0c9191c
[refs #200 ] Fix build list form interface and include_repos logic
2012-03-20 14:36:31 +04:00
56f1d06da8
[Refs #66 ] Add priority to build list
2012-03-20 14:08:24 +04:00
1d56dfad3d
[refs #200 ] Remove include repos block
2012-03-20 00:04:33 +04:00
f0645be9c5
[refs #200 ] Change build list repos and platforms interface
2012-03-19 23:52:46 +04:00
1066307fbb
[refs #270 ] created admins menu aside
2012-03-19 23:32:02 +06:00
4ce3e5bf32
Merge pull request #310 from warpc/252-user_appeal
...
[refs #252 ] fixed appeal to user in email and in welcome message in activity feed
2012-03-19 09:07:21 -07:00
155a46cce9
[issue #279 ] Fixed some bugs in connection info.
2012-03-19 19:56:40 +04:00
c932d14a24
Merge pull request #313 from warpc/279-new_design_for_platforms
...
[issue #279 ] Fixed some bugs in connection info
2012-03-19 08:43:23 -07:00
b6b1462de5
[issue #279 ] Fixed some bugs in connection info.
2012-03-19 19:37:08 +04:00
d9cf26528b
Merge pull request #311 from warpc/279-new_design_for_platforms
...
[Refs #279 ] new design for platforms
* add connection info for personal platforms;
* fixed freezing in add/delete repo projects page;
* removed freeze & unfreeze actions from platform;
* fix permission and moved some buttons.
2012-03-19 08:20:43 -07:00
2c0ccb8489
[issue #279 ] Connection info for platform moved to partial
2012-03-19 19:16:35 +04:00
d5d2b7229b
[issue #279 ] Removed freeze & unfreeze actions from Platform
2012-03-19 19:03:09 +04:00
fa6ecb1294
Merge pull request #312 from warpc/223-monitoring_design
...
[refs #223 ] Add link to project into submenu
2012-03-19 08:00:00 -07:00
1a68a9145e
[refs #223 ] Add link to project into submenu
2012-03-19 18:58:13 +04:00
ddc95c25fb
[issue #279 ] Merge branch '3.2-master' into 279-new_design_for_platforms
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-03-19 18:56:04 +04:00
1cbc3f5b7a
[issue #279 ] Added block of connection data for personal platform.
2012-03-19 18:46:12 +04:00
9b2dc6538d
[refs #252 ] new user notifications
2012-03-19 20:45:47 +06:00
896301649e
[issue #279 ] Fixed json on repo page.
2012-03-19 18:45:40 +04:00
d5dc05233f
[refs #252 ] fixed appeal to user
2012-03-19 20:34:57 +06:00
c3bb559bfb
[refs #308 ] hide password & password confirmation
2012-03-19 19:47:57 +06:00
0c1d57cd8c
[refs #279 ] can resize textarea in product edit page
2012-03-19 18:16:12 +06:00
abe06b5068
Merge pull request #305 from warpc/223-monitoring_design
...
[Refs #223 ] monitoring design for current task
2012-03-19 03:28:30 -07:00
30038f4c9c
[refs #265 ] show 10 symbols of the commit hash
2012-03-19 15:58:30 +06:00
5e08b89f6a
[refs #265 ] shoter commit hash in message
2012-03-19 15:23:59 +06:00
296acd80da
[refs #265 ] added build waiting message
2012-03-19 15:07:09 +06:00
348fd40daf
[refs #223 ] Fix build status color helpers
2012-03-19 12:39:46 +04:00
b3d7091db0
Merge 3.2-master into 223-monitoring_design
2012-03-19 10:41:30 +04:00
c8329d3783
[refs #223 ] Remove unnessecary things from build list page
2012-03-19 10:36:39 +04:00
4b26eebeca
[refs #223 ] Add new design to build list task page
2012-03-18 12:20:31 +04:00
86871ab32d
Merge branch '3.2-master' into 265-activity_feed_messages
...
Conflicts:
config/locales/menu.en.yml
config/locales/menu.ru.yml
2012-03-17 01:09:04 +06:00
fb89eedca3
[refs #265 ] forgot build list setup
2012-03-17 00:58:41 +06:00
22d7f8d975
[refs #265 ] shit
2012-03-17 00:55:03 +06:00
dd5f51de71
[refs #265 ] added build tasks feed
2012-03-16 21:37:58 +06:00
3d9f9b5c73
[issue #279 ] Fixed permissions and moved some buttons.
...
Removed Freeze/Unfreeze actions from Platform.
2012-03-16 17:25:34 +04:00
42eb250942
Merge pull request #302 from warpc/279-new_design_for_platforms
...
[issue #279 ] Fixed some bugs:
* Redirect to repositroies page when remove repository.
* Fixed sorting background in Datatables styles.
* Fixed save button translation in platforms form.
* Fixed platform save & create flashes.
* Fixed cancel buttons in platform, product & repository forms.
* Redirect to created product on creation.
* Redirect to platform's products page after product destruction.
* Fixed permissions to Build button on product page.
* Fixed permissions to Add button on repository page.
* Fixed forbidden redirect when trying to acces
* RepositoriesController#projects_list by unprivilleged user.
2012-03-15 16:15:58 -07:00
cc68163238
[issue #279 ] Fixed some bugs:
...
* Redirect to repositroies page when remove repository.
* Fixed sorting background in Datatables styles.
* Fixed save button translation in platforms form.
* Fixed platform save & create flashes.
* Fixed cancel buttons in platform, product & repository forms.
* Redirect to created product on creation.
* Redirect to platform's products page after product destruction.
* Fixed permissions to Build button on product page.
* Fixed permissions to Add button on repository page.
* Fixed forbidden redirect when trying to acces
RepositoriesController#projects_list by unprivilleged user.
2012-03-16 02:56:12 +04:00
e719633862
Merge pull request #300 from warpc/279-new_design_for_platforms
...
[Refs #279 ] new design for platforms (bugfixes, ACL and filters)
2012-03-15 14:50:37 -07:00
9911d9f25e
[issue #279 ] Removed can_clone? and can_build? from Product
2012-03-16 01:10:24 +04:00
3719b40889
[refs #265 ] removed unused code
2012-03-16 00:22:56 +06:00
4addff059b
[refs #265 ] added activity feed tabs
2012-03-15 23:52:54 +06:00
09dcb43da8
Merge pull request #301 from warpc/265-activity_feed_messages
...
[refs #265 ] Fixed check rails env
2012-03-15 07:08:23 -07:00
7bab315b96
[Refs #279 ] Fix url and submit button size
2012-03-15 18:02:10 +04:00
548550d355
[issue #279 ] Added filtering to repositories projects.
2012-03-15 17:53:36 +04:00
e7ac387466
[refs #265 ] fixed check rails env
2012-03-15 18:10:10 +06:00
76af82805d
[issue #279 ] Fixes.
...
* Fixed permissions.
* Added pagination in repository view.
2012-03-15 04:07:53 +04:00
3c60347a23
[issue #279 ] Fixes.
...
* Almost finished permissions fixes
* Removed is_template from product
* Some fixes in crontab_generator partial
2012-03-15 03:34:09 +04:00
8acb512a2e
Merge pull request #299 from warpc/279-new_design_for_platforms
...
[Refs #279 ] new design for platforms
2012-03-14 13:22:10 -07:00
3761f0a7ff
Merge pull request #297 from warpc/194-issue_page
...
[refs #194 ] Fix ACL issue executor bug
2012-03-14 12:07:22 -07:00
bce8618c30
[refs #194 ] removed reduntant check
2012-03-15 00:51:22 +06:00
747edb73a5
[issue #279 ] Merge branch '3.2-master' into 279-new_design_for_platforms
...
Conflicts:
db/schema.rb
2012-03-14 21:43:08 +04:00
79e56eec52
Merge pull request #298 from warpc/265-activity_feed_messages
...
[Refs #265 ] Restyle comments and issues feeds messages, refactoring, fix bugs
2012-03-14 10:29:10 -07:00
e30cc70728
[refs #265 ] some refactoring
2012-03-14 23:23:55 +06:00
5a77b17a43
[issue #279 ] Almost finished design for platforms
...
TODO:
* Add design for crontab generator
* Fix path generation
2012-03-14 21:22:47 +04:00
51e4cafe4c
Revert "[refs #194 ] fixed executor bug"
...
This reverts commit 9f5176fb9990e61e3ca7a14fe0a5346f042d36d6.
2012-03-14 23:18:37 +06:00
6359acd917
[refs #194 ] fixed executor bug
2012-03-14 23:01:23 +06:00
3642163fd7
[refs #265 ] changed feed messages
2012-03-14 23:00:26 +06:00
f11fc179d3
[refs #194 ] fixed executor bug
2012-03-14 22:05:08 +06:00
20079d4fc5
[refs #265 ] changed comments feed
2012-03-14 20:40:41 +06:00
ffc1c6d0b7
[refs #265 ] fixed new issue feed
2012-03-14 20:33:51 +06:00
d9c3f9ddc8
[refs #265 ] fixed comment to commit feed
2012-03-14 20:33:16 +06:00
9c429e893e
Merge pull request #294 from warpc/265-activity_feed_messages
...
[refs #265 ] changed activity feed messages; fixed avatar sizes; fixed message for deleted branch
2012-03-14 05:20:48 -07:00
dc6e380647
Merge pull request #296 from warpc/194-issue_page
...
[refs #194 ] fixed remove executor from issue
2012-03-14 04:18:29 -07:00
4b8e9682b5
[refs #194 ] some refactor
2012-03-14 16:53:23 +06:00
5ffd976086
[refs #194 ] fixed remove executor from issue
2012-03-14 16:39:59 +06:00
1ff3cf5662
[refs #265 ] fixed message for deleted branch
2012-03-14 15:38:22 +06:00
9f9eb23e43
Merge pull request #293 from warpc/265-new_design_for_activity_feed
...
[Refs #265 ] Fix subscribe dublicates
2012-03-13 13:48:32 -07:00
b93032e226
[refs #265 ] fixed avatar sizes
2012-03-14 00:53:37 +06:00
ba437f7703
[refs #265 ] changed activity feed messages
2012-03-14 00:47:37 +06:00
304141b1ba
[issue #279 ] Added views and removed datatables plugin
...
* Datatables plugin moved to lib.
* Added views to platform and repositories.
2012-03-13 19:12:06 +04:00
952c9e46ea
[issue #279 ] Added datatables pagination extension
2012-03-13 18:36:42 +04:00
5b932879e2
[refs #265 ] fixed subscribe dublicates
2012-03-13 19:56:58 +06:00
2153f66ab1
Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master
2012-03-13 15:05:09 +04:00
b07d81644a
[Refs #223 ] Monitoring colors code in index page
2012-03-13 15:04:29 +04:00
51e2584995
Fix abilities for invites. Refs #174
2012-03-12 23:24:05 +02:00
61b8c70f4b
[Refs #257 ] Fix edit profile labels
2012-03-12 22:13:10 +04:00
f6dd072a24
Merge branch '3.2-master' into 257-new_design_for_profiles
...
Conflicts:
config/locales/users.en.yml
config/locales/users.ru.yml
2012-03-12 23:04:31 +06:00
843d95b64e
[refs #257 ] fixed 'big' geometry
2012-03-12 23:02:02 +06:00
4fd91e2bfe
[refs #257 ] force convert avatar to jpg
2012-03-12 22:28:56 +06:00
24639b8684
[refs 257] renamed to profile
2012-03-12 21:03:25 +06:00
fc465a4647
[refs #195 ] onfocus -> onclick
2012-03-12 20:46:11 +06:00
19bcdf94d9
[Refs #195 ] More space for project url
2012-03-12 18:31:25 +04:00
5f6ca140d9
[refs #257 ] add ability to destroy avatar
2012-03-12 18:51:07 +06:00
64926498d6
[Refs #195 ] Fix pagination for index projects page
2012-03-12 16:05:19 +04:00
bb7cff5de8
Fix abilities - allow users search build_lists. Refs #223
2012-03-12 13:46:57 +02:00
26e80af8cb
[refs #195 ] one click select
2012-03-12 16:13:34 +06:00
04622790fc
Merge pull request #289 from warpc/265-new_design_for_activity_feed
...
[refs #265 ] Work today builds statistics
2012-03-12 02:15:26 -07:00
ecfb4f81a0
[refs #265 ] fixed today builds
2012-03-12 14:52:38 +06:00
c2dc8d9e38
[issue #279 ] Added platform products list
2012-03-12 04:07:18 +04:00
61bd704cb1
[issue #279 ] Added platform repositories list.
2012-03-12 03:58:25 +04:00
535c075d3e
[issue #279 ] Added platform main page, menu & sidebar
2012-03-12 03:08:50 +04:00
3e344f90ad
Display only 10 last activities. Refs #265
2012-03-12 00:47:22 +02:00
a78b7b4155
Merge branch 'master' into 3.2-master
2012-03-11 23:39:11 +02:00
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
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
9c6ba7a584
[refs #265 ] fixed last project size
2012-03-12 02:04:49 +06:00
de61bc8cee
[refs #265 ] fixed multiple "All my projects"
2012-03-12 02:00:54 +06:00
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
c4fd73b52b
[refs #265 ] fixed double wiki feed
2012-03-12 00:28:14 +06:00
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
35d1323549
[refs #265 ] fixed message format
2012-03-11 23:30:14 +06:00
d86653e172
Split code and tracker options in notification center
2012-03-11 21:21:31 +04:00
6a7d9636f5
[refs #265 ] fixed user avatars
2012-03-11 23:06:41 +06:00
6d5120e5cc
Merge branch '3.2-master' into 265-new_design_for_activity_feed
2012-03-11 22:44:25 +06:00
37f4676bfb
[refs #265 ] fuuu fix logo
2012-03-11 22:40:09 +06:00
11434ff423
[Refs #285 ] Fix css style, rename button
2012-03-11 20:38:28 +04:00
877d82aa06
Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master
2012-03-11 20:02:35 +04:00
e2b3eb7b7f
[Refs #285 ] Fix current_user avatar for all user, replace button Edit
2012-03-11 20:02:07 +04:00
849cbce913
[refs #265 ] add link to root
2012-03-11 21:30:45 +06:00
66b57f7a0a
[refs #265 ] fixed issue assignee
2012-03-11 17:56:56 +06:00
cc6390f3a1
[refs #265 ] fixed partial name
2012-03-11 16:18:11 +06:00
1cf2660cda
Fix search order. Refs #255
2012-03-08 02:32:12 +02:00
41ae79eb46
Add configurable arch parameter to project build_for method. Write rake task for projects build. Refs #282
2012-03-08 01:25:17 +02:00
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
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
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
9c78a917a1
[issue #279 ] Added platforms page.
2012-03-07 22:59:37 +04:00
de62aaad53
[refs #257 ] fix user update registration page
2012-03-08 00:47:19 +06:00
185962890f
[refs #194 ] issue executor
2012-03-07 22:27:12 +06:00
8df4fdfa5c
[refs #194 ] remove labels search from js
2012-03-07 22:26:43 +06:00
b70e8db695
[refs #194 ] fix selected labels in the index page
2012-03-07 22:04:37 +06:00
db8e1881ba
[refs #195 ] change repo url to readonly
2012-03-07 20:56:25 +06:00
1cb109119d
Merge pull request #277 from warpc/274-file_detection_fixes
...
[Refs #274 ] file detection fixes
2012-03-07 06:53:16 -08:00
464de82c68
[issue #274 ] Added some MIME types. Changed MIME ordering.
2012-03-07 17:36:39 +04:00
c657efc338
[refs #194 ] show all project labels without searching
2012-03-07 19:36:17 +06:00
324a407161
[refs #223 ] move New build button to sidebar
2012-03-07 17:12:00 +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
82d26b08b9
[refs #223 ] fix selector
2012-03-07 16:27:29 +06:00
7fbee6e90e
[refs #194 ] fix user avatar
2012-03-07 14:31:55 +06:00
d6d8410b0f
[issue #274 ] Fixed file detection.
...
TODO.
1. Change MIME in editor
2. Change MIME sorting
2012-03-07 05:20:35 +04:00
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
13ba125dc0
[refs #265 ] add project_id to comment & fix email notification
2012-03-07 03:49:29 +06:00
396540ffe3
[issue #193 ] Updated
2012-03-07 00:54:02 +04:00
0289f7cc3e
[issue #193 ] Fixed wiki history table.
2012-03-07 00:53:09 +04:00
0f823bd9f3
[refs #265 ] fix security & commit to comments
2012-03-07 02:51:51 +06:00
e3f0b2fce2
Fix gravatar url
2012-03-06 22:16:31 +02: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
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
872132d8a6
[refs #265 ] fix find owner and project
2012-03-07 00:20:14 +06: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
9565d58e8f
[refs #257 ] Merge 3.2-master into 257-new_design_for_profiles
2012-03-06 20:13:53 +04: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
7e53a6c511
[refs #265 ] Fix git push and delete branch partials and logic
2012-03-06 18:57:05 +04:00
f54d889f74
[refs #265 ] Fix activity partials messages and locales. Fix observer.
2012-03-06 18:04:05 +04: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
4f995ca548
[refs #265 ] hook mode 775 -> 755
2012-03-06 15:39:23 +06:00
de0f7c83c8
[refs #265 ] fix hook and add execute bit for it
2012-03-06 15:07:14 +06: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
9558a1d65f
[refs #265 ] Fix wiki history link
2012-03-05 20:36:58 +04: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
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
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
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
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
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
319fcdad86
[refs #194 ] refactoring
2012-03-03 00:21:46 +06:00
dfa361f5c3
[refs #194 ] fix triggering change event for niceRadio buttons
2012-03-02 23:45:20 +06:00
c7b412c0e0
[refs #194 ] some refactoring
2012-03-02 23:38:00 +06:00
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
41c0d1e856
[refs #194 ] fix security and tests
2012-03-02 22:52:15 +06:00
b3750f8644
[issue #195 ] Fixed branch selector.
2012-03-02 20:48:19 +04:00
7b37846a54
[issue #195 ] Fixed line numbering with files contains <>
2012-03-02 19:50:17 +04:00
50fc094bce
[refs #228 ] fuuuuu...
2012-03-02 21:32:00 +06:00
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
7164dd580e
[refs #230 ] fix error messages + some refactoring
2012-03-02 18:27:38 +06:00
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
8677fa7493
[refs #232 ] Remove name field
2012-03-02 14:39:48 +04:00
3369953b4c
[refs #232 ] Remove unused commented code from groups controller
2012-03-02 13:46:16 +04:00
1700588b97
[refs #232 ] Merge 3.2-master into 232-new_groups_design
2012-03-02 13:44:54 +04:00
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
4218006f47
[issue #195 ] Returned code highlighting.
2012-03-02 05:10:39 +04:00
6cfb5d0c3d
[issue #195 ] Fixed bug with encodings. Added avatar. Stubbed blame.
2012-03-02 04:39:43 +04:00
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
900c1fe2f5
[issue #195 ] Fixes.
...
* Fixed translations
* Fixed blob display
* Fixed routes
2012-03-02 02:07:04 +02:00
accf38a088
Fix build_list display width. Refs #223
2012-03-02 02:04:07 +02:00
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
cea7bc79bb
[refs #194 ] fix notification line style
2012-03-02 02:04:06 +02:00
f79c8d6f16
[refs #230 ] shorter error messages
2012-03-02 02:04:06 +02:00
d7dbe79357
[refs #230 ] edit password page
2012-03-02 02:04:06 +02:00
de177f1d03
[refs #194 ] add space between list and create form
2012-03-02 02:04:05 +02:00
c30cd83c33
[refs #194 ] add default scope for comments
2012-03-02 02:04:05 +02:00
3aae663811
[refs #194 ] add comments to issues
2012-03-02 02:04:05 +02:00
790ea38ba6
[refs 194] fix comments
2012-03-02 02:04:04 +02:00
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
84a7a9fe2d
Fix build_list display width. Refs #223
2012-03-02 01:37:05 +02:00
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
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
43c10ee812
[issue #195 ] Fixed long comments displaying.
2012-03-02 00:33:48 +04:00
9e11a20f71
Merge pull request #249 from warpc/230-registration_page
...
[refs #230 ] Edit password page
2012-03-01 11:43:53 -08:00
2f0981c12f
[refs #194 ] fix notification line style
2012-03-02 01:33:22 +06:00
b0b53edf48
[refs #230 ] shorter error messages
2012-03-02 01:16:50 +06:00
4931dc773b
[refs #230 ] edit password page
2012-03-02 01:16:49 +06:00
b8b68e8ad2
[refs #194 ] add space between list and create form
2012-03-02 01:11:21 +06:00
56b9371ee2
[refs #194 ] add default scope for comments
2012-03-02 01:10:12 +06:00
ecc2e1f181
[refs #194 ] add comments to issues
2012-03-02 00:57:59 +06:00
20417241a8
[refs 194] fix comments
2012-03-02 00:57:59 +06:00
4b024d1728
[issue #195 ] Fixes.
...
* Fixed translations
* Fixed blob display
* Fixed routes
2012-03-01 21:37:24 +04:00
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
eb689b7f18
[refs #232 ] Add new design and logic refactor for group members action
2012-03-01 19:41:40 +04:00
fc3d4c0b6d
[refs #232 ] Add group members edit page design
2012-03-01 18:23:26 +04:00
6eb239385a
[issue #195 ] Fixed bug with creating project
2012-03-01 17:37:35 +04:00
71748ebddc
[refs #232 ] Add design to group new page
2012-03-01 17:19:58 +04:00
f4a50b509c
[refs #232 ] Add edit btn to group public page
2012-03-01 16:37:54 +04:00
157f9a1a68
[refs #232 ] Add sidebar and group edit page
2012-03-01 16:28:38 +04:00
55ff2c7f6b
[refs #195 ] Change new project route and some other changes
2012-03-01 16:10:12 +04:00
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
fe5ad9ebf3
[issue #195 ] Added missed js. Some changes.
2012-03-01 05:07:31 +04:00
bc96fcdcc3
[issue #195 ] Added missed translation.
2012-03-01 03:34:36 +04:00
dedd64f976
[issue #195 ] Returned lost files.
2012-03-01 03:29:16 +04:00
bcef305228
[refs #230 ] change title style; remove unused js
2012-03-01 02:19:39 +06:00
cadd1995d1
[refs #230 ] fix forgot password SignUp style
2012-03-01 01:50:08 +06:00
d3231b5faa
Merge pull request #243 from warpc/230-registration_page
...
[Refs #230 ] Fix I18n and remove wrong js for registration page
2012-02-29 11:23:35 -08:00
4fd518ac86
Merge pull request #242 from warpc/195-new_design_for_projects
...
[Refs #195 ]
* Add default value to is_rpm field for projects
* Show tab for wiki, tracker or build only if they activate
2012-02-29 11:04:19 -08:00
5f71d430fc
[refs #230 ] remove wrong js
2012-03-01 00:48:13 +06:00
aea631824f
[refs #230 ] remove debug messages
2012-03-01 00:39:12 +06:00
3a10ed91b2
[refs #194 ] more uniq
2012-03-01 00:33:01 +06:00
5b25ea221b
[refs #195 ] Add default value to is_rpm field for projects
2012-02-29 22:27:57 +04:00
fe0eba8e61
[refs #194 ] fix index page
2012-03-01 00:23:19 +06:00
d9ca8ff8b6
Merge pull request #231 from warpc/195-new_design_for_projects
...
[Refs #195 ] new design for projects
2012-02-29 09:54:42 -08:00
c3d7221f97
[issue #195 ] Fixed bugs
...
* Highlighting in submenu
* File history
2012-02-29 21:53:14 +04:00
bc75b318ce
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-29 21:37:28 +04:00
3415c6eb9f
Merge branch '3.2-master' into 230-registration_page
2012-02-29 23:25:24 +06:00
6e8b48188e
Merge pull request #229 from warpc/228-sign_in
...
[Refs #228 ] sign in
2012-02-29 09:22:42 -08:00
12d8f5e7b8
[refs #232 ] Add new design to some group pages
2012-02-29 21:12:06 +04:00
ba4fae071f
[refs #230 ] error messages
2012-02-29 23:01:30 +06:00
3136159777
[refs #230 ] add red borders to invalid attributes
2012-02-29 22:59:09 +06:00
f4954557b3
[refs #228 ] fix showing error
2012-02-29 22:59:08 +06:00
ee84ac84cf
[refs #228 ] fix I18n
2012-02-29 22:59:08 +06:00
71d9079003
[refs #228 ] fix registration link
2012-02-29 22:59:08 +06:00
a1bfe66791
[refs #228 ] sign_in page
2012-02-29 22:59:08 +06:00
5b9d20154b
[issue #195 ] Added translations and maybe missed partials
2012-02-29 20:27:32 +04:00
05eac4918f
Fix NoMethodError: undefined method `default_order' for ActiveRecord::Relation
2012-02-29 19:10:01 +04:00
662ea4018c
[issue #195 ] Changed commit header on commit page.
2012-02-29 19:08:21 +04:00
19dd58800b
[issue #195 ] Added comments to commit.
2012-02-29 19:05:36 +04:00
c5d8041296
[refs #195 ] Add global fixes to projects and collaborators logic
2012-02-29 18:45:04 +04:00
cefaa902b1
Apply new design for projects build monitoring page. Improve and refactor filters. Improve abilities. Switch off old statuses. Separate build_lists translations. Refactor and remove duplicate translations. Refactor and code cleanup. Fix specs. Apply layout class helper. Refs #223
2012-02-29 16:04:38 +02:00
b20c533e6b
[Refs #221 ] Fix xml-rpc call
2012-02-29 16:00:02 +04:00
2e16d3c4ee
Merge pull request #237 from warpc/221-delete_product_build_list
...
[Refs #221 ] delete product build list
2012-02-29 03:25:25 -08:00
Alexander Machehin
Vladimir Sharshov
konstantin.grabar
Pavel Chipiga
George Vinogradov
konstantin.grabar
George Vinogradov