Commit Graph

2078 Commits

Author SHA1 Message Date
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
George Vinogradov 6f78e5456c [issue #64] Changes for ruby 1.9.3 compatibility. 2012-01-31 20:40:46 +04:00
Alexander Machehin f15cb90b87 Merge branch 'master' into 114-comment_notifications
Conflicts:
	config/locales/ru.yml
2012-01-31 21:42:37 +06:00
George Vinogradov 24124766f4 [issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
	Gemfile.lock
	config/locales/en.yml
	db/schema.rb
2012-01-31 02:07:11 +04:00
Pavel Chipiga 33dce21312 Upgrade to ruby 1.9.3 and fix bugs. Fix bug with commit_hash save during project build. Move some russian text to yml. Code cleanup. Fix templates, deploy and import scripts. Fix specs. Translate event_logs. Refs #95 2012-01-30 22:36:58 +02:00
George Vinogradov 5f40030e30 [issue #64] Fixed bug with cloning wiki repository 2012-01-30 18:17:00 +04:00
George Vinogradov 2f315f869d [issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
	Gemfile.lock
	app/models/project.rb
	db/schema.rb
2012-01-30 13:27:22 +04:00
George Vinogradov f7c58f6a77 [issue #64] Removed unnecessary files. 2012-01-30 13:12:18 +04:00
Alexander Machehin 5efaca77cf Merge branch 'master' into 114-comment_notifications
Conflicts:
	app/models/project.rb
	app/views/user_mailer/new_comment_notification.en.haml
	app/views/user_mailer/new_comment_notification.ru.haml
	app/views/user_mailer/new_comment_reply_notification.ru.haml
	config/locales/devise.en.yml
	config/locales/en.yml
	config/locales/ru.yml
	db/schema.rb
2012-01-30 13:06:06 +06:00
Alexander Machehin e0b7699ffd Revert "Merge branch '114-comment_notifications' into user-emails-list"
This reverts commit 2179cbbf40334cbe5d4fa9ba3a7f297d8f543a0a, reversing
changes made to 9bf06e5e1a595f320dc4527ebd44f14be05fcd64.

Conflicts:

	app/models/user.rb
2012-01-30 12:22:54 +06:00
Alexander Machehin f6b6bbfb54 Revert "[refs #114] emails control"
This reverts commit 26fb1fcbfb843163231d8b8f0caf582bafccbe57.

Conflicts:

	app/models/subscribe.rb
	app/models/user.rb
	spec/models/comment_for_commit_spec.rb
2012-01-30 12:19:54 +06:00
Alexander Machehin dc39eefe62 Revert "[refs #114] add js"
This reverts commit 48a9c4d50b9f11a11cc4f2c5831c4b5b25fdc4d1.
2012-01-30 12:16:09 +06:00
Alexander Machehin 2e2e7e43d3 [refs #114] some refactoring 2012-01-30 02:18:14 +06:00
George Vinogradov 706c052a5e [issue #64] User names are clickable. 2012-01-29 22:03:42 +04:00
George Vinogradov acdd1f22b6 [issue #64] Fixed bug with revert all wiki. 2012-01-28 16:10:43 +04:00
George Vinogradov aa5641da2f [issue #64] Fixed CanCan bugs. 2012-01-28 06:05:13 +04:00
George Vinogradov 2ab039cc62 [issue #64] Some fixes in view. 2012-01-28 05:56:27 +04:00
Vladimir Sharshov f9abc2d39c Hide participate projects 2012-01-28 04:25:11 +04:00
George Vinogradov a4f95e3660 [issue #64] Changed editor toolbar. 2012-01-27 21:00:44 +04:00
George Vinogradov 549f0a55e8 [issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
	Gemfile.lock
	app/models/project.rb
	app/models/user.rb
	app/views/projects/_form.html.haml
	config/locales/ru.yml
	db/schema.rb
2012-01-27 18:27:23 +04:00
Alexander Machehin 06ab99a1d0 [refs #114] add js 2012-01-27 18:20:07 +06:00
konstantin.grabar 72fd821bc8 [refs #123] Add fixes for activity feed 2012-01-27 16:06:04 +04:00
Alexander Machehin e71a9e84cb [refs #114] emails control 2012-01-27 02:11:07 +06:00
konstantin.grabar 0eb0eb9713 [refs #123] Activity Feed logic global refactoring. 2012-01-26 21:04:58 +04:00
George Vinogradov 3cb426a508 [issue #64] Added cancan restrictions. 2012-01-26 20:26:21 +04:00
Vladimir Sharshov c529e63c96 Merge pull request #122 from warpc/105-internationalization
[refs #105] Fix devise translations
2012-01-26 08:06:34 -08:00
Alexander Machehin e04b2eb59b Merge branch '114-comment_notifications' into user-emails-list
Conflicts:
	app/models/subscribe.rb
	config/locales/en.yml
2012-01-26 14:55:16 +06:00
Alexander Machehin 77420d2a8f [refs #114] user emails 2012-01-26 14:53:40 +06:00
Alexander Machehin 4cca8f7bb1 [refs #114] some refactoring 2012-01-25 23:33:26 +06:00
konstantin.grabar dd1493d677 [refs #123] Add activity feed page. Remove some unnessary code. Some logic fixes. 2012-01-25 17:05:39 +04:00
konstantin.grabar 990a46018c [refs #123] Add base logic for activity feed 2012-01-25 12:31:49 +04:00
Alexander Machehin b7c2b4d35b [refs #114] fix email bug 2012-01-25 13:21:41 +06:00
George Vinogradov 45877e8b5c [issue #64] Bug fix & views refactoring
*  Fixed bug with history
*  Navigation moved to partial.
2012-01-25 00:47:55 +04:00
Pavel Chipiga 3f4bf65825 Upgrade paperclip. Apply srpm_import script and UI. Fix specs. Refs #31 2012-01-24 22:35:36 +02:00
Alexander Machehin 61be317b21 [refs #114] i18n 2012-01-25 01:00:51 +06:00
Alexander Machehin 6df1640485 [refs #114] fix logics 2012-01-24 18:18:39 +06:00
Alexander Machehin 9127b6b689 [refs #114] changed logics 2012-01-24 01:42:54 +06:00
George Vinogradov 230c25eefd [issue #64] Some changes.
*  WikiController#compare splitted into WikiController#compare
   and WikiController#compate_wiki
*  Show only last 30 versions in history.
2012-01-23 16:45:38 +04:00
Alexander Machehin f1f6d1b78b [refs #114] email i18n 2012-01-22 22:19:00 +06:00
Alexander Machehin ab081d3c46 [refs #114] only new comment notification 2012-01-22 22:15:25 +06:00
konstantin.grabar 23ace52d90 [refs #113] Images render and download href for binary data into blobs 2012-01-20 22:31:01 +04:00
Alexander Machehin 371abac031 [refs #114] fix controller tests 2012-01-20 21:17:05 +06:00
George Vinogradov 23573a1a07 [issue #64] Added creation wiki to project. 2012-01-20 19:10:30 +04:00
George Vinogradov 011efb0c4b [issue #64] Added git access to Wiki. 2012-01-20 19:01:59 +04:00
konstantin.grabar e3a716b7db [refs #105] Fix some translations 2012-01-20 15:29:32 +04:00
George Vinogradov 364f2e40c0 [issue #64] Added Wiki history, compare, revert. 2012-01-20 03:25:15 +04:00
Alexander Machehin 800b02f544 [refs #18] Add project subsribe, tests 2012-01-20 00:20:03 +06:00
George Vinogradov 54bc26d960 [issue #64] Added translations. 2012-01-19 18:37:36 +04:00
George Vinogradov 0c527af291 [issue #64] Added revisions comparsion. 2012-01-19 17:49:32 +04:00
George Vinogradov 552aa0a58a [issue #64] Fixed bug with sidebar and footer. 2012-01-19 17:48:29 +04:00
George Vinogradov 538e3da8c8 [issue #64] Added search through wiki 2012-01-19 16:10:50 +04:00
George Vinogradov 65e659ad49 [issue #64] Some changes in preview. 2012-01-19 16:09:55 +04:00
George Vinogradov a03690a9f7 [issue #64] Some views restuct. 2012-01-19 01:14:12 +04:00
Alexander Machehin 71447a29e3 [refs #114] add settings for commits notifications 2012-01-19 00:20:08 +06:00
George Vinogradov 2af0135fb5 [issue #64] Added All Pages representation. 2012-01-18 19:09:25 +04:00
George Vinogradov 0386c34246 [issue #64] Added page deletion. 2012-01-18 18:33:35 +04:00
George Vinogradov 7afcc3a617 [issue #64] Some fixes. 2012-01-18 18:33:09 +04:00
Pasha 4ba268dd67 Merge pull request #109 from warpc/18-commit_comments
18 commit comments
2012-01-18 05:49:57 -08:00
George Vinogradov 931aef4db6 [issue #64] Fixed some bugs in templates. 2012-01-18 04:47:01 +04:00
George Vinogradov d3b32e4d6d [issue #64] Fixed bug with preview page. 2012-01-18 04:43:36 +04:00
George Vinogradov 2522dd3c63 [issue #64] Added page history views. 2012-01-18 03:30:54 +04:00
George Vinogradov 51e9b5d1f6 [issue #64] Some changes in views and routes. 2012-01-18 02:28:59 +04:00
Alexander Machehin 310e11b666 [refs #18] Fix if blocking referer 2012-01-18 00:33:42 +06:00
konstantin.grabar bbbf17c2b4 [refs #105] Merge master with 105-internationalization 2012-01-17 17:58:49 +04:00
konstantin.grabar d205eb2dd9 [refs #105] Add language check on user save 2012-01-17 15:57:46 +04:00
konstantin.grabar 726eddc40e [refs #105] Add internationalization support to project 2012-01-17 15:48:40 +04:00
Alexander Machehin a0aad7103e some fixes 2012-01-17 17:38:40 +06:00
Pavel Chipiga fab62c548f Hide container_path if build_list published. Cleanup translations. Refs #100 2012-01-17 13:04:50 +02:00
Alexander Machehin 95b4e2557c [refs #18] forgot comments order 2012-01-17 16:30:11 +06:00
Alexander Machehin bf4e4f02ed Right merge branch 'master' into 18-commit_comments
Conflicts:
	app/controllers/comments_controller.rb
	app/views/comments/edit.html.haml
	app/views/issues/show.html.haml
	db/schema.rb
2012-01-17 15:52:46 +06:00
George Vinogradov 62922c30a3 [issue #64] Added search partial. 2012-01-17 04:05:07 +04:00
George Vinogradov 1e1dab369b [issue #64] Added some views, styles and scripts.
*  Added base gollum styles
*  Added base gollum javascripts (with minor changes)
*  Fixed some bugs in WikiController
*  Added some views (draft yet)
2012-01-17 01:48:38 +04:00
konstantin.grabar 52696791f2 [refs #54, #94] Merge master into issues 2012-01-16 13:42:44 +04:00
Alexander Machehin e10dd56dff [refs #18] refactoring 2012-01-16 13:28:30 +06:00
konstantin.grabar a1a92e9878 [refs #54] Fix comments serial_id routing and some logic 2012-01-13 20:07:46 +04:00
Alexander Machehin 794c55a030 Merge branch 'master' of github.com:warpc/rosa-build into 18-commit_comments 2012-01-13 22:01:30 +06:00
konstantin.grabar db0a66846b [refs #94] Add new notifier rules. Fix some issues and comments bugs 2012-01-13 19:07:01 +04:00
George Vinogradov 0751a94974 [update #76] Merge branch 'master' into 76-project_autocomplete
Conflicts:
	app/views/layouts/_stylesheets.html.haml
2012-01-12 20:43:32 +04:00
George Vinogradov 73b710ae4e [close #76] Changed styles. Fixed bug with pagination. 2012-01-12 20:37:50 +04:00
Alexander Machehin 630346d2e3 [refs #18] fix cancel button 2012-01-12 20:48:08 +06:00
Alexander Machehin 636c90e6e4 [refs #18] add some I18n 2012-01-12 20:27:45 +06:00
Alexander Machehin f8d00f5235 [refs #18] Fix cancan ability for commit comments 2012-01-12 18:04:16 +06:00
Alexander Machehin 07dc7a4800 [refs #18] add comments to commit 2012-01-12 17:19:22 +06:00
George Vinogradov 49082c2a8d [issue #76] Fixed bug with JSON generation. 2012-01-12 01:12:56 +04:00
konstantin.grabar 2b8aca5f09 [refs #54] Add settings notifier 2012-01-11 17:58:13 +04:00
konstantin.grabar 4132c336d6 [refs #54] Fix comment update path 2011-12-31 14:55:49 +04:00
konstantin.grabar 16c9d0ec15 [refs #54] Fix some bugs of issues and comments + add comment body to email 2011-12-31 14:51:47 +04:00
George Vinogradov 7c50b2c3f5 [issue #76] Added jQuery DataTable. But it doesn't work yet 2011-12-31 02:42:58 +04:00
konstantin.grabar e8977a7d95 Merger issues with master 2011-12-30 18:23:16 +04:00
George Vinogradov 782b311983 [issue #76] Changed project list in repositories. 2011-12-29 22:16:39 +04:00
konstantin.grabar 635e2b7977 [refs #54] Add comments specs and factory. Remove unused code. Add one delay and fix some links. 2011-12-29 15:16:54 +04:00
Pavel Chipiga acb970686c Apply auto_publish for build_lists. Apply publish build_list error status. Remove circle build info. Display auto_publish info. Fix bugs. Refactor. Apply specs for all build_lists core callbacks. Refs #72 2011-12-29 04:37:34 +02:00
konstantin.grabar 49ec1ebe98 [refs #54] Remove unused comments 2011-12-28 18:24:24 +04:00
konstantin.grabar fa8656d1f5 [refs #54] Refactor subscires routes and authorize 2011-12-28 17:54:45 +04:00
konstantin.grabar 1c263c6e0a [refs #54] Notification DJ support. Routes fixes. 2011-12-28 14:47:54 +04:00
konstantin.grabar a783b460bd Merge issues with master 2011-12-28 13:22:57 +04:00
Pavel Chipiga 5e3addd5d2 Great refactor for cancan abilities. Remove product relations. Fix git abilities. Fix and refactor specs. Refs #85. Refactor issues controller to avoid serial_id problem. Fix links and routes. Fix minor bugs and translations. Fix specs. Refs #54 2011-12-28 04:59:05 +02:00
konstantin.grabar ecbfed9300 [refs #54] Fix user_id validation into issues 2011-12-27 21:49:08 +04:00
konstantin.grabar b48ffecc28 [refs #54] Add new styles to comments list to issue page 2011-12-27 17:52:48 +04:00
konstantin.grabar d3ba83135e [refs #54] Add some locales and interface fixes for issues 2011-12-27 17:18:25 +04:00
konstantin.grabar 8face9208e [refs #54] Add fixes and locales to subscribes 2011-12-27 16:35:31 +04:00
konstantin.grabar ce6746f7a9 [refs #54] Add subscribes and notifications 2011-12-26 19:48:57 +04:00
Pavel Chipiga 7d3dd5eaf1 [#82] Merge branch 'master' into 65-build_repo
Conflicts:
	spec/models/cancan_spec.rb
2011-12-26 14:51:30 +02:00
konstantin.grabar 5237939f49 Merge issues with master 2011-12-26 13:26:13 +04:00
konstantin.grabar bf2f3d1bc7 [refs #54] Add issue statuses filters 2011-12-23 18:34:32 +04:00
Pavel Chipiga 8c3291d237 Fix and redo specs after great build_lists refactoring and improvement. Fix minor bugs. Code cleanup. Refs #65 2011-12-23 04:14:28 +02:00
Pavel Chipiga 2c67843c34 Refactor and cleanup build_lists controller and routes. Rename methods. Allow deffis in platform and repository name. Add missing relation and migration to force work user assign in build_lists. Fix and simplify links. Abstract sidebar. Refs #65 2011-12-21 23:42:06 +02:00
Pavel Chipiga a61d211862 Fix bugs. Change included_repos format. Refs #65 2011-12-21 20:59:19 +02:00
Pavel Chipiga e588482f32 [#74] Merge branch 'master' into 65-build_repo
Conflicts:
	app/controllers/build_lists_controller.rb
	app/controllers/projects_controller.rb
	db/schema.rb
2011-12-21 20:13:57 +02:00
Pavel Chipiga 7f58a52602 Autocheck current save platform and disable unavailable base platforms on JS level. Refs #65 2011-12-21 19:51:55 +02:00
konstantin.grabar 3ab55d34b8 [refs #54] Add CanCan rules for issues and comments. Fix serial_id routes and some actions 2011-12-21 18:48:16 +04:00
Pavel Chipiga d901426b79 Move project build functinality to build_lists controller. Refactor downloads url - create model based methods for url genertion. Cleanup code. Add includeed_repos functionality. Display included_repos on build_list page. Refs #65 2011-12-21 16:01:50 +02:00
George Vinogradov 6c48e058be [close #70] Removed all & filter methods in BuildListsController
*  Removed methods
*  Changed abilities
*  Changed routes
*  Added specs
2011-12-21 05:30:34 +04:00
Vladimir Sharshov cb91bdb858 Merge pull request #68 from warpc/build_list_visibilities
Customize build list monitoring:
* show all user public build list
* show private build list only who have access for project
* admin see all build list
2011-12-20 15:46:43 -08:00
George Vinogradov 3eb2ae545a [issue #27] Merge branch 'master' into build_list_visibilities
Conflicts:
	app/views/build_lists/_filter.html.haml
2011-12-20 21:25:35 +04:00
George Vinogradov 39dade9945 [closed #63] Added user column to build_list. 2011-12-20 21:09:29 +04:00
konstantin.grabar 375c98366f [ref #54] Add has_issue settings to projec edit. Fix routes and friendly_id bug. Fix some moments 2011-12-20 20:57:34 +04:00
George Vinogradov 61cd0a7532 [close #27] Fixed error in template. 2011-12-20 17:08:48 +04:00
konstantin.grabar 446cdac8e6 [refs #54] Add new locales. Fix routes. Fix issues and comments update 2011-12-20 14:20:00 +04:00
konstantin.grabar d20d43eb2b [refs #54] Base logic and templates for issues and comments to them 2011-12-19 19:30:14 +04:00
konstantin.grabar 58cfe07124 [refs #56] Change project build page title 2011-12-16 11:59:34 +04:00
konstantin.grabar 7f10fea681 [refs #32] Add user uname field to user profile 2011-12-15 20:20:17 +04:00
konstantin.grabar b3f422e713 [refs #32] Add user filter 2011-12-15 20:15:25 +04:00
Pavel Chipiga 06e08dcfc6 Fix indentions 2011-12-15 02:36:14 +02:00
George Vinogradov 2a108981d5 [update #20] To server sends id instead of uname. Added some specs 2011-12-14 19:54:04 +04:00
George Vinogradov 1b3e473b94 [closed #20] Changed adding collaborators to project
Changed collaborators page of project:
  *  Added form to input group and/or project nickname.
  *  In tables show only projects/groups that already added to project
2011-12-14 19:52:47 +04:00
Pasha 2edf0ad172 Merge pull request #44 from warpc/tuning_monitoring_view
Tuning monitring view
2011-12-14 05:34:34 -08:00
Vladimir Sharshov 7614d027a6 Reordered search by id and name;
Change localization for project_name_search.
Fix wrong label for field
2011-12-14 17:11:40 +04:00
Vladimir Sharshov 9ab07c1675 Merge pull request #36 from warpc/platform_edit
Edit platform;
Added callback updates with new owner.
Added a button for call edit action;
Removed unnecessary to edit platform form field when you upgrade.
2011-12-14 03:15:41 -08:00
Vladimir Sharshov 1d55e8758e Merge pull request #26 from warpc/platform_admin_fixes
Fix autocomplete. Rsync stubs for development env. Blocked problematic validation for development env
2011-12-14 02:00:01 -08:00
konstantin.grabar 4a723369a2 [refs #12] Add platform update options 2011-12-13 17:27:27 +04:00
santaux 24766d2383 Merge pull request #14 from warpc/group_members_change
Changed adding members to group.
2011-12-13 02:16:37 -08:00
konstantin.grabar 222033de5e [refs #12] Fix platform relations again 2011-12-12 19:37:37 +04:00
George Vinogradov 4f4f421933 [close #29] Project name in BuildList#show is now link to project. 2011-12-12 19:33:08 +04:00
konstantin.grabar 6a364b73a6 [refs #12] Fix platform admin relations. Locales correction. Add validationa and rsync stubs. 2011-12-12 18:10:39 +04:00
George Vinogradov 5c07046dac [updated #16] Fixed localization fauldnames. 2011-12-11 22:50:55 +04:00
George Vinogradov c3f4c8dd87 [updated #16] admin_id renamed to admin_uname. 2011-12-11 21:43:42 +04:00
George Vinogradov 168e110169 [close #11] Changed adding members to group. 2011-12-10 03:40:13 +04:00
Vladimir Sharshov 5e3711505c Merge pull request #5 from warpc/build_lists_filter
New build lists filter (search by name and bs_id)
2011-12-08 14:17:03 -08:00
Pavel Chipiga 0ca7c5d451 Rename bs_id label and key. Stub XML RPC to raise exception and fix spec. Write specs for build_lists filters. Refs #2 2011-12-08 20:51:25 +02:00
George Vinogradov 603e4b3691 fixed #4. Removed unnecessary routes and views parts. 2011-12-08 18:47:18 +04:00
Pavel Chipiga b89416e125 Add project name and bs_id filters for the build_lists list. Refactor and code cleanup to close #2 2011-12-08 00:46:01 +02:00
Pavel Chipiga 6794ca42fb Fix date filter normalization. Add build, freeze, unfreeze confirmation. Refs #2261 2011-12-07 02:09:04 +02:00
George Vinogradov 0bffb0581e Some changes in groups. 2011-12-07 03:45:09 +04:00
George Vinogradov 97579f8534 Fixed errors in projects representation. 2011-12-07 03:44:21 +04:00
George Vinogradov 3a9addd8db Fixed bug with new group creation under admin. 2011-12-07 00:03:09 +04:00
Pavel Chipiga bcb9333b97 Fix build_lists filter. Refs #2261 2011-12-06 02:31:40 +02:00
George Vinogradov 2f5ce7cebe Merge branch 'groups_reincarnation' into staging
Conflicts:
	app/models/ability.rb
	app/models/project.rb
	config/environments/production.rb
2011-12-05 17:16:32 +04:00
George Vinogradov 9cc820080b Groups base functional. 2011-12-05 16:32:18 +04:00
konstantin.grabar 1abcdbc028 [refs #2249] Add corrections to ACL 2011-12-02 19:26:28 +04:00
konstantin.grabar 233f9b8035 [refs #2249] Add corrections to ACL rules 2011-12-02 10:57:58 +04:00
konstantin.grabar 96d4886f49 [refs #2249] Add new ACL relations 2011-12-01 18:20:24 +04:00
konstantin.grabar 6d8e4f98b9 [refs #2249] Some ACL changes 2011-12-01 13:29:04 +04:00
Pavel Chipiga e45ba6692a Rename delete_build_list to cancel_build_list. Rescue XML get_status exception. Refs #2261 2011-12-01 00:55:47 +02:00
Pavel Chipiga bdef78fddc Fix project_list display. Refs #2261 2011-11-30 18:38:23 +02:00
konstantin.grabar 438bedd226 Add build all btn to platforms 2011-11-30 18:48:50 +04:00
Pavel Chipiga 3bc2ff894c Improve and fix project fork functionality. Fix project create and validation. Add user role display. Add user role at user edit form. Refs #2261 2011-11-30 15:55:59 +02:00
Pavel Chipiga c4a31e3d29 Improve and fix project fork functionality. Fix project create and validation. Add user role display. Add user role at user edit form. Refs #2261 2011-11-29 23:42:58 +02:00
konstantin.grabar bc504dfcf7 [refs #2249] Add more fixes to global renaming 2011-11-29 14:51:14 +04:00
konstantin.grabar 148a0fec28 [refs #2249] Global name to description and unixname to name renames 2011-11-29 14:51:14 +04:00
Pavel Chipiga 796ff75857 Great models refactoring. Refactor some cancan abilities and controllers authorization. Move some common parts to modules. Fix lots bugs. Remove unused files and code. Drop ACL tables. Add more can? helpers. Refs #2249 2011-11-24 23:48:58 +02:00
Pavel Chipiga 141fe7677f Apply project fork button. Refactor and cleanup code. Refs #2243 2011-11-23 17:52:33 +02:00
konstantin.grabar ba77244b02 [refs #2249] Some rules and roles fixes 2011-11-22 23:21:31 +04:00
Pavel Chipiga 366ca320e0 Change and fix role assign logic and abilities. Other minor fixes. Refs #2261 2011-11-21 21:06:34 +02:00
konstantin.grabar b98453bd62 [refs #2249] Add new user managment logic 2011-11-21 22:26:56 +04:00
konstantin.grabar 140eaf6265 [refs #2249] Remove old roles managment system 2011-11-21 21:43:37 +04:00
Pavel Chipiga ce60f7b057 Generate files for easy_urpmi during platform mount. Improve nd refactor auth module for grack, apply cancan. Adapt project import script to new source file. Fix bugs. Refactor. Refs #2261, #2243 2011-11-21 14:59:23 +02:00
konstantin.grabar e50959e205 [refs #2249] Add full rules, helpers and filters of CanCan 2011-11-19 15:41:11 +04:00
Pavel Chipiga d49880f24e Merge branch 'smart_http' into staging
Conflicts:
	app/models/relation.rb
	app/models/user.rb
2011-11-18 20:35:12 +02:00
konstantin.grabar 7b750a6f93 Merge branch 'cancan' into staging 2011-11-18 22:30:23 +04:00
Pavel Chipiga 4d78ce371f Merge branch 'master' into staging
Conflicts:
	app/models/build_list.rb
2011-11-18 20:27:33 +02:00
konstantin.grabar 05bb9ce0c7 [refs #2249] CanCan rules update. Add admin role to relations. Change collaboratots edit logic and code 2011-11-18 22:26:22 +04:00
Pavel Chipiga 5f39e76b12 Merge branch 'master' into smart_http
Conflicts:
	app/controllers/projects_controller.rb
	app/models/build_list.rb
	app/models/project.rb
2011-11-18 11:59:21 +02:00
Pavel Chipiga 497e8f64f4 Redo commit diffs display. Fix tree blob blame display. Refs #2162 2011-11-18 11:48:50 +02:00
Pavel Chipiga 9118c787b1 Redo personal repo urpmi links. Refs #test_prepare 2011-11-18 01:17:06 +02:00
Pavel Chipiga cbfa5858d4 Add tags ordering, check and fix. Refactor auto_build. Refs #test_prepare 2011-11-18 00:28:02 +02:00
Pavel Chipiga 3b36943b91 Remove gitolite and it callbacks. Add git repo create, destroy callbacks. Improve grack wrappers: separate read/write requests, ask password for push even for public repo, prepare for cancan, apply hooks, refactor. Fix auto_build_lists order. Refactor auto_build - move to model. Redo git_repo_url. Improve and test project import script. Fix bugs, refactor and cleanup. Refs #2243 2011-11-17 23:57:30 +02:00
konstantin.grabar 2772bddc06 [refs #2249] Add new rules. Fix joins trouble. Add new relations dynamic methods. 2011-11-17 23:34:02 +04:00
konstantin.grabar 4d4f5deed4 [refs #2249] Remove bitmask. Add new rules. Add some authorize filters. Add some template can? helpers 2011-11-16 22:45:01 +04:00
Pavel Chipiga b36cc24a64 Redo commit diffs display. Fix tree blob blame display. Refs #2162 2011-11-11 23:57:10 +02:00
Pavel Chipiga e7f9d8251a Rename product field build to build_script. Change links. Refs #2161 2011-11-11 21:12:15 +02:00
Pavel Chipiga 7996740ae7 Improve build_lists time. Apply product build lists basic functionality. Move product build functionality to separate controller. Apply event logging for product build. Fix logging for project build list publishing. Code refactor and cleanup. Refs #2161 2011-11-11 19:13:09 +02:00
konstantin.grabar 8449b5b826 Add BuildList status validation. Change publish logic and btn icon 2011-11-11 14:38:17 +04:00
konstantin.grabar aeeca18377 Remove unused link from statistics page 2011-11-10 14:34:08 +04:00
Pavel Chipiga c5fdfcd39d Fix sessions layout meta tags. Refs #2162 2011-11-10 01:50:51 +02:00
konstantin.grabar df2f3abe62 [refs #2161] Add test sudo action 2011-11-03 14:33:23 +04:00
Pavel Chipiga 49e4dea478 Redo platform clone. Refs #2162 2011-11-03 10:32:45 +02:00
konstantin.grabar f4c3bafb6d [refs #2161] Change logic and output of urpmi commands 2011-11-03 12:03:08 +04:00
George Vinogradov aa97eb1863 Yet another change of MyProjects block 2011-11-03 02:01:11 +04:00
George Vinogradov 10b2c8d903 Fix bug with uname 2011-11-03 01:44:49 +04:00
George Vinogradov 3e2e01deb6 Changed My Projects block 2011-11-03 01:39:50 +04:00
Pavel Chipiga f5ba1b34f2 Fix repository and personal_repository - add_project add remove_project actions. Fix links. Refactor. Refs #2162 2011-11-02 23:37:19 +02:00
Pavel Chipiga 1a0e235167 Add auto_build_lists destroy action. Fix auto_build process. Improve auto_build relations. Refs #2162 2011-11-02 21:18:43 +02:00
George Vinogradov b048c54004 Added own projects sidebar 2011-11-02 20:22:42 +04:00
konstantin.grabar 4341155771 [refs #2161] Change private users and personal repos menus 2011-11-02 16:43:41 +04:00
konstantin.grabar 7b8df283eb [refs #2161] Change regenerate logic for private_users 2011-11-02 14:42:08 +04:00
konstantin.grabar 9b80c09bfb [refs #2161] Remove groups from menu 2011-11-02 13:30:14 +04:00
Vladimir Sharshov 153641910f Show notified information from Kernel 2011-11-02 12:23:11 +04:00
Pavel Chipiga b79405c7e5 Change build_lists table update field. Refs #2162 2011-11-02 03:22:29 +02:00
Pavel Chipiga 6f7f42b4a9 Quickfix private_users password generation. Refs #2162 2011-11-02 02:45:19 +02:00
konstantin.grabar d8b7366e5f [refs #2161] Remove unnessecary data from build list template 2011-11-02 02:23:18 +04:00
George Vinogradov 7bf87aa448 Added view to clone 2011-11-02 02:09:55 +04:00
konstantin.grabar 6fc522e6cc [refs #2161] Global header fix 2011-11-02 01:09:10 +04:00
konstantin.grabar 4bda937075 [refs #2161] Catalogs fixes 2011-11-02 01:07:32 +04:00
konstantin.grabar 2c0422a3bc [refs #2161] Split platforms on three groups 2011-11-02 00:53:48 +04:00
konstantin.grabar 92011e493b [refs #2161] Add new titles to application 2011-11-02 00:18:52 +04:00
Pavel Chipiga ee02bc7a4a Fix category projects counter. Fix git blame links. Stub error when git commit diff is too big. Refs #2162 2011-11-01 20:13:08 +02:00
konstantin.grabar b9c4ab3170 Fix downloads message 2011-11-01 20:06:50 +04:00
konstantin.grabar e03d711d1b [refs #2161] Global private users and repos fixes 2011-11-01 17:32:50 +04:00
Pavel Chipiga 5c97e89829 Fix gitolito update_key bug. Push project colaborators git. Fix key update. Hide colaborators groups. Improve RPC XML tests. Refactor and code cleanup. Refs #2162 2011-11-01 02:52:24 +02:00
George Vinogradov 1d34c54fda Merge branch 'master' of github.com:warpc/rosa-build 2011-11-01 02:04:17 +04:00
George Vinogradov dfc507ff59 Fixed some bugs in ACL checks. 2011-11-01 01:55:56 +04:00
Pavel Chipiga af2fafbb34 Fix container download url. Refs #2162 2011-10-31 20:54:17 +02:00
Pavel Chipiga d6e7e28f23 Fix git repo navigation and info links. Refs #2162 2011-10-31 19:06:39 +02:00
Pavel Chipiga 07c2ab13c2 Fix layout links. Refs #2162 2011-10-31 18:30:59 +02:00
konstantin.grabar c81289f937 [refs #2161] Add refresh btn to downloads 2011-10-31 20:00:33 +04:00
konstantin.grabar de959bb527 [refs #2161] Add refresh option to statistics 2011-10-31 19:58:04 +04:00
George Vinogradov 35c752d876 Removed visibility from projects_list.html.haml 2011-10-31 18:52:35 +04:00
George Vinogradov 06aed1193d Templates for collaborators 2011-10-31 18:09:55 +04:00
George Vinogradov 3ebda42ca0 Fixed bug in projects#edit 2011-10-31 18:05:20 +04:00
Pavel Chipiga 0f820cd6d6 Show project owner in projects list. Refs #2162 2011-10-31 15:45:16 +02:00
George Vinogradov 0556ebdf8e Fixed bug with adding collaborators. 2011-10-31 17:24:46 +04:00
George Vinogradov cea4aaa8b4 Removed sidebar in project creation 2011-10-31 17:02:04 +04:00
Vladimir Sharshov 96546740be Block problem with layout 2011-10-31 14:20:35 +04:00
George Vinogradov b9ee6e365b Added collaborators management. 2011-10-31 02:59:03 +04:00
konstantin.grabar c7e267ba00 [refs #2161] Add message to auto_build_lists 2011-10-31 02:33:15 +04:00
konstantin.grabar 4e9e418c66 [refs #2161] Fix some links and save method into personal repos 2011-10-31 00:03:41 +04:00
Vladimir Sharshov d8c491f6e1 Fix for 'non view statistic data' 2011-10-30 18:10:42 +04:00
konstantin.grabar 028cd273bc [refs #2161] Change href into personal repo page 2011-10-30 16:58:27 +04:00
konstantin.grabar 61408e74ef [refs #2161] Small fixes of translates 2011-10-30 16:58:27 +04:00
konstantin.grabar 12727a2149 [refs #2161] Add more roles. Fix visibility bug on personal repo page 2011-10-30 14:51:05 +04:00
konstantin.grabar 30564e8e17 [refs #2161] Add auto build lists functional 2011-10-29 23:09:50 +04:00
George Vinogradov 411e40267a Added stub for add_collaborators action. 2011-10-29 19:56:44 +04:00
Vladimir Sharshov 8f3ffbe827 Merge branch 'master' of github.com:warpc/rosa-build 2011-10-29 18:06:22 +04:00
Vladimir Sharshov 8c7b196764 Update BuildListItems for new requirement 2011-10-29 18:05:40 +04:00
George Vinogradov a810c0fc3a Added editing of global_role of user. 2011-10-29 17:39:40 +04:00
konstantin.grabar 512364be32 [refs #2161] Add get_status call 2011-10-29 17:38:17 +04:00
konstantin.grabar 8b2fdd71c7 [refs #2161] Add new fields to show.html for BuildList 2011-10-29 16:40:37 +04:00
konstantin.grabar 4e0617a722 [refs #2161] Swap bpl and pl fields into BuildList 2011-10-29 16:18:41 +04:00
Pavel Chipiga 3cb8d5c4c7 Fix group creation bug. Add builds_list to layout menu. Change login error notification. Refs #2162 2011-10-29 13:56:26 +03:00
George Vinogradov b55a99adfa Added showing of global_role to user list 2011-10-29 02:36:02 +04:00
Pavel Chipiga 78f784cf1b Remove visibility from Repository. Refs #2136 2011-10-29 00:03:30 +03:00
Pavel Chipiga 7ec324a590 Refix sidebar for build lists. Refs #2136 2011-10-28 23:33:52 +03:00
Pavel Chipiga e97d48db70 Add platforms link tp layout. Fix sidebar for build lists. Refs #2136 2011-10-28 23:28:31 +03:00
Pavel Chipiga cdedcee801 Skip ACL for some actions. Log git hook to system events log. Fix build_list version format. Fix sidebar for build list display. Translate for ACL. Doc for project bootstrap. Refs #2136 2011-10-28 22:59:07 +03:00
konstantin.grabar bb4343d6ce Add new product link to personal repo 2011-10-28 18:41:11 +04:00
konstantin.grabar 7b3167cfa7 Add personal repository rights. Add personal checker to controller 2011-10-28 18:28:45 +04:00
George Vinogradov 1a62895fd5 Merge branch 'master' of github.com:warpc/rosa-build 2011-10-28 17:11:31 +04:00
George Vinogradov 5b8f567d4b User and Group creates with default role. Rake task 'roles:apply' to apply default
roles
2011-10-28 17:10:29 +04:00
konstantin.grabar 6238012fa9 [refs #2106] Move visibility logic to platforms 2011-10-28 11:20:13 +04:00
konstantin.grabar 04b49c9f65 Add hidden field for platform_id within repository new form 2011-10-28 02:49:37 +04:00
Pavel Chipiga 8fadbfbd66 Redo with_ga include trying to fix strange production bug. Refs #2136 2011-10-27 22:23:31 +03:00
George Vinogradov 87cdb88731 Added use_default and use_default_for_owner to roles 2011-10-27 22:09:22 +04:00
George Vinogradov 98f300302d Added distr_type to platform. 2011-10-27 20:31:54 +04:00
konstantin.grabar 89312375fd Merge master and personal_repos 2011-10-27 17:13:53 +04:00
konstantin.grabar 3114eb1ecc [refs #2106] Add personal repos to project. Some changes of private repos controller and logic 2011-10-27 17:04:03 +04:00
Pavel Chipiga 7b9fa26ac8 Remove git_projects_path application config var. usr root_path instead. Fix bugs. Improve links, usability, refactor. Refs #2136 2011-10-27 15:49:26 +03:00
konstantin.grabar 7fd5f3484f [refs #2109] Fix bug with edit user href 2011-10-27 13:30:38 +04:00
Pavel Chipiga 0171a0a42a Apply basic git repo functionality operation: add, change, destroy user ssh_key. Create, destroy, open/close project git repos. Calc project owner. Improve UI for users, groups and projects: fix links and routes, add actions refactor. Other minor fixes and refactoring. Add ssh_key uniqness check. Add uname uniqness check between User and Group. Check project owner ssh_key existance before project creation. Temporary disable uname and unixname change due to gitolite stranges. Refs #2136 2011-10-26 23:57:51 +03:00
George Vinogradov fa1f7afd34 Added rights checking to top menu. 2011-10-26 04:36:30 +04:00
George Vinogradov 02a8a62f36 Added dump to yml and load from yml abilities for roles. 2011-10-26 04:35:01 +04:00
konstantin.grabar 9c182f0bda Merge master and build_lists_queue 2011-10-24 14:40:36 +04:00
konstantin.grabar d04de6e2fc [refs #1832] Fixed git repos web interface routes 2011-10-24 14:19:04 +04:00
George Vinogradov 82d72a851c ACL for testing. 2011-10-24 01:39:44 +04:00
konstantin.grabar 5a5529ba3e [refs #1832] Build list process fixes 2011-10-23 15:24:46 +04:00
konstantin.grabar d047e3f2b2 [refs #1832] Replace branches to tags in the project 2011-10-23 14:34:42 +04:00
konstantin.grabar 59bfac2be7 [refs #1832] Add some fixes to controllers. Add JS validation to project build 2011-10-23 11:37:54 +04:00
konstantin.grabar 56df3d05b0 [refs #1832] Fix build lists controller and some templates 2011-10-23 10:49:56 +04:00
konstantin.grabar c24a9fae1b [refs #1832] Build Lists updates. Project updates and fixes. 2011-10-22 19:28:41 +04:00
Pavel Chipiga 644d57b420 Merge branch 'catalog'
Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.haml
	app/views/repositories/show.html.haml
	config/locales/ru.yml
	config/routes.rb
	db/schema.rb
2011-10-21 17:55:41 +03:00
George Vinogradov 5b5761e80e Fixed some bugs. 2011-10-20 21:01:01 +04:00
George Vinogradov a92282de1e Merge branch 'chipiga'
Conflicts:
	app/controllers/application_controller.rb
	app/views/layouts/application.html.haml
	config/locales/ru.yml
	db/schema.rb
2011-10-20 19:55:03 +04:00
George Vinogradov 1659ad5805 Merge branch 'private_repos'
Conflicts:
	config/application.yml.sample
	config/locales/ru.yml
	config/routes.rb
	db/schema.rb
2011-10-20 19:49:35 +04:00
George Vinogradov 2dd99d32f9 Merge branch 'downloads'
First turn of merging.

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	config/locales/ru.yml
	config/routes.rb
	db/schema.rb
2011-10-20 19:22:11 +04:00
George Vinogradov 5732e999b1 Finished merging of master with itima_web_refactoring 2011-10-20 18:05:06 +04:00
Pavel Chipiga 5291752419 Add categories and apply basic CRUD actions. Add category link and description to project. Apply category assign to project. Apply categorization with platforms. Integrate to common design and layout. Import basic categories structure. Refs #1858 2011-10-19 23:58:31 +03:00
George Vinogradov ff36b1fdd3 Merge branch 'itima_web_refactoring'
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/user.rb
	app/views/layouts/application.html.haml
	config/locales/ru.yml
	config/routes.rb
	db/schema.rb
2011-10-19 18:09:58 +04:00
George Vinogradov 126e9e1db1 Merge branch 'itima_web_refactoring' of github.com:warpc/rosa-build into itima_web_refactoring
Conflicts:
	app/models/platform.rb
2011-10-19 17:23:23 +04:00
George Vinogradov ee9af32fa6 Adding projects to repositories. 2011-10-19 17:16:29 +04:00
Toljio e5438b29bc change roles/rights 2011-10-18 22:32:08 +04:00
santaux 5f17928423 [refs #1923] Add private repositories to project 2011-10-18 17:47:17 +04:00
Pavel Chipiga 099120e71b Fix bugs. Refs #1858 2011-10-17 19:07:53 +03:00
George Vinogradov 3c31bdf29c Changed Platforms representation 2011-10-17 18:27:07 +04:00
George Vinogradov 0d10c50710 Changed representation of Users 2011-10-17 18:23:51 +04:00
George Vinogradov b1a801f7f9 Added search form and changed group representation 2011-10-17 18:22:30 +04:00
George Vinogradov 5a6248c1af Changed representation of Projects 2011-10-17 18:21:29 +04:00
George Vinogradov 75cd0c7ae6 Changed representation of Repositories. 2011-10-17 18:20:35 +04:00
Pavel Chipiga 5f705cdd0d Develop and apply event logging mechanism without source code modification and with localization. Apply events log display with pagination. Apply XML RPC requests stub for local test. Refactor. Refs #1828 2011-10-17 11:04:36 +03:00
George Vinogradov fa3359b025 Some changes in representation 2011-10-17 00:50:56 +04:00
George Vinogradov d7cddecbe8 Changed User representation. 2011-10-17 00:49:41 +04:00
George Vinogradov f76a3aee39 Added groups representation. 2011-10-17 00:48:02 +04:00
santaux 8103b14e15 [refs #1861] Add downloads statistics 2011-10-14 10:35:25 +04:00
Pavel Chipiga 0efa8c83a2 Fix nickname format check. Apply readonly nickname field. Show flash notice during registration through OpenID. Fix email read from OpenID response. Refs #1954 2011-10-13 13:19:42 +03:00
Pavel Chipiga 77e03df70b Refactor gemfile and upgrade rails, devise and other gems, fix conflicts, remove deprecations. Implement user classic registration and registration through omniauth OpenId. Allow user enter correct nickname and change other info during registration through OpenId. Make login through nickname or email. Apply profile edit form. Dont ask current password for profile update. Fix layout and devise links. Refs #1954 2011-10-11 23:56:51 +03:00
Vladimir Sharshov ef8dd8f7f6 Show button only if status is succeed
Add additional check in model
2011-09-16 18:15:50 +04:00
Vladimir Sharshov 25c8a4ab62 Fix undefined method 'publish_platform_repository_project_build_list' 2011-09-16 18:01:55 +04:00
Vladimir Sharshov 02a9a46b60 Add publish function for BuildList 2011-09-15 21:56:20 +04:00
Alexey Nayden b25a174613 Clone confirm translation 2011-06-01 15:08:16 +04:00
Alexey Nayden 232eb9461e Platform clone ui 2011-05-30 13:04:32 +04:00
Timothy N. Tsvetkov 3a7258ccdb crontab generator: weekdays and months translations 2011-04-28 19:55:22 +04:00
Timothy N. Tsvetkov 4e3687c565 crontab hide/show button translations 2011-04-28 19:42:28 +04:00
Timothy N. Tsvetkov d999e6e438 minor in crontab generator + more translations in crontab generator 2011-04-28 19:36:28 +04:00
Timothy N. Tsvetkov 6d85ce883b crontab generator: setting generator values for existing objects 2011-04-28 19:22:25 +04:00
Timothy N. Tsvetkov 35483ce02f Merge branch 'master' of github.com:evilmartians/rosa-build 2011-04-28 18:32:20 +04:00
Timothy N. Tsvetkov c927abd073 added crontab to products without translations and setting values to generator form for existing crontab line 2011-04-28 18:32:11 +04:00
Alexey Nayden 315ede490e Projects filter 2011-04-28 15:01:58 +04:00
Timothy N. Tsvetkov 6c26db070d moved pagination 2011-04-28 11:36:58 +04:00
Timothy N. Tsvetkov 5a03f4b01f default paginattion 2011-04-28 11:33:03 +04:00
Timothy N. Tsvetkov fb2808b9e6 crontab generator without translations, because im in fucken ISRAELgit add app/controllers/crontabs_controller.rb app/views/crontabs/show.html.hamlgit add app/controllers/crontabs_controller.rb app/views/crontabs/show.html.haml Shalom LEOLAM 2011-04-18 16:34:06 +04:00
Timothy N. Tsvetkov 515ca84842 FUCK OFF JUMMIT 2011-04-15 17:20:48 +04:00
Alexey Nayden 38cef4d887 Minor product fixes 2011-04-15 13:23:12 +04:00
Timothy N. Tsvetkov 577cb2e126 added platform cloning and system_wide flag 2011-04-14 21:04:32 +04:00
Alexey Nayden fc3cd46943 Haml fix 2011-04-14 15:37:03 +04:00
Alexey Nayden 055dfe665d deleting tar for products on update 2011-04-14 14:28:24 +04:00
Alexey Nayden 856b93d3d8 Product management. Step 2 2011-04-14 11:23:08 +04:00
Alexey Nayden 231771890e Confilict resolve 2011-04-11 20:57:43 +04:00
Alexey Nayden dce4e76da1 Product management. Step 1 2011-04-11 20:55:52 +04:00
Timothy N. Tsvetkov 1a6330956b build list creation 2011-04-11 20:37:09 +04:00
Timothy N. Tsvetkov 4c5ef7e8f3 link to a build list 2011-04-11 14:50:09 +04:00
Timothy N. Tsvetkov 82869f57a7 build list items and more statuses 2011-04-11 14:47:57 +04:00
Timothy N. Tsvetkov 62d0985fcb more methods fot build lists, added is_circle build flag 2011-04-07 18:56:28 +04:00
Timothy N. Tsvetkov 4ac5931f44 fixes + build lists 2011-04-07 17:20:21 +04:00
Timothy N. Tsvetkov 8692995969 tag and branches selection 2011-04-04 20:00:24 +04:00
Timothy N. Tsvetkov 4f7c51b61f commit pagination + fixes 2011-04-04 17:49:08 +04:00
Timothy N. Tsvetkov 6120547800 AwEsOmE blame + minor fixes 2011-04-04 15:28:33 +04:00
Timothy N. Tsvetkov 74a4a3de13 minor C 2011-04-01 13:04:19 +04:00
Timothy N. Tsvetkov efbd64e924 the aWeSOME commit view (with REALLY AWESOME view for git diffs) 2011-04-01 07:44:21 +04:00
Timothy N. Tsvetkov 5135f048a5 some views for git 2011-04-01 04:36:34 +04:00
Timothy N. Tsvetkov 17797b956e Merge branch 'master' of github.com:evilmartians/rosa-build 2011-03-31 16:25:21 +04:00
Timothy N. Tsvetkov b39d069020 remove old view file 2011-03-31 16:25:16 +04:00
Alexey Nayden fd0ea4b2eb micro email fix 2011-03-31 16:23:26 +04:00
Alexey Nayden 327452e69b html email notification 2011-03-31 16:21:43 +04:00
Alexey Nayden c116f23b7e even more minor ui fixes 2011-03-31 16:13:04 +04:00
Alexey Nayden 0279f45b6b minor UI fixes 2011-03-31 15:43:41 +04:00
Timothy N. Tsvetkov a65bf7a4f8 new views for project 2011-03-31 05:56:20 +04:00
Timothy N. Tsvetkov e40cdbd9d3 translations for the menu 2011-03-31 05:25:33 +04:00
Timothy N. Tsvetkov 81745019cf new views for repositories 2011-03-31 05:15:17 +04:00
Timothy N. Tsvetkov 6f9683c686 added scope :recent to repository and show repositories on the platform page 2011-03-31 04:25:18 +04:00
Timothy N. Tsvetkov 2150b2ebf1 changed a bit jquey inclusion 2011-03-31 03:50:47 +04:00
Timothy N. Tsvetkov b81f18a04d render select box for possible parent platfroms in the platform creation form 2011-03-31 03:27:55 +04:00
Timothy N. Tsvetkov 5bed0adbf9 merge 2011-03-31 03:11:10 +04:00
Timothy N. Tsvetkov 309b037acf Paul Irish BUY BUY oMG, Using AWESOME web-app-theme 2011-03-31 03:10:23 +04:00
Alexey Nayden 10db1b74cf minor newline fix 2011-03-31 02:44:33 +04:00
Alexey Nayden c8e15a8c7a New user email fix 2011-03-31 02:11:37 +04:00
Alexey Nayden a3c3a2e3de Translation fix 2011-03-31 02:11:28 +04:00
Alexey Nayden 31102ef86a New user notification fix 2011-03-30 01:51:17 +04:00
Timothy N. Tsvetkov a53a0dea98 removed xxx 2011-03-29 21:55:32 +04:00
Timothy N. Tsvetkov 19bc0cb94f 0 downtime deploy test 2011-03-29 21:54:07 +04:00
Timothy N. Tsvetkov c567f97d12 removed xxx 2011-03-29 21:43:09 +04:00
Timothy N. Tsvetkov 885b5d627c sorry, this is a test commit for deploy 2011-03-29 21:35:51 +04:00
Timothy N. Tsvetkov 9eea2867d6 fixed a bit deploy 2011-03-29 21:06:21 +04:00
Timothy N. Tsvetkov f73c829a34 test 2011-03-29 20:59:02 +04:00
Timothy N. Tsvetkov c7fe38c6a8 playing with assets, jammit and compass 2011-03-29 20:35:42 +04:00
Timothy N. Tsvetkov db2e3dfd81 removed copyright 2011-03-29 19:06:57 +04:00
Timothy N. Tsvetkov 3b51d53225 freeze + spec 2011-03-17 17:47:16 +03:00
Timothy N. Tsvetkov 8f5f1aa91d creating git-repo when creating new project, showing empty repo 2011-03-15 14:24:45 +03:00
Timothy N. Tsvetkov 28e1b95e3d fix 2011-03-11 20:34:34 +03:00
Alexey Nayden 06d229a4b0 Release/Update folders 2011-03-11 20:25:08 +03:00
Timothy N. Tsvetkov 5bc5638934 friday fixes lets drink vodka for your money very well 2011-03-11 20:19:47 +03:00
Alexey Nayden 31ee2662ec Merge branch 'master' of github.com:evilmartians/rosa-build 2011-03-11 19:38:44 +03:00
Alexey Nayden 92b7d101e8 Devise l10n 2011-03-11 19:38:39 +03:00
Alexey Nayden 31e6d56475 L10n fix 2011-03-11 19:32:27 +03:00
Timothy N. Tsvetkov 7cce8520a9 Merge branch 'master' of github.com:evilmartians/rosa-build 2011-03-11 19:31:16 +03:00
Timothy N. Tsvetkov 9cb7540f19 gir tree fixes 2011-03-11 19:31:06 +03:00
Alexey Nayden 9609a682a6 Finishing migration to new hierarchy 2011-03-11 19:30:02 +03:00
Alexey Nayden 40b28e4a84 Trying to add repositories to my hierarchy (step 2) 2011-03-11 19:13:24 +03:00
Alexey Nayden 30e68b7e46 Merge branch 'master' of github.com:evilmartians/rosa-build 2011-03-11 13:25:58 +03:00
Alexey Nayden 5ce300adb9 Directory creation for projects/platforms 2011-03-11 13:25:50 +03:00
Timothy N. Tsvetkov a2ffc0b37d Merge branch 'master' of github.com:evilmartians/rosa-build 2011-03-11 13:06:27 +03:00
Timothy N. Tsvetkov 20af306073 git fixes 2011-03-11 13:06:14 +03:00
Alexey Nayden ba117737b7 Basic navigation 2011-03-11 12:39:34 +03:00
Alexey Nayden 0ff80b3e16 User management 2011-03-11 00:48:15 +03:00
Timothy N. Tsvetkov a373af936b sample view for the project 2011-03-10 17:20:09 +03:00
Timothy N. Tsvetkov a7d452332a the classic oops commit 2011-03-10 16:52:55 +03:00
Timothy N. Tsvetkov d564e4b145 view for git blobs 2011-03-10 16:47:42 +03:00
Timothy N. Tsvetkov 6bebe57a79 Merge branch 'master' of github.com:evilmartians/rosa-build 2011-03-10 16:39:55 +03:00
Timothy N. Tsvetkov 11ab8c0f39 views for commit 2011-03-10 16:39:49 +03:00
Alexey Nayden eccb4e0a6c Project/platform management 2011-03-10 16:38:50 +03:00
Timothy N. Tsvetkov e9b9e044f9 fixes and repository, tree view 2011-03-10 16:19:23 +03:00
Alexey Nayden 0a7c0e4e9b Platforms list + UI enchancements 2011-03-10 14:35:46 +03:00
Alexey Nayden af3c9b52be Hoptoad + blank platforms#index 2011-03-09 22:27:51 +03:00
Alexey Nayden 340e8697c7 Devise integration 2011-03-09 20:38:10 +03:00
Alexey Nayden eae3c46912 Initial commit 2011-03-09 16:13:36 +03:00