Commit Graph

2225 Commits

Author SHA1 Message Date
Vladimir Sharshov 116dbb4ad7 Merge pull request #335 from warpc/194-tracker
[Refs #194] change styles at issues list
2012-03-23 06:51:44 -07:00
Alexander Machehin eb0545221c [refs #194] change styles at issues list 2012-03-23 19:31:51 +06:00
Vladimir Sharshov da5863ba0f Merge pull request #334 from warpc/270-user_control
[Refs 270] Customize users admin menu
* moved Add button to sidebar;
* added translate to search label;
* changed translation to Admin.
2012-03-23 06:06:00 -07:00
Pavel Chipiga 861da824d0 Redirect to project build lists after build list creation. Add more columns for product build lists. Refs #223 2012-03-23 13:58:20 +02:00
konstantin.grabar 1680b949f5 [refs #263] Fix personal repositories and CanCan platform tests 2012-03-23 15:29:25 +04:00
Alexander Machehin b08b1f7528 [refs #270] changed translation to Admin 2012-03-23 17:11:15 +06:00
Alexander Machehin 009f10acf5 [refs #270] added translate to search label 2012-03-23 16:51:18 +06:00
Alexander Machehin 8299ebc338 [refs #270] moved Add button to sidebar 2012-03-23 16:46:58 +06:00
konstantin.grabar 672cdffcf5 [refs #325] Fix image routes. Add serach bar. 2012-03-23 13:16:30 +04:00
Pavel Chipiga 7f31246463 Tune project specific build_lists page filters. Cleanup. Refs #223 2012-03-22 22:58:02 +02:00
Pavel Chipiga 9cbc30cdde Add more tips 2012-03-22 21:48:27 +02:00
Vladimir Sharshov df32afbda6 [Refs #265] change text for load_messages link 2012-03-22 22:35:01 +04:00
Pavel Chipiga 4553affa56 Add missing magic_encodings. Fix blame commit select, hide blank blame. Fix git repo hooks - redo branch parse to support non-ascii branches. Refs #190, #134 2012-03-22 19:11:12 +02:00
Vladimir Sharshov f54ec81734 Merge pull request #333 from warpc/195-new_design_for_projects
[issue #195] Fixed <Tab> in edit blobs.
2012-03-22 09:38:27 -07:00
Vladimir Sharshov 75ae7f2189 [Refs #263] Update css for new version 2012-03-22 20:33:43 +04:00
George Vinogradov d3184b846b [issue #195] Fixed <Tab> in edit blobs. 2012-03-22 20:16:07 +04:00
konstantin.grabar 0010cee0aa [refs #263] Issues tests fix 2012-03-22 19:56:10 +04:00
konstantin.grabar 16c9e6aa24 [refs #263] Fix most of the failed tests 2012-03-22 19:48:28 +04:00
Vladimir Sharshov 09a3d46303 Merge pull request #321 from warpc/270-user_control
[Refs #270] Admin user control (include ban, protect from mass assigment)
2012-03-22 08:41:07 -07:00
Alexander Machehin 071c391a6e Merge branch '3.2-master' into 270-user_control
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-03-22 21:15:10 +06:00
Vladimir Sharshov a85ce1d1f7 Merge pull request #332 from warpc/195-new_design_for_projects
[Refs #195] new design for projects (support group as collaborators)
2012-03-22 08:08:26 -07:00
Vladimir Sharshov ad39598823 Merge pull request #328 from warpc/325-new_error_pages_design
[refs #325] Add new design for error pages
2012-03-22 08:06:28 -07:00
George Vinogradov efd46249ed [issue #195] Fixed merge artefact 2012-03-22 18:53:06 +04:00
Alexander Machehin 23eeb1cae7 [refs #270] changes in ban 2012-03-22 20:50:15 +06: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 524fa2302f [issue #279] Changed buttons alignment. 2012-03-22 17:53:35 +04:00
konstantin.grabar 385bd8034b [refs #263] Fix projects#index 2012-03-22 17:30:01 +04:00
konstantin.grabar f354c53709 [refs #263] Merge 3.2-master into 263-refactoring 2012-03-22 17:28:09 +04:00
konstantin.grabar 8f9824f176 [refs #325] Fix error pages titles 2012-03-22 17:18:40 +04:00
konstantin.grabar c6eb68e903 [refs #325] Fixes descripton styles for project page into main css 2012-03-22 16:31:39 +04:00
konstantin.grabar 9cee7d97db [refs #325] Remove unnessecary scripts including form error pages 2012-03-22 16:17:46 +04:00
konstantin.grabar b7defd90f1 [refs #263] Remove unnessacesary projecsts#show action and test for it 2012-03-22 16:16:11 +04:00
Alexander Machehin fcc1fad0d1 [refs #270] fixed translations 2012-03-22 18:00:34 +06:00
Alexander Machehin 787eed92a3 [refs #270] removed ssh_key 2012-03-22 17:47:56 +06:00
Vladimir Sharshov 57520c6098 Merge pull request #330 from warpc/265-activity_feed_messages
[Refs #265, #263]  fixed tests to issue comments
2012-03-22 04:47:55 -07:00
Alexander Machehin 71f1822fce [refs #270] some refactoring 2012-03-22 17:17:11 +06:00
Vladimir Sharshov bfbd57d788 Merge pull request #329 from warpc/194-tests
[refs #194] fixed mailer tests
2012-03-22 04:03:33 -07:00
Alexander Machehin 9d6960fab8 [refs #265] some changes 2012-03-22 16:19:21 +06:00
Alexander Machehin 6d330d9164 [refs #265] fixed tests to issue comments 2012-03-22 16:16:31 +06:00
konstantin.grabar 5b1db0e041 [refs #263] Fix broken projects#show test and action 2012-03-22 14:13:56 +04:00
Alexander Machehin 600eeeb4d7 [refs #194] fixed mailer tests 2012-03-22 15:12:22 +06:00
Alexander Machehin b0eeb4f260 [refs #270] fix some errors 2012-03-22 14:48:33 +06:00
konstantin.grabar 21c33b384b [refs #325] Add new design to error pages 2012-03-22 11:16:56 +04:00
George Vinogradov 9e31ae75b1 [issue #195] Added groups support to project. 2012-03-22 04:44:05 +04:00
George Vinogradov 401e570dc7 [issue #195] Change projects/sidebar to be more standart. 2012-03-22 04:42:56 +04:00
Vladimir Sharshov 74575c0ca1 Merge pull request #326 from warpc/190-encodings
[Refs #190]
- Minor gems update
- Prepare gemfile for jruby and rbi 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
2012-03-21 15:17:19 -07:00
Pavel Chipiga 2db7726d55 Merge branch '3.2-master' into 190-encodings
Conflicts:
	db/schema.rb
2012-03-22 00:13:18 +02:00
Vladimir Sharshov 2571a75a3f Merge pull request #327 from warpc/195-new_design_for_projects
[Refs #195] Fixed avatar in commits & comments
2012-03-21 15:08:29 -07:00
George Vinogradov 65e4e0f748 [issue #195] use avatar_url_by_email instead of gravatar_url 2012-03-22 02:06:33 +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