Commit Graph

1993 Commits

Author SHA1 Message Date
Pavel Chipiga cacd9eb301 Improve add_branch task. Fix projects list JSON generation. Refs #207, #279 2012-03-24 00:48:58 +02:00
Vladimir Sharshov 6a8b8fec3a [Refs #66] User builds more priority than mass rebuild with zero priority 2012-03-24 01:29:51 +04:00
Vladimir Sharshov 115c90f03b Merge pull request #331 from warpc/263-refactoring
[Refs #263] Fix broken tests
2012-03-23 13:49:20 -07:00
Pavel Chipiga 1fab6c642e Minor design fix for product build lists. Refs #223 2012-03-23 22:39:37 +02:00
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
Vladimir Sharshov 0a2561549b Merge pull request #339 from warpc/195-projects
[Refs #195] add lock/unlock icon, fixed edit button, changed translations
2012-03-23 12:26:30 -07:00
Alexander Machehin 863d2999c8 [refs #195] changed translations 2012-03-24 01:15:34 +06:00
Alexander Machehin c2617bf1dd [refs #195] fixed edit button 2012-03-24 01:13:52 +06:00
Alexander Machehin 35c466820e [refs #195] add lock/unlock icon 2012-03-23 23:36:37 +06:00
Vladimir Sharshov 04710590f3 Merge pull request #338 from warpc/193-wiki
[Refs #193] Remove unused styles
2012-03-23 09:40:09 -07:00
Alexander Machehin 6c3edf77db [refs #193] removed second border from footer 2012-03-23 22:30:48 +06:00
Alexander Machehin 833716e200 [refs #193] smaller last edit text 2012-03-23 22:21:05 +06:00
Vladimir Sharshov f085367659 Merge pull request #337 from warpc/193-wiki
[Refs #193] Restyle wiki
2012-03-23 08:59:17 -07:00
Alexander Machehin 6864f22b35 [refs #193] remove button style from delete page link 2012-03-23 21:56:21 +06:00
Alexander Machehin 86bd036418 [refs #193] changes in wiki 2012-03-23 21:36:47 +06:00
Vladimir Sharshov 9ee90ae7a6 Merge pull request #336 from warpc/325-new_error_pages_design
[refs #325] Fix image routes. Add serach bar.
2012-03-23 07:09:00 -07:00
Vladimir Sharshov ef5c4a1b7b Merge branch '325-new_error_pages_design' of github.com:warpc/rosa-build into 325-new_error_pages_design
Conflicts:
	public/404.html
	public/500.html
2012-03-23 18:07:55 +04:00
Vladimir Sharshov 8a3592e211 [Refs #325] Fix alt text for pages 2012-03-23 18:05:44 +04:00
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