Commit Graph

459 Commits

Author SHA1 Message Date
George Vinogradov 74d401d087 [issue #133] Writed draft of web editing. 2012-02-08 21:51:30 +04:00
Alexander Machehin fde67a2c22 [refs #134] add post receive hook to repos 2012-02-06 15:31:22 +06: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
George Vinogradov 0006bf3b63 Returned before_initialize to Group. 2012-02-02 01:20:10 +04:00
Alexander Machehin cb7a9fcc21 fix group autocomplete 2012-02-02 02:42:23 +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
Pavel Chipiga 34b105675a Add 1 more mime type to product 2012-01-31 23:29:25 +02:00
Pavel Chipiga fde298cc85 Rollback to redhillonrails_core instead of schema_plus to avoid some bugs. Add platform reference to project_imports, change indexes and validators. Adjust sync algoritm to use platform_id. Improve rsync params. Refs #112, #138 2012-01-31 20:48:37 +02: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 13780a1b53 Add magic encodings. Refs #95 2012-01-30 22:39:34 +02: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
Alexander Machehin 119c378149 [refs #114] change subsrcibe status to boolean 2012-01-30 17:59:57 +06: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
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 8962e85b2d [refs #114] fix reverting 2012-01-30 12:38:31 +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 ea7cbe1908 Revert "[refs #114] fix emails uniqueness"
This reverts commit bc9649561f5b8ac58f9b27d31d66365f16d0cce0.

Conflicts:

	app/models/subscribe.rb
	app/models/user_email.rb
2012-01-30 12:15:33 +06:00
Alexander Machehin 2e2e7e43d3 [refs #114] some refactoring 2012-01-30 02:18:14 +06:00
Alexander Machehin 39a4479fa3 [refs #114] fix emails uniqueness 2012-01-29 22:27:46 +06:00
Pavel Chipiga 43a4aecc66 Change indexes to composite, unique, case insensitive. Redo sync logging. Verbose params for tasks. Refs #112 2012-01-28 04:05:31 +02:00
Pavel Chipiga fab4aa6eb6 Refactor and fix projects by_name scope. Apply case insensitive projects, repositories and platforms name uniqness validation. Apply case insensitive project search fallback. Redirect import task outnput to log file. Rename all task. Refs #112 2012-01-28 03:04:11 +02:00
Vladimir Sharshov e966e523e9 Merge pull request #132 from warpc/112-sync_projects
Auto sync for mandriva repo

* Apply rsync for mandriva repo
* Parse and import changes from official repo
* Fix attachment types
* Redo srpm upload wrapper to use it without paperclip
* Add cron task through whenever
2012-01-27 08:46:58 -08:00
Pavel Chipiga 74f891fc83 Apply rsync for mandriva repo. Parse and import changes from official repo. Fix attachment types. Redo srpm upload wrapper to use it without paperclip. Add cron task through whenever. Refs #112 2012-01-27 17:35:18 +02: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
George Vinogradov eed3040944 [issue #64] Changed validation message and removed unnecessary
validation of projects owner.
2012-01-27 10:13:56 +04:00
Vladimir Sharshov 45c175942b Temporary change arch for mass rebuild 2012-01-27 05:00:44 +04:00
George Vinogradov 2d1e36fb1a [issue #64] Changed own_projects validation. 2012-01-27 04:16:07 +04:00
George Vinogradov ba84d5f216 [issue #64] Added validation of own_projects count. 2012-01-27 03:37:19 +04:00
George Vinogradov 1498e937f6 [issue #64] Added own_projects counters to User & Group 2012-01-27 02:33:18 +04:00
Alexander Machehin e71a9e84cb [refs #114] emails control 2012-01-27 02:11:07 +06: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
Pavel Chipiga 60c1153d49 Save with validation. Refs #31 2012-01-24 23:29:23 +02: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
Vladimir Sharshov 7e1a26000e Fix for "undefined method `<<' for nil:NilClass" 2012-01-24 01:12:42 +04:00
Alexander Machehin 9127b6b689 [refs #114] changed logics 2012-01-24 01:42:54 +06:00
Vladimir Sharshov c3f415e90c Add new build status for Item 2012-01-23 22:11:53 +04:00
Vladimir Sharshov e1a4dd5ab5 Fix branch name for mass rebuild
Fix error in include_repos
2012-01-23 21:07:09 +04:00
Vladimir Sharshov 733adaf111 Update build_for for new requirements 2012-01-23 20:19:10 +04:00
Alexander Machehin 651c5637ed [refs #114] fix committer notification 2012-01-22 23:49:41 +06:00