Commit Graph

560 Commits

Author SHA1 Message Date
Pavel Chipiga d44de9f2bb Redo projects list. Allow view projects through groups. Hide delete from project link from project owners. Refs #195 2012-03-23 22:37:17 +02:00
George Vinogradov 9f23cf7727 [issue #195] Merge branch '3.2-master' into 195-new_design_for_projects
Conflicts:
	app/views/projects/_sidebar.html.haml
2012-03-22 18:15:57 +04:00
George Vinogradov 9e31ae75b1 [issue #195] Added groups support to project. 2012-03-22 04:44:05 +04:00
Pavel Chipiga 90e027b8a6 Remove old project load. Fix project routes. Fix wiki history avatar load. Refs #190 2012-03-21 23:52:40 +02:00
Pavel Chipiga 89f31e9782 Minor gems update. Prepare gemfile for jruby and rbx tests. Remove encoding hacks. Apply grit fixes for encoding support. Recode incorrect encodings. Refactor, cleanup and fix lots bugs in git section. Refactor and remove unused git routes. Translate some untranslated parts. Redo branch/tags selector. Fix files tree last commit message. Project section templates refactor and cleanup. Refs #190 2012-03-21 21:55:14 +02:00
Vladimir Sharshov 87e1ee4700 Merge pull request #317 from warpc/232-groups_tests
[refs #232] Add groups tests and mass assignment protect
2012-03-21 12:06:00 -07:00
konstantin.grabar 72c02282aa [refs #232] Add mass-assignment fixes. Add create and mass-assig tests. 2012-03-21 17:52:35 +04:00
Vladimir Sharshov 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
Alexander Machehin b678320638 [refs #265] add ajax to older messages 2012-03-21 16:29:45 +06:00
Vladimir Sharshov 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
George Vinogradov 7c0585ee87 [issue #279] Added members and other changes. 2012-03-20 20:24:18 +04:00
Vladimir Sharshov 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
konstantin.grabar 981ea7d69f [refs #200] Remove debug code from build_lists controller 2012-03-20 17:01:18 +04:00
konstantin.grabar 31e0c9191c [refs #200] Fix build list form interface and include_repos logic 2012-03-20 14:36:31 +04:00
George Vinogradov d5d2b7229b [issue #279] Removed freeze & unfreeze actions from Platform 2012-03-19 19:03:09 +04:00
Alexander Machehin 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
Alexander Machehin dd5f51de71 [refs #265] added build tasks feed 2012-03-16 21:37:58 +06:00
George Vinogradov 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
Alexander Machehin 4addff059b [refs #265] added activity feed tabs 2012-03-15 23:52:54 +06:00
George Vinogradov 548550d355 [issue #279] Added filtering to repositories projects. 2012-03-15 17:53:36 +04:00
George Vinogradov 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
George Vinogradov 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
Alexander Machehin 3642163fd7 [refs #265] changed feed messages 2012-03-14 23:00:26 +06:00
Alexander Machehin 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
Alexander Machehin 24639b8684 [refs 257] renamed to profile 2012-03-12 21:03:25 +06:00
Alexander Machehin 5f6ca140d9 [refs #257] add ability to destroy avatar 2012-03-12 18:51:07 +06:00
Vladimir Sharshov 64926498d6 [Refs #195] Fix pagination for index projects page 2012-03-12 16:05:19 +04:00
George Vinogradov c2dc8d9e38 [issue #279] Added platform products list 2012-03-12 04:07:18 +04:00
George Vinogradov 61bd704cb1 [issue #279] Added platform repositories list. 2012-03-12 03:58:25 +04:00
George Vinogradov 535c075d3e [issue #279] Added platform main page, menu & sidebar 2012-03-12 03:08:50 +04:00
Pavel Chipiga 3e344f90ad Display only 10 last activities. Refs #265 2012-03-12 00:47:22 +02:00
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
Alexander Machehin c4fd73b52b [refs #265] fixed double wiki feed 2012-03-12 00:28:14 +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 66b57f7a0a [refs #265] fixed issue assignee 2012-03-11 17:56:56 +06:00
Pavel Chipiga 1cf2660cda Fix search order. Refs #255 2012-03-08 02:32:12 +02: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
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 c657efc338 [refs #194] show all project labels without searching 2012-03-07 19:36:17 +06: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
Alexander Machehin 0f823bd9f3 [refs #265] fix security & commit to comments 2012-03-07 02:51:51 +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
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
Alexander Machehin b9de81f4df [refs #194] managing labels in the issue 2012-03-06 21:21:13 +06:00