Commit Graph

632 Commits

Author SHA1 Message Date
Alexander Machehin b8b68e8ad2 [refs #194] add space between list and create form 2012-03-02 01:11:21 +06:00
Alexander Machehin ecc2e1f181 [refs #194] add comments to issues 2012-03-02 00:57:59 +06:00
Alexander Machehin 20417241a8 [refs 194] fix comments 2012-03-02 00:57:59 +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
konstantin.grabar eb689b7f18 [refs #232] Add new design and logic refactor for group members action 2012-03-01 19:41:40 +04:00
konstantin.grabar fc3d4c0b6d [refs #232] Add group members edit page design 2012-03-01 18:23:26 +04:00
George Vinogradov 6eb239385a [issue #195] Fixed bug with creating project 2012-03-01 17:37:35 +04:00
konstantin.grabar 71748ebddc [refs #232] Add design to group new page 2012-03-01 17:19:58 +04:00
konstantin.grabar f4a50b509c [refs #232] Add edit btn to group public page 2012-03-01 16:37:54 +04:00
konstantin.grabar 157f9a1a68 [refs #232] Add sidebar and group edit page 2012-03-01 16:28:38 +04:00
konstantin.grabar 55ff2c7f6b [refs #195] Change new project route and some other changes 2012-03-01 16:10:12 +04: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 bc96fcdcc3 [issue #195] Added missed translation. 2012-03-01 03:34:36 +04:00
George Vinogradov dedd64f976 [issue #195] Returned lost files. 2012-03-01 03:29:16 +04:00
Alexander Machehin bcef305228 [refs #230] change title style; remove unused js 2012-03-01 02:19:39 +06:00
Alexander Machehin cadd1995d1 [refs #230] fix forgot password SignUp style 2012-03-01 01:50:08 +06:00
Vladimir Sharshov d3231b5faa Merge pull request #243 from warpc/230-registration_page
[Refs #230] Fix I18n and remove wrong js for registration page
2012-02-29 11:23:35 -08:00
Vladimir Sharshov 4fd518ac86 Merge pull request #242 from warpc/195-new_design_for_projects
[Refs #195] 
* Add default value to is_rpm field for projects
* Show tab for wiki, tracker or build only if they activate
2012-02-29 11:04:19 -08:00
Alexander Machehin 5f71d430fc [refs #230] remove wrong js 2012-03-01 00:48:13 +06:00
Alexander Machehin aea631824f [refs #230] remove debug messages 2012-03-01 00:39:12 +06:00
Alexander Machehin 3a10ed91b2 [refs #194] more uniq 2012-03-01 00:33:01 +06:00
konstantin.grabar 5b25ea221b [refs #195] Add default value to is_rpm field for projects 2012-02-29 22:27:57 +04: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
George Vinogradov c3d7221f97 [issue #195] Fixed bugs
*  Highlighting in submenu
  *  File history
2012-02-29 21:53:14 +04:00
konstantin.grabar bc75b318ce [refs #195] Merge 3.2-master into 195-new_design_for_projects 2012-02-29 21:37:28 +04:00
konstantin.grabar 12d8f5e7b8 [refs #232] Add new design to some group pages 2012-02-29 21:12:06 +04: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 f4954557b3 [refs #228] fix showing error 2012-02-29 22:59:08 +06:00
Alexander Machehin ee84ac84cf [refs #228] fix I18n 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 2e16d3c4ee Merge pull request #237 from warpc/221-delete_product_build_list
[Refs #221] delete product build list
2012-02-29 03:25:25 -08:00
Vladimir Sharshov 062b5c71b1 [Refs #221] Fix right for platform local admin 2012-02-29 15:13:56 +04:00
Vladimir Sharshov 952082f7a0 [Fix #235] Remove wrong clone_platform_product_path url 2012-02-29 13:15:12 +04: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
konstantin.grabar b586c5ddf0 [refs #195] Add js hack for sections bigpadding div class 2012-02-29 01:17:04 +04:00
konstantin.grabar 2ec2548390 [refs #195] Add base design and functional to project members page 2012-02-29 01:01:25 +04:00
konstantin.grabar 577eadbc7c [refs #195] Fix project form submit tag 2012-02-29 00:12:37 +04: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 2cb085992b [refs #194] fix submenu for issues 2012-02-28 22:41:03 +06:00
Alexander Machehin c4719f12da [refs #194] some change in the issue managing 2012-02-28 22:33:38 +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
Vladimir Sharshov 529d8d3708 Merge pull request #192 from warpc/123-activity-feed
[Refs #123] activity feed (commits notifcation not work)
2012-02-28 07:46:55 -08:00
Alexander Machehin 99e3bbb762 [refs #194] update issue content 2012-02-28 21:41:47 +06:00
Alexander Machehin 0abea8ff55 [refs #194] fix issues count 2012-02-28 20:28:11 +06: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
konstantin.grabar 03663a8ed7 [refs #195] Add sections page and method to projects 2012-02-28 12:00:56 +04:00
Pavel Chipiga e004822bd3 Remove/replace old assets to avoid production bugs. Fix deploy settings. 2012-02-28 01:16:14 +02:00
Pavel Chipiga 70963d0943 Merge branch 'master' into 3.2-master 2012-02-27 22:34:21 +02:00
Pavel Chipiga 159ef26b38 Merge branch 'master' into 3.2-master
Conflicts:
	app/views/wiki/_compare.html.haml
	app/views/wiki/_diff_data.html.haml
	db/schema.rb
2012-02-27 22:32:57 +02:00
Vladimir Sharshov ddda2b92ab [Refs #221] Delete product build lists (only in web) 2012-02-28 00:00:33 +04: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 b6a52fb840 Merge branch '195-new_design_for_projects' of github.com:warpc/rosa-build into 195-new_design_for_projects 2012-02-27 21:47:05 +04:00
George Vinogradov 582063d066 [issue #195] Commits history, editing, showing... 2012-02-27 21:40:46 +04:00
Pavel Chipiga 1005fbd64f Add link to product container. Refs #217 2012-02-27 18:21:56 +02:00
Alexander Machehin 27c85d32df [refs #194] create page; index pagination; some bugs 2012-02-27 22:10:12 +06:00
Pavel Chipiga e1f7817624 Add local admin ability to build product. Fix template links. Refactor. Refs #217 2012-02-27 15:49:24 +02:00
konstantin.grabar 72fec3b314 [refs #195] Add owner choose on project create 2012-02-27 13:03:28 +04:00
Pavel Chipiga 1dd20377cf Fix layout. Refs #193 2012-02-24 23:54:44 +02: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 dde81b5554 [refs #123] fix activity feed for commit comments; remove reply notification 2012-02-25 00:25:35 +06:00
Vladimir Sharshov 3c8f1c062b Fix ActivityFeed for user, remove info about password [Refs #207] 2012-02-24 20:33:00 +04:00
Pavel Chipiga 600df031f5 Refactor platform clone controller and routes. Refactor and fix clone process for platform, repository, product. Place XML RPC clone request to DJ. Refs #207 2012-02-24 19:27:59 +04:00
Pavel Chipiga 5e58ec9e59 Delegate all repo abilities to platform. Remove repository owner and relations. Fix templates and specs. Refactor and code cleanup. Refs #205 2012-02-24 19:27:58 +04:00
George Vinogradov f7b496bb39 Some fixes:
*  Changed default visibility to personal platforms to 'open'
  *  Changed 'Erase' button to simple link in comments partial
  *  Probably added domain name to links in mail notifications
  *  Fixed protocol in repo links form 'http' to 'https'
2012-02-24 19:27:56 +04:00
Pavel Chipiga bab3a90155 Apply approved and rejected filters for register requests. Tune abilities. Link to user profile if user have already registered. Refs #174 2012-02-24 19:27:55 +04:00
George Vinogradov 43c896021e [issue #64] Added possibility to diff and revert last commit 2012-02-24 19:27:55 +04:00
George Vinogradov 1bc4efcdc4 [issue #64] Fixed encodings bugs 2012-02-24 19:27:54 +04:00
konstantin.grabar 3c5cdfd5e4 [refs #195] Add is_rpm field to projects. Continue set new design 2012-02-24 17:05:58 +04:00
Alexander Machehin 027012d3e5 [refs #194] some refactotring 2012-02-23 21:57:51 +06:00
Alexander Machehin 9e5e7cd5e4 [refs #194] labels manage 2012-02-23 20:48:46 +06:00
George Vinogradov 6fe88ed69d [issue #195] Merge branch '195-new_design_for_projects' of github.com:warpc/rosa-build into 195-new_design_for_projects
Conflicts:
	app/presenters/git_presenters/commit_as_message_presenter.rb
2012-02-23 02:16:20 +04:00
George Vinogradov 43b7ccd3dc [issue #195] Added blob show. Some changes. 2012-02-23 02:11:55 +04:00
konstantin.grabar ba1798fd71 [refs #195] Add design to form and edit page 2012-02-22 21:48:37 +04:00
Pavel Chipiga 5b29de93af Refactor platform clone controller and routes. Refactor and fix clone process for platform, repository, product. Place XML RPC clone request to DJ. Refs #207 2012-02-21 23:27:11 +02: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
konstantin.grabar 81393d7f5b [refs #193] Disable more than 2 versions for wiki diff by js 2012-02-21 16:42:09 +04:00
konstantin.grabar 9b610eb920 [refs #193] Fixed old commented code from old template versions. Fix diff page 2012-02-21 14:49:06 +04:00
Pavel Chipiga ed60751dfa Delegate all repo abilities to platform. Remove repository owner and relations. Fix templates and specs. Refactor and code cleanup. Refs #205 2012-02-21 01:13:05 +02:00
Alexander Machehin 5dcc4eabf8 [refs #194] tracker without tags manage 2012-02-20 22:54:45 +06:00
konstantin.grabar 2bdcdb6fd3 [refs #193] Fix compare buttons and links design 2012-02-20 14:27:58 +04: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
konstantin.grabar d9025b093f [refs #193] Compare routes repair and compare design 2012-02-17 18:12:05 +04:00
George Vinogradov 4bdc763ef0 Merge branch '3.2-master' into 195-new_design_for_projects 2012-02-17 18:02:43 +04:00
konstantin.grabar 7863869a30 [refs# 193] Move some gollum style to docs/gollum. Add new styles to edit and new pages 2012-02-17 16:47:33 +04:00
konstantin.grabar d8a3983b07 [refs #193] Add new design to wiki 2012-02-17 15:13:54 +04:00
George Vinogradov 608faf3564 [issue #96] Some fixes in layout and scripts. 2012-02-17 03:07:22 +04:00
konstantin.grabar c140c1b466 Merge branch '194-project_submenu' into 193-new_design_for_wiki 2012-02-16 12:23:41 +04:00
Alexander Machehin 55379ed9c8 [refs #194] first steps 2012-02-16 00:53:58 +06:00
Alexander Machehin fab80d97eb [refs #194] project submenu partial 2012-02-15 22:32:26 +06:00
George Vinogradov 5dac20bac5 Some fixes:
*  Changed default visibility to personal platforms to 'open'
  *  Changed 'Erase' button to simple link in comments partial
  *  Probably added domain name to links in mail notifications
  *  Fixed protocol in repo links form 'http' to 'https'
2012-02-15 20:30:56 +04:00
konstantin.grabar 0763936e38 [refs #193] Wiki navigation design 2012-02-15 19:01:49 +04:00
Vladimir Sharshov 90c1250769 Merge pull request #186 from warpc/64-project_wiki
[Refs #64] - Fix diff for russians pages, add ability to revert last commit
2012-02-15 01:44:41 -08:00
Pavel Chipiga 2c493cdbb7 Apply approved and rejected filters for register requests. Tune abilities. Link to user profile if user have already registered. Refs #174 2012-02-14 20:15:52 +02:00
konstantin.grabar 101fa63514 Small ActivityFeed refactoring 2012-02-14 20:46:08 +04:00
konstantin.grabar 08ffd8c25d [refs #123] Add wiki to ActivityFeed 2012-02-14 20:09:41 +04:00
George Vinogradov e9c5273136 [issue #64] Added possibility to diff and revert last commit 2012-02-14 18:54:44 +04:00
George Vinogradov 85723f7da6 [issue #64] Fixed encodings bugs 2012-02-14 18:54:18 +04:00
konstantin.grabar 5039907431 Merge branch 'master' into 123-activity-feed 2012-02-14 14:30:27 +04: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
George Vinogradov 99ee490e94 [issue #64] Added callback for notifications + some minor changes 2012-02-14 03:30:17 +04:00
Vladimir Sharshov 141a078cce Merge pull request #175 from warpc/133-editing_from_web
[Refs #133] Edit files in git-repo with web editor
2012-02-13 13:07:55 -08:00
George Vinogradov 99c314fb11 [issue #133] Merge branch 'master' into 133-editing_from_web
Conflicts:
	db/schema.rb
2012-02-13 21:48:40 +04:00
Vladimir Sharshov 2350993120 Merge pull request #182 from warpc/171-build_list_tab_acl_fix
[fix #171] Added ACL calls to project navigation
2012-02-13 09:24:04 -08:00
Pavel Chipiga c6f9995b98 Add GA code to layouts and invite pages. Do not track admins. Refs #183 2012-02-13 18:42:11 +02:00
George Vinogradov 50d27ad34d [issue #171] Added ACL calls to project navigation. 2012-02-13 20:16:50 +04:00
George Vinogradov 8c0cd29f0e [issue #133] Fixed bug with no acl on editing blobs 2012-02-13 19:21:00 +04:00
konstantin.grabar 391716fee5 [refs #133] Fix syntax error into blob template 2012-02-13 14:43:57 +04:00
konstantin.grabar 9271c15a5f [refs #123] Add new commits support 2012-02-10 21:33:05 +04:00
Pavel Chipiga 704c544cbc Add more register_requests fields, change design. Apply invitation mail sending. Refactor. Refs #174 2012-02-10 18:33:16 +02:00
George Vinogradov 8417e8c16f [issue #174] multiupdate in admin view. 2012-02-10 15:18:40 +04:00
George Vinogradov a17f548168 [issue #174] Fixed bugs 2012-02-10 14:04:15 +04:00
George Vinogradov d0fe7f55d5 [issue #174] added static pages and some changes 2012-02-10 02:57:43 +04:00
George Vinogradov f9e7f3fb06 [issue #174] Devise hacks 2012-02-10 01:45:26 +04:00
George Vinogradov ce39cdd04f [issue #174] A half of work to create invitations system 2012-02-09 21:46:23 +04:00
George Vinogradov a4baf8b670 [issue #133] Editor JS moved to separate file 2012-02-09 04:35:07 +04:00
George Vinogradov ffe2608c32 [issue #133] Some makeup and a lot of encodings magic 2012-02-09 04:27:26 +04: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
George Vinogradov 74d401d087 [issue #133] Writed draft of web editing. 2012-02-08 21:51:30 +04:00
Vladimir Sharshov ff6c855234 Merge pull request #170 from warpc/155-fix_render_event_logs
[refs #155] fix render event logs
2012-02-07 01:35:21 -08:00
Alexander Machehin 86704bc39d [refs #155] fix render event logs 2012-02-07 15:31:07 +06:00
konstantin.grabar 96d3b35bdf [refs #123] Merge master into 123-activity-feed 2012-02-06 19:46:32 +04:00
Alexander Machehin 70346f0015 [refs #151] refactoring 2012-02-06 20:12:33 +06:00
Alexander Machehin a79a081fd1 Merge branch 'master' into 151-grit_encodings_problems 2012-02-06 19:55:59 +06:00
George Vinogradov f2bfcf8699 [issue #151] Probably fixed. 2012-02-05 00:12:37 +04:00
George Vinogradov 0591ba4378 [fix #158] Fixed bug with render in BlobController#raw 2012-02-04 22:03:29 +04:00
Alexander Machehin b0d0b21ec4 [refs #144] fix template 2012-02-03 19:40:47 +06:00
George Vinogradov 549fc242d8 [issue #64] Fixed bug in _history partial 2012-02-03 04:23:29 +04:00
George Vinogradov a2f07fad10 Merge branch '64-project_wiki' of github.com:warpc/rosa-build into 64-project_wiki 2012-02-03 04:05:18 +04:00
George Vinogradov e05f391f8e [issue #64] Write User.uname instead of User.name to commit 2012-02-03 04:04:20 +04:00
Vladimir Sharshov 4165b188eb Merge branch 'master' into 64-project_wiki
Conflicts:
	app/models/project.rb
	config/locales/en.yml
2012-02-03 00:55:16 +04:00
Alexander Machehin 68c97b3a33 [refs #64] some template fixes 2012-02-03 00:46:33 +06:00
George Vinogradov 821062c150 Merge branch '64-project_wiki' of github.com:warpc/rosa-build into 64-project_wiki 2012-02-02 03:18:53 +04:00
George Vinogradov 4cd20934c4 [issue #64] Removed unused MathJax 2012-02-02 03:17:16 +04:00
Alexander Machehin 20613ba2c3 [refs #64] All pages: 2012-02-02 01:36:56 +06:00
Vladimir Sharshov 8562b882da Merge pull request #136 from warpc/114-comment_notifications
Notifications and subscribtions about new comments in commit [Refs #114]
2012-02-01 11:12:24 -08:00
George Vinogradov d0717c8f9e [issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
	Gemfile.lock
	db/schema.rb
2012-02-01 22:39:04 +04:00
konstantin.grabar 0559f1b678 [refs #127] Filter request refactor 2012-02-01 20:00:19 +04:00
George Vinogradov 8733c4dc34 [issue #64] Some dirty hacks.
Diff for file with russian name don't work yet.
2012-02-01 03:20:42 +04:00