Commit Graph

461 Commits

Author SHA1 Message Date
Alexander Machehin fcffff4178 Merge branch 'master' into 90-pull
Conflicts:
	app/assets/stylesheets/design/custom.scss
	config/locales/title.en.yml
	config/locales/title.ru.yml
	config/routes.rb
	db/schema.rb
2012-05-17 22:58:29 +06:00
Vladimir Sharshov 2892689807 Merge pull request #469 from warpc/443-tour
[refs #466] Add localization for system tour. Fix for auto detecting users language.
2012-05-16 05:19:59 -07:00
Alexander Machehin 2651f0dc52 [refs #443] localize top image 2012-05-16 17:10:22 +06:00
Alexander Machehin 05746ea449 [refs #466] add i18n 2012-05-15 21:35:48 +06:00
Vladimir Sharshov 64d5600e6f Merge pull request #447 from warpc/443-tour
[refs #443] Tour about the system
2012-05-12 10:11:16 -07:00
Alexander Machehin 7a011606a5 [refs #443] add pirobox popup 2012-05-12 19:17:07 +06:00
Alexander Machehin 0e5b2ba25d [refs #443] compact styles 2012-05-12 15:54:24 +06:00
George Vinogradov cada9f6e51 [issue #443] Changed tour routes. Fixed submenu position. 2012-05-12 01:05:48 +04:00
George Vinogradov 218904675d [issue #443] Fixed styles. Removed whitespace between content and
footer.
2012-05-12 00:24:40 +04:00
Alexander Machehin 5f5eb00c4f [refs #443] abf tour 2012-05-12 00:15:20 +06:00
konstantin.grabar 60fdf9e998 [refs #396] Add atom feed icon 2012-05-11 19:44:19 +04:00
Pavel Chipiga 52f5e01575 Fix build list controller bugs. Fix JS which controls checkboxes. Fix translations. Fix and refactor views. Refs #428 2012-05-06 00:43:04 +03:00
George Vinogradov 05ef799fa4 [issue #428] Added advisories list. Added translations. 2012-05-05 21:18:29 +04:00
Alexander Machehin 36b4ce2d99 Merge branch 'master' into 90-pull
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/projects/issues_controller.rb
	app/models/project.rb
	config/locales/menu.en.yml
	config/routes.rb
	db/schema.rb
2012-05-03 23:19:43 +06:00
Pavel Chipiga 72e3eaf1a1 Minor design fix. Refs #263 2012-05-03 18:56:33 +03:00
Pavel Chipiga abb60a503a Minor design fix. Refactor register requests. Refactor case insensitive search. Other minor fixes and code cleanup. Refacor and improve owner constraint. Refs #263 2012-05-03 17:08:02 +03:00
Alexander Machehin 9e5db741d3 Merge branch 'master' into 90-pull
Conflicts:
	app/models/project.rb
	db/schema.rb
2012-05-02 23:08:24 +06:00
Pasha 0c8f8e14a6 Merge pull request #419 from warpc/347-javascript_refactoring
[issue #347] Fixed artefacts in Add Collaborators form.
2012-04-23 12:21:00 -07:00
Alexander Machehin a8ccf454ee [refs #90] first steps of pull rendering 2012-04-23 23:34:11 +06:00
Alexander Machehin 628fed40ea [refs #90] issue status -> state 2012-04-23 23:34:11 +06:00
konstantin.grabar 89bfa8d0a9 [refs #415] Fix radio button click handler 2012-04-23 13:50:42 +04:00
George Vinogradov af18f4404f [issue #347] Fixed artefacts in Add Collaborators form. 2012-04-22 13:17:33 +04:00
George Vinogradov 678f7cc0ed [issue #347] Changed search field. 2012-04-20 00:35:31 +04:00
George Vinogradov 510b0c0c50 [issue #347] Merge branch 'master' into 347-javascript_refactoring
Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/models/group.rb
	app/models/user.rb
2012-04-19 19:32:11 +04:00
George Vinogradov f9d2baef5a [issue #347] Added filter. 2012-04-19 19:27:16 +04:00
George Vinogradov 618d1ecb49 [issue #408] Fixed bug with selectbox 2012-04-18 21:31:11 +04:00
George Vinogradov 9566855110 [issue #347] Added missed lib 2012-04-18 16:17:11 +04:00
George Vinogradov 9d96b2b565 [issue #408] Removed comment. 2012-04-18 14:46:34 +04:00
George Vinogradov 6c64125787 [issue #408] Changed behavior of build list for released platform 2012-04-17 22:18:39 +04:00
George Vinogradov 8204196275 [issue #347] Removed comments. Added filter field to collaborators
table.
2012-04-17 17:39:14 +04:00
Alexander Machehin f31b243ae9 [refs #385] zip image 2012-04-17 18:06:04 +06:00
George Vinogradov 871c8ed1f4 [issue #347] Fixed bugs. Some changes. 2012-04-16 23:22:08 +04:00
Vladimir Sharshov c339f2aee0 Merge pull request #403 from warpc/223-change_build_lists_new_js_handlers
[refs #223] Add platform branch auto select if this branch exist
2012-04-16 10:00:53 -07:00
konstantin.grabar d24422f757 [refs #223] Add branch auto select 2012-04-16 20:06:34 +04:00
Alexander Machehin 2dedbd92d0 [refs #194] assignee & user 2012-04-14 01:44:04 +06:00
Alexander Machehin 5cfadcd723 [refs #385] add dropdown menu to choose archive format 2012-04-13 17:24:24 +06:00
George Vinogradov a68d4a2926 [issue #347] Many changes.
Changes includes:

    *  Changed Collaborator model;
    *  Autocomplete now works through backbone;
    *  Changed autocomplete styles;
    *  Groups have their own avatar;
    *  Changed previous backbone scripts;
2012-04-13 02:01:24 +04:00
Alexander Machehin 770030e180 [refs #385] zip archive 2012-04-12 00:29:08 +06:00
konstantin.grabar 18bda07369 Merge master into 223-change_build_lists_new_js_handlers 2012-04-10 18:00:48 +04:00
konstantin.grabar f7e09c993d [refs #223] Optimise code by jQuery chains 2012-04-10 17:15:48 +04:00
konstantin.grabar d6dc51ba93 [refs #223] Choosen rep auto set 2012-04-10 13:05:42 +04:00
Vladimir Sharshov 6d4f94e2c4 Merge pull request #389 from warpc/353-fork
[Refs #353] can fork project to group
2012-04-09 12:46:15 -07:00
Alexander Machehin e349a69883 [refs #353] can fork project to group 2012-04-09 23:56:03 +06:00
George Vinogradov 71c8efabf9 [issue #347] Added backbone. Changed collaborators page. 2012-04-09 21:11:39 +04:00
konstantin.grabar 6ccf7e8456 [refs #223] Change js handlers and some inputs logics 2012-04-09 18:33:51 +04:00
Alexander Machehin 96b3c831b7 [refs #358] br -> p 2012-04-06 02:21:19 +06:00
konstantin.grabar 39dd53ff9b [refs #358] Add git clone repo help hint 2012-04-05 11:26:03 +04:00
George Vinogradov 1e8021fe35 [issue #369] Added TOS page. 2012-03-31 17:18:22 +04:00
Pavel Chipiga 36b2eaa784 Fix root page search field design. Allow aninymous search only projects. Fix activity_feeds routes. Show anonymous project build lists. Remove unused specs. Refs #349 2012-03-31 03:43:55 +03:00
Pavel Chipiga d6e6959f46 Write basic robots.txt. Apply configurable anonymous access, hide some functionality from guests. Apply basic design for main page. Autoconfirm manually created users. Code refactor and cleanup. Remove unused code, routes, containers, rpms, personal_repositories. Redo product_build_lists monitoring and filtering. Fix add_project to repo bug. Add links to bottom menu. Switch off deploy assets sppedup. Refs #349, #263 2012-03-31 02:37:54 +03:00
George Vinogradov 78943fdc04 [issue #195] Added legend for projects table. Added titles. 2012-03-30 18:51:57 +04:00
George Vinogradov c03ae5015e [issue #195] Fixed leave button. Added participant icons. 2012-03-29 20:27:33 +04:00
George Vinogradov baf35da99c [issue #195] Merge branch 'master' into 195-new_design_for_projects
Conflicts:
	app/controllers/projects_controller.rb
2012-03-27 21:23:09 +04:00
George Vinogradov 9bb1d80172 [issue #195] Added AJAX to /projects list. 2012-03-27 19:50:00 +04:00
George Vinogradov a3aaf4f7ce [issue #195] Fixed bug with line numbers in blob show. 2012-03-27 14:12:26 +04:00
George Vinogradov dd8e3b0497 [issue #195] Added JQuery datatables to /projects 2012-03-25 01:36:56 +04: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 86bd036418 [refs #193] changes in wiki 2012-03-23 21:36:47 +06:00
Alexander Machehin eb0545221c [refs #194] change styles at issues list 2012-03-23 19:31:51 +06:00
Vladimir Sharshov 75ae7f2189 [Refs #263] Update css for new version 2012-03-22 20:33:43 +04: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
George Vinogradov 524fa2302f [issue #279] Changed buttons alignment. 2012-03-22 17:53:35 +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 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
Vladimir Sharshov 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
konstantin.grabar 5abf64e353 [refs #200] Fix chbx behaviour for repos and their platforms 2012-03-21 19:04:01 +04:00
Alexander Machehin 3c7dec3b97 Merge branch '3.2-master' into 270-user_control 2012-03-21 19:39:55 +06:00
Vladimir Sharshov 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
konstantin.grabar f9850c6885 [refs #200] Fix checkbox checking on build list form 2012-03-21 15:34:11 +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
Alexander Machehin 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
Vladimir Sharshov d2da4fc0ba [Refs #263] Fix css 2012-03-21 02:53:56 +04:00
Vladimir Sharshov ba140c67f9 [Refs #263] Align the menu, change colors for text and background 2012-03-21 02:47:51 +04:00
Alexander Machehin 20ff998f08 [refs #270] user control 2012-03-21 00:12:18 +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 31e0c9191c [refs #200] Fix build list form interface and include_repos logic 2012-03-20 14:36:31 +04:00
konstantin.grabar f0645be9c5 [refs #200] Change build list repos and platforms interface 2012-03-19 23:52:46 +04:00
George Vinogradov 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
George Vinogradov 1cbc3f5b7a [issue #279] Added block of connection data for personal platform. 2012-03-19 18:46:12 +04:00
Alexander Machehin 0c1d57cd8c [refs #279] can resize textarea in product edit page 2012-03-19 18:16:12 +06:00
konstantin.grabar 348fd40daf [refs #223] Fix build status color helpers 2012-03-19 12:39:46 +04:00
konstantin.grabar b3d7091db0 Merge 3.2-master into 223-monitoring_design 2012-03-19 10:41:30 +04:00
konstantin.grabar 4b26eebeca [refs #223] Add new design to build list task page 2012-03-18 12:20:31 +04:00
Vladimir Sharshov 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
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
Vladimir Sharshov 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
Vladimir Sharshov 7bab315b96 [Refs #279] Fix url and submit button size 2012-03-15 18:02:10 +04:00
George Vinogradov 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
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
George Vinogradov 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
George Vinogradov 952c9e46ea [issue #279] Added datatables pagination extension 2012-03-13 18:36:42 +04:00
Vladimir Sharshov b07d81644a [Refs #223] Monitoring colors code in index page 2012-03-13 15:04:29 +04:00
Vladimir Sharshov 19bcdf94d9 [Refs #195] More space for project url 2012-03-12 18:31:25 +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
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
Vladimir Sharshov 11434ff423 [Refs #285] Fix css style, rename button 2012-03-11 20:38:28 +04:00
Vladimir Sharshov e2b3eb7b7f [Refs #285] Fix current_user avatar for all user, replace button Edit 2012-03-11 20:02:07 +04: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 8df4fdfa5c [refs #194] remove labels search from js 2012-03-07 22:26:43 +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
Alexander Machehin c657efc338 [refs #194] show all project labels without searching 2012-03-07 19:36:17 +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
Alexander Machehin 82d26b08b9 [refs #223] fix selector 2012-03-07 16:27:29 +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 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
Alexander Machehin 1791160b09 [refs #194] fix manage issue executor 2012-03-06 22:31:07 +06:00
konstantin.grabar 9565d58e8f [refs #257] Merge 3.2-master into 257-new_design_for_profiles 2012-03-06 20:13:53 +04: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
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
konstantin.grabar de6490346b [refs #257] Change error messages logic. Fix avatar ru translation 2012-03-06 15:24:42 +04:00
Alexander Machehin 9e6d06f1c9 [refs #194] manage issue executer 2012-03-06 00:28:55 +06: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
George Vinogradov 93e2caccc8 [issue #195] Added blame view. 2012-03-05 19:29:05 +04:00
Alexander Machehin dab45f9afe [refs #228] fix checking remember me button 2012-03-05 16:49:31 +06:00
konstantin.grabar 73296059eb [refs #257] Merge 3.2-master into 257-new_design_for_profiles 2012-03-05 13:42:39 +04:00
konstantin.grabar f58e24b134 [refs #257] User edit pages fixes 2012-03-03 20:03:23 +04:00
Pavel Chipiga a0f0c24f88 Fix flash messages. Add styles. Refs #263 2012-03-03 03:05:19 +02:00
Pavel Chipiga 13f0d8223d Remove compass-bootstrap. Take back DJ fix. Refs #263 2012-03-03 02:42:10 +02:00
Pavel Chipiga 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
Vladimir Sharshov 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
Alexander Machehin dfa361f5c3 [refs #194] fix triggering change event for niceRadio buttons 2012-03-02 23:45:20 +06:00
George Vinogradov 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
George Vinogradov 7b37846a54 [issue #195] Fixed line numbering with files contains <> 2012-03-02 19:50:17 +04:00
Alexander Machehin 50fc094bce [refs #228] fuuuuu... 2012-03-02 21:32:00 +06:00
Alexander Machehin 7164dd580e [refs #230] fix error messages + some refactoring 2012-03-02 18:27:38 +06:00
George Vinogradov 6cfb5d0c3d [issue #195] Fixed bug with encodings. Added avatar. Stubbed blame. 2012-03-02 04:39:43 +04:00
Pavel Chipiga 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
George Vinogradov 900c1fe2f5 [issue #195] Fixes.
*  Fixed translations
  *  Fixed blob display
  *  Fixed routes
2012-03-02 02:07:04 +02:00
Pavel Chipiga accf38a088 Fix build_list display width. Refs #223 2012-03-02 02:04:07 +02:00
Alexander Machehin cea7bc79bb [refs #194] fix notification line style 2012-03-02 02:04:06 +02:00
Alexander Machehin d7dbe79357 [refs #230] edit password page 2012-03-02 02:04:06 +02:00
Pavel Chipiga 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
Pavel Chipiga 84a7a9fe2d Fix build_list display width. Refs #223 2012-03-02 01:37:05 +02:00
George Vinogradov 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
George Vinogradov 43c10ee812 [issue #195] Fixed long comments displaying. 2012-03-02 00:33:48 +04:00
Vladimir Sharshov 9e11a20f71 Merge pull request #249 from warpc/230-registration_page
[refs #230] Edit password page
2012-03-01 11:43:53 -08:00
Alexander Machehin 2f0981c12f [refs #194] fix notification line style 2012-03-02 01:33:22 +06:00
Alexander Machehin 4931dc773b [refs #230] edit password page 2012-03-02 01:16:49 +06:00
George Vinogradov 4b024d1728 [issue #195] Fixes.
*  Fixed translations
  *  Fixed blob display
  *  Fixed routes
2012-03-01 21:37:24 +04:00
Pavel Chipiga 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
George Vinogradov 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
George Vinogradov fe5ad9ebf3 [issue #195] Added missed js. Some changes. 2012-03-01 05:07:31 +04:00
George Vinogradov dedd64f976 [issue #195] Returned lost files. 2012-03-01 03:29:16 +04:00
Alexander Machehin cadd1995d1 [refs #230] fix forgot password SignUp style 2012-03-01 01:50:08 +06:00
Alexander Machehin 3a10ed91b2 [refs #194] more uniq 2012-03-01 00:33:01 +06:00
Alexander Machehin fe0eba8e61 [refs #194] fix index page 2012-03-01 00:23:19 +06:00
Vladimir Sharshov 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
konstantin.grabar bc75b318ce [refs #195] Merge 3.2-master into 195-new_design_for_projects 2012-02-29 21:37:28 +04:00
Alexander Machehin 3415c6eb9f Merge branch '3.2-master' into 230-registration_page 2012-02-29 23:25:24 +06:00
Vladimir Sharshov 6e8b48188e Merge pull request #229 from warpc/228-sign_in
[Refs #228] sign in
2012-02-29 09:22:42 -08:00
Alexander Machehin ba4fae071f [refs #230] error messages 2012-02-29 23:01:30 +06:00
Alexander Machehin 3136159777 [refs #230] add red borders to invalid attributes 2012-02-29 22:59:09 +06:00
Alexander Machehin ee84ac84cf [refs #228] fix I18n 2012-02-29 22:59:08 +06:00
Alexander Machehin 71d9079003 [refs #228] fix registration link 2012-02-29 22:59:08 +06:00
Alexander Machehin a1bfe66791 [refs #228] sign_in page 2012-02-29 22:59:08 +06:00
George Vinogradov 5b9d20154b [issue #195] Added translations and maybe missed partials 2012-02-29 20:27:32 +04:00
George Vinogradov 19dd58800b [issue #195] Added comments to commit. 2012-02-29 19:05:36 +04:00
konstantin.grabar c5d8041296 [refs #195] Add global fixes to projects and collaborators logic 2012-02-29 18:45:04 +04:00
Pavel Chipiga 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
Alexander Machehin 89a5cf56b2 [refs #228] fix submit button style 2012-02-29 15:23:59 +06:00
Alexander Machehin c9067da374 [refs #233] fix users menu toggle 2012-02-29 12:40:21 +06:00
Alexander Machehin 8126b49567 [refs #228] fix I18n 2012-02-29 11:43:40 +06:00
Alexander Machehin c55d6d097e [refs #228] fix registration link 2012-02-29 10:41:25 +06:00
George Vinogradov fe46e53ad8 [issue #195] Many changes.
*  Base presenter moved to lib
  *  Added diff display
  *  Changes in some views

TODO Add translations.
TODO Change commit page layout.
TODO Change representation of commit on commit page.
TODO Fix bug with tree/branch select.
2012-02-29 06:02:07 +04:00
Alexander Machehin 91eb306560 [refs #228] sign_in page 2012-02-29 02:43:17 +06:00
konstantin.grabar fa69cd8ee4 [refs #195] Fix radio and checkboxes script. Fix project edit and new form 2012-02-28 23:11:08 +04:00
Alexander Machehin e83e19ea50 [refs #194] remove duplicates 2012-02-28 22:36:29 +06:00
Alexander Machehin c4719f12da [refs #194] some change in the issue managing 2012-02-28 22:33:38 +06:00
Alexander Machehin 895b095058 Merge branch '3.2-master' into 194-tracker
Conflicts:
	app/assets/stylesheets/custom.scss
	app/assets/stylesheets/main.scss
2012-02-28 22:31:00 +06:00
konstantin.grabar e9ae923b60 [refs #195] Merge 3.2-master into 195-new_design_for_projects 2012-02-28 20:10:31 +04:00
Alexander Machehin 99e3bbb762 [refs #194] update issue content 2012-02-28 21:41:47 +06:00
Pavel Chipiga 07b081cc0d Fresh up assets. Force production SSL. Refs #223 2012-02-28 17:40:22 +02:00
Alexander Machehin f9c834cf4d Revert "[refs #194] return main.scss"
This reverts commit 0b8461a5df9f3d9bbca6e3b377164ff4aa4ac4e6.
2012-02-28 20:56:43 +06:00
Alexander Machehin 5abdbd4486 [refs #194] return main.scss 2012-02-28 20:37:30 +06:00
konstantin.grabar 39b0beb3ab [refs #193] Fix wrap gollum and wiki page styles 2012-02-28 18:36:04 +04:00
Alexander Machehin bc4a157703 Merge branch '3.2-master' into 194-tracker
Conflicts:
	app/assets/stylesheets/application.scss
	app/views/issues/_form.html.haml
	app/views/platforms/show.html.haml
2012-02-28 20:13:08 +06:00
Alexander Machehin 0d75a37451 [refs #194] show page beta version 2012-02-28 20:05:18 +06:00
Alexander Machehin 66a08662c2 [refs #194] new styles; some changes 2012-02-28 15:23:27 +06:00
Pavel Chipiga 7508bb1339 Fix bugs to force new design work. Minor refactor and improvements. Refs #193 2012-02-27 20:58:37 +02:00
Alexander Machehin 2c0e1b6314 Merge branch '3.2-master' into 194-tracker
Conflicts:
	app/assets/stylesheets/custom.scss
2012-02-27 23:55:18 +06:00
George Vinogradov 582063d066 [issue #195] Commits history, editing, showing... 2012-02-27 21:40:46 +04:00
Alexander Machehin 27c85d32df [refs #194] create page; index pagination; some bugs 2012-02-27 22:10:12 +06:00
Pavel Chipiga 4d2459c60c Refactor, fix and cleanup wiki templates and translations. Refs #193 2012-02-24 23:39:40 +02:00
George Vinogradov 3c83649627 [issue #96] Some fixes in layout and scripts. 2012-02-24 23:39:40 +02:00
Alexander Machehin a6a51225b8 [refs #194] some js refactoring 2012-02-23 22:16:04 +06:00
Alexander Machehin 9e5e7cd5e4 [refs #194] labels manage 2012-02-23 20:48:46 +06:00
George Vinogradov 43b7ccd3dc [issue #195] Added blob show. Some changes. 2012-02-23 02:11:55 +04:00
konstantin.grabar 3a48f8dea9 [refs #193] Add lost file with wiki_history checkboxes script 2012-02-21 20:11:16 +04:00
George Vinogradov 328cd17f46 [issue #195] Fixed bug in CommitPresenter 2012-02-21 19:51:48 +04:00
George Vinogradov 85f3d956f5 [issue #195] Merge branch '203-feed_message' into 195-new_design_for_projects
Conflicts:
	app/views/layouts/application.html.haml
2012-02-21 19:42:30 +04:00
Alexander Machehin 5dcc4eabf8 [refs #194] tracker without tags manage 2012-02-20 22:54:45 +06:00
George Vinogradov edc8774387 [issue #203] Some layout changes & presenters.
*  Fixed bugs in layout
  *  Fixed typos
  *  Fixed bugs in JS
  *  Added universal partial _feed_message.html.haml
  *  Added presenters
  *  Added CommitAsMessage presenter, that prepares Grit::Commit
     to be shown as message.
2012-02-19 02:47:57 +04:00
George Vinogradov 608faf3564 [issue #96] Some fixes in layout and scripts. 2012-02-17 03:07:22 +04:00
Pavel Chipiga b7b69a86d8 Minor gems update. Sync with newest styles, javascripts, images. Refactor assets. Merge and fix wiki assets, temporary disable buggy ones. Change subscribeable_id type from string to decimal to avoid bugs. Auto convert commit subscribe subscribeable_id from hex to decimal. Refactor commentable. Fix bugs and some specs. Refactor application.yml. Refs #96 2012-02-14 18:05:41 +02:00
Pavel Chipiga 7d74b0af13 Merge branch 'master' into 96-upgrade_rails
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/group.rb
	app/views/layouts/application.html.haml
	db/schema.rb
	public/stylesheets/git/style.css
2012-02-14 02:14:03 +02:00
Pavel Chipiga 7223b7deb9 Upgrade rails, devise, delayed_jobs and other gems. Fix dependencies. Apply assets pipeline, add to deploy. Refactor and cleanup Gemfile. Fix after upgrade bugs. Redo commentable_id from string to decimal. Refactor and code cleanup. Apply basic new design. Refactor main template. Automate menus. Improve translations. Refs #96 2012-02-09 01:46:25 +02:00