Commit Graph

1742 Commits

Author SHA1 Message Date
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
Alexander Machehin 872132d8a6 [refs #265] fix find owner and project 2012-03-07 00:20:14 +06:00
Alexander Machehin 8ae7ebee2b Merge branch '3.2-master' into 194-issue_page 2012-03-06 22:51:13 +06:00
Alexander Machehin 1791160b09 [refs #194] fix manage issue executor 2012-03-06 22:31:07 +06:00
Vladimir Sharshov 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
konstantin.grabar 9565d58e8f [refs #257] Merge 3.2-master into 257-new_design_for_profiles 2012-03-06 20:13:53 +04:00
Vladimir Sharshov 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
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
konstantin.grabar 7e53a6c511 [refs #265] Fix git push and delete branch partials and logic 2012-03-06 18:57:05 +04:00
konstantin.grabar f54d889f74 [refs #265] Fix activity partials messages and locales. Fix observer. 2012-03-06 18:04:05 +04:00
George Vinogradov 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
George Vinogradov 2b1b5504cd [issue #193] Added fullname to history table. 2012-03-06 17:20:30 +04:00
George Vinogradov cd57da0946 [issue #193] Fixed searchbar in wiki. 2012-03-06 17:08:19 +04:00
Alexander Machehin af69c02a6d [refs #194] render user name 2012-03-06 18:29:42 +06:00
konstantin.grabar de6490346b [refs #257] Change error messages logic. Fix avatar ru translation 2012-03-06 15:24:42 +04:00
Alexander Machehin 4f995ca548 [refs #265] hook mode 775 -> 755 2012-03-06 15:39:23 +06:00
Alexander Machehin de0f7c83c8 [refs #265] fix hook and add execute bit for it 2012-03-06 15:07:14 +06:00
Alexander Machehin 9e6d06f1c9 [refs #194] manage issue executer 2012-03-06 00:28:55 +06:00
Alexander Machehin 325497d040 Merge branch '3.2-master' into 194-issue_page 2012-03-06 00:11:32 +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
konstantin.grabar 9558a1d65f [refs #265] Fix wiki history link 2012-03-05 20:36:58 +04:00
George Vinogradov 8845ec17ff [issue #195] Added translations. 2012-03-05 20:31:09 +04:00
Vladimir Sharshov 91ba8b1543 [Refs #257] Fix password change, refactoring. 2012-03-05 19:36:23 +04:00
George Vinogradov 93e2caccc8 [issue #195] Added blame view. 2012-03-05 19:29:05 +04:00
George Vinogradov 5290f0c712 [issue #195] Fixed syntax highlighting. Stub for rpm-specs 2012-03-05 19:27:16 +04:00