Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,673 Commits 30 Branches 0 Tags 24 MiB
Commit Graph

39 Commits

Author SHA1 Message Date
Alexander Machehin 13ba125dc0 [refs #265] add project_id to comment & fix email notification 2012-03-07 03:49:29 +06:00
Alexander Machehin 0f823bd9f3 [refs #265] fix security & commit to comments 2012-03-07 02:51:51 +06:00
Pavel Chipiga 56a12dc9ea Merge branch 'master' into 3.2-master 
Conflicts:
	app/models/comment.rb
	app/models/issue.rb
	config/locales/en.yml
 2012-03-03 01:38:43 +02:00
Alexander Machehin 56b9371ee2 [refs #194] add default scope for comments 2012-03-02 01:10:12 +06: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 3685eafe57 Remove unused code [Refs #207] 2012-02-24 19:35:29 +04:00
Alexander Machehin da0d791f74 [refs #96] fixed commentable & subscribeable ids 2012-02-15 02:28:01 +06: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
konstantin.grabar 96d3b35bdf [refs #123] Merge master into 123-activity-feed 2012-02-06 19:46:32 +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
Pavel Chipiga 13780a1b53 Add magic encodings. Refs #95 2012-01-30 22:39:34 +02:00
Alexander Machehin 119c378149 [refs #114] change subsrcibe status to boolean 2012-01-30 17:59:57 +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 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
Alexander Machehin e71a9e84cb [refs #114] emails control 2012-01-27 02:11:07 +06:00
Alexander Machehin 4cca8f7bb1 [refs #114] some refactoring 2012-01-25 23:33:26 +06:00
konstantin.grabar 990a46018c [refs #123] Add base logic for activity feed 2012-01-25 12:31:49 +04: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
Alexander Machehin 36a895385c [refs #114] changed rules 2012-01-22 01:13:33 +06:00
Alexander Machehin 21d422c313 [refs #114] refactoring subscribe 2012-01-21 19:32:22 +06:00
Alexander Machehin d8df6c6279 [refs #114] committer subscribe + some tests 2012-01-21 00:22:25 +06:00
Alexander Machehin 371abac031 [refs #114] fix controller tests 2012-01-20 21:17:05 +06:00
Alexander Machehin 800b02f544 [refs #18] Add project subsribe, tests 2012-01-20 00:20:03 +06:00
Alexander Machehin dba11f4662 [refs #114] FIXME subscribers 2012-01-19 01:12:52 +06:00
Alexander Machehin 80ba40f6ee Merge branch 'master' into 18-commit_comments 
rspec spec/ = 528 examples, 12 failures
 2012-01-17 00:52:16 +06:00
konstantin.grabar a1a92e9878 [refs #54] Fix comments serial_id routing and some logic 2012-01-13 20:07:46 +04:00
konstantin.grabar db0a66846b [refs #94] Add new notifier rules. Fix some issues and comments bugs 2012-01-13 19:07:01 +04:00
Alexander Machehin caf7adef70 [refs #18] FIXME subscribe don't work 2012-01-12 20:50:27 +06:00
konstantin.grabar 980e455b31 [refs #54] Fix comment deliver notification user check 2012-01-12 17:45:22 +04: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
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
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
konstantin.grabar ce6746f7a9 [refs #54] Add subscribes and notifications 2011-12-26 19:48:57 +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