Victor Fernandez de Alba 
							
						 
					 
					
						
						
						
						
							
						
						
							30c88842c0 
							
						 
					 
					
						
						
							
							Reapplied on correct branch.  
						
						 
						
						... 
						
						
						
						Revert "Revert "Update tag for id=content element to article instead of a simple div.""
This reverts commit 45f58edd061bca9c9c5f2290e7908273665239d5. 
						
						
					 
					
						2014-10-09 13:30:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vincent Fretin 
							
						 
					 
					
						
						
						
						
							
						
						
							06b20b8f81 
							
						 
					 
					
						
						
							
							merge fix from master (Don't execute createReplyForm js if there is no in_reply_to button)  
						
						 
						
						
						
						
					 
					
						2014-10-09 11:44:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vincent Fretin 
							
						 
					 
					
						
						
						
						
							
						
						
							838f229726 
							
						 
					 
					
						
						
							
							Don't execute createReplyForm js if there is no in_reply_to button.  
						
						 
						
						
						
						
					 
					
						2014-10-09 11:41:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vincent Fretin 
							
						 
					 
					
						
						
						
						
							
						
						
							acacc8281a 
							
						 
					 
					
						
						
							
							add a test for delete-own-comment view  
						
						 
						
						
						
						
					 
					
						2014-09-20 16:21:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vincent Fretin 
							
						 
					 
					
						
						
						
						
							
						
						
							2a8082cfa7 
							
						 
					 
					
						
						
							
							add delete_own_comment_enabled option in control panel  
						
						 
						
						
						
						
					 
					
						2014-09-20 16:02:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vincent Fretin 
							
						 
					 
					
						
						
						
						
							
						
						
							42d12200a7 
							
						 
					 
					
						
						
							
							Don't use session at all for content rules, set the event in the request to be able to access comment attributes. This fixes 'InvalidObjectReference: A new object is reachable from multiple databases.' if comment contains a RichTextValue which contains a RawValueHolder (persistent object).  
						
						 
						
						
						
						
					 
					
						2014-09-20 14:54:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vincent Fretin 
							
						 
					 
					
						
						
						
						
							
						
						
							ee28528f55 
							
						 
					 
					
						
						
							
							Don't use session at all for content rules, set the event in the request to be able to access comment attributes. This fixes 'InvalidObjectReference: A new object is reachable from multiple databases.' if comment contains a RichTextValue which contains a RawValueHolder (persistent object).  
						
						 
						
						
						
						
					 
					
						2014-09-20 14:14:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Desvenain 
							
						 
					 
					
						
						
						
						
							
						
						
							a94b3249a9 
							
						 
					 
					
						
						
							
							fixed can_delete called from parent  
						
						 
						
						
						
						
					 
					
						2014-09-05 11:11:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gil Forcada 
							
						 
					 
					
						
						
						
						
							
						
						
							fa127ad85c 
							
						 
					 
					
						
						
							
							Whitespaces cleanup  
						
						 
						
						
						
						
					 
					
						2014-08-23 00:31:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jens W. Klein 
							
						 
					 
					
						
						
						
						
							
						
						
							2ba35bb0d4 
							
						 
					 
					
						
						
							
							merge fixed  
						
						 
						
						
						
						
					 
					
						2014-08-17 04:54:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jens W. Klein 
							
						 
					 
					
						
						
						
						
							
						
						
							62b2990b7c 
							
						 
					 
					
						
						
							
							merged master  
						
						 
						
						
						
						
					 
					
						2014-08-17 04:48:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Victor Fernandez de Alba 
							
						 
					 
					
						
						
						
						
							
						
						
							45f58edd06 
							
						 
					 
					
						
						
							
							Revert "Update tag for id=content element to article instead of a simple div."  
						
						 
						
						... 
						
						
						
						This reverts commit 0165f1b73c5a9c14e0ea1923fccef861b25084ca. 
						
						
					 
					
						2014-08-11 14:11:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Victor Fernandez de Alba 
							
						 
					 
					
						
						
						
						
							
						
						
							0165f1b73c 
							
						 
					 
					
						
						
							
							Update tag for id=content element to article instead of a simple div.  
						
						 
						
						
						
						
					 
					
						2014-08-11 14:09:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ammy2 
							
						 
					 
					
						
						
						
						
							
						
						
							002c81427e 
							
						 
					 
					
						
						
							
							Id for textarea of reply form made unique  
						
						 
						
						
						
						
					 
					
						2014-06-25 02:32:48 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrea Cecchi 
							
						 
					 
					
						
						
						
						
							
						
						
							e9a4dcfc52 
							
						 
					 
					
						
						
							
							relaunched i18ndude and fix italian translations  
						
						 
						
						
						
						
					 
					
						2014-05-16 17:39:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrea Cecchi 
							
						 
					 
					
						
						
						
						
							
						
						
							4f255a355d 
							
						 
					 
					
						
						
							
							rebased CHANGES and tests  
						
						 
						
						
						
						
					 
					
						2014-05-15 17:51:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrea Cecchi 
							
						 
					 
					
						
						
						
						
							
						
						
							e453e0050b 
							
						 
					 
					
						
						
							
							fixed HISTORY and add delete test to test_comments_viewlet  
						
						 
						
						
						
						
					 
					
						2014-05-15 17:51:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrea Cecchi 
							
						 
					 
					
						
						
						
						
							
						
						
							f67f12bd05 
							
						 
					 
					
						
						
							
							fixed upgrade step  
						
						 
						
						
						
						
					 
					
						2014-05-15 17:51:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrea Cecchi 
							
						 
					 
					
						
						
						
						
							
						
						
							9a4e3718fc 
							
						 
					 
					
						
						
							
							added Delete comments permission to manage comments deletion  
						
						 
						
						
						
						
					 
					
						2014-05-15 17:51:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrea Cecchi 
							
						 
					 
					
						
						
						
						
							
						
						
							fd16144b9b 
							
						 
					 
					
						
						
							
							fixed edit test  
						
						 
						
						
						
						
					 
					
						2014-05-15 17:51:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrea Cecchi 
							
						 
					 
					
						
						
						
						
							
						
						
							3711d2fb5f 
							
						 
					 
					
						
						
							
							rebased branch from master  
						
						 
						
						
						
						
					 
					
						2014-05-15 17:51:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Guido A.J. Stevens 
							
						 
					 
					
						
						
						
						
							
						
						
							520b1e83f4 
							
						 
					 
					
						
						
							
							provide "delete own comments" as a configurable option  
						
						 
						
						
						
						
					 
					
						2014-05-15 17:50:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Guido A.J. Stevens 
							
						 
					 
					
						
						
						
						
							
						
						
							a82352a36c 
							
						 
					 
					
						
						
							
							Make comments editable  
						
						 
						
						
						
						
					 
					
						2014-05-15 17:50:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Timo Stollenwerk 
							
						 
					 
					
						
						
						
						
							
						
						
							2b18d5a2e4 
							
						 
					 
					
						
						
							
							Revert "Merge pull request  #38  from delib/evilbungle-comment-acquisition"  
						
						 
						
						... 
						
						
						
						This reverts commit e18598e316e824795e752e7bb1c90ee37dc1cc6f, reversing
changes made to fd6ac0788bf3ade982e60ede7ceda26b0c0e598e.
This pull request introduces two test failures. See http://jenkins.plone.org/job/plone-5.0-python-2.7/lastCompletedBuild/testReport/  for details. 
						
						
					 
					
						2014-05-13 07:07:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Timo Stollenwerk 
							
						 
					 
					
						
						
						
						
							
						
						
							e18598e316 
							
						 
					 
					
						
						
							
							Merge pull request  #38  from delib/evilbungle-comment-acquisition  
						
						 
						
						... 
						
						
						
						Fixing incorrect behaviour with acquired permissions 
						
						
					 
					
						2014-05-12 22:53:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Timo Stollenwerk 
							
						 
					 
					
						
						
						
						
							
						
						
							fd6ac0788b 
							
						 
					 
					
						
						
							
							Merge pull request  #43  from plone/remove-dt-dl-dd  
						
						 
						
						... 
						
						
						
						Remove DL's from portal message in templates. 
						
						
					 
					
						2014-05-12 20:52:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alin Voinea 
							
						 
					 
					
						
						
						
						
							
						
						
							fe91d7801e 
							
						 
					 
					
						
						
							
							Add tests for custom events and contentrules events/string substitutions  
						
						 
						
						
						
						
					 
					
						2014-05-12 20:20:18 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jens W. Klein 
							
						 
					 
					
						
						
						
						
							
						
						
							311eef63eb 
							
						 
					 
					
						
						
							
							Merge pull request  #48  from l34marr/translation  
						
						 
						
						... 
						
						
						
						Update Traditional Chinese Translation. 
						
						
					 
					
						2014-05-12 10:39:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tisto 
							
						 
					 
					
						
						
						
						
							
						
						
							22ed06b66d 
							
						 
					 
					
						
						
							
							Add second robot test to test adding comments.  
						
						 
						
						
						
						
					 
					
						2014-05-02 13:42:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tisto 
							
						 
					 
					
						
						
						
						
							
						
						
							f894d47d62 
							
						 
					 
					
						
						
							
							Add basic robot test setup and a first test.  
						
						 
						
						
						
						
					 
					
						2014-05-02 13:22:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								TsungWei Hu 
							
						 
					 
					
						
						
						
						
							
						
						
							6ced9ed0a5 
							
						 
					 
					
						
						
							
							Update Traditional Chinese Translation.  
						
						 
						
						
						
						
					 
					
						2014-05-02 18:30:08 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gaudenz Steinlin 
							
						 
					 
					
						
						
						
						
							
						
						
							fa17c51a7b 
							
						 
					 
					
						
						
							
							Replace $.live with $.on  
						
						 
						
						... 
						
						
						
						This is needed for jQuery >= 1.9 compatibility and is compatible with
JQuery >= 1.7 (Plone 4.3 onwards). 
						
						
					 
					
						2014-04-28 18:06:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alin Voinea 
							
						 
					 
					
						
						
						
						
							
						
						
							6565dfe19e 
							
						 
					 
					
						
						
							
							i18n update  
						
						 
						
						
						
						
					 
					
						2014-04-18 17:26:27 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alin Voinea 
							
						 
					 
					
						
						
						
						
							
						
						
							28d7556c92 
							
						 
					 
					
						
						
							
							Remove hard dependency on plone.stringinterp  
						
						 
						
						
						
						
					 
					
						2014-04-18 16:42:06 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alin Voinea 
							
						 
					 
					
						
						
						
						
							
						
						
							13830715a7 
							
						 
					 
					
						
						
							
							Add custom content rules string substitutions  
						
						 
						
						... 
						
						
						
						- Add content rules string substitutions for comment:
  - id
  - text
  - author email
  - author user name
  - author full name 
						
						
					 
					
						2014-04-18 16:36:06 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alin Voinea 
							
						 
					 
					
						
						
						
						
							
						
						
							ab926d6a10 
							
						 
					 
					
						
						
							
							Update change log  
						
						 
						
						... 
						
						
						
						Conflicts:
	CHANGES.rst 
						
						
					 
					
						2014-04-18 16:35:45 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alin Voinea 
							
						 
					 
					
						
						
						
						
							
						
						
							14d4382ca6 
							
						 
					 
					
						
						
							
							Use commented object as context instead of comment within event trigger  
						
						 
						
						... 
						
						
						
						- In order this to work with plone.contentrules use commented object as
  the main context within custom discussion events and add comment as the
  second parameter. 
						
						
					 
					
						2014-04-18 16:33:12 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alin Voinea 
							
						 
					 
					
						
						
						
						
							
						
						
							4343197209 
							
						 
					 
					
						
						
							
							Trigger custom comment events on comment add/remove/reply  
						
						 
						
						... 
						
						
						
						Conflicts:
	plone/app/discussion/interfaces.py 
						
						
					 
					
						2014-04-18 16:32:43 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jens W. Klein 
							
						 
					 
					
						
						
						
						
							
						
						
							2729f5a7e9 
							
						 
					 
					
						
						
							
							required showed up, but validation needs it on field too. huh. this is not what i expected, but, well, its z3cforms  
						
						 
						
						
						
						
					 
					
						2014-03-26 11:27:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jens W. Klein 
							
						 
					 
					
						
						
						
						
							
						
						
							6bfa19411d 
							
						 
					 
					
						
						
							
							bugfix 1: according to IDiscussionSettings.anonymous_email_enabled (cite):  
						
						 
						
						... 
						
						
						
						If selected, anonymous user will have to give their email. - But field
was not required. Now it is.
bugfix 2: anonymous email field was never saved. 
						
						
					 
					
						2014-03-25 21:30:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jens W. Klein 
							
						 
					 
					
						
						
						
						
							
						
						
							9575a0436a 
							
						 
					 
					
						
						
							
							synced with recent i18ndude and updated missing german translations  
						
						 
						
						
						
						
					 
					
						2014-03-25 19:14:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jens W. Klein 
							
						 
					 
					
						
						
						
						
							
						
						
							14263973f0 
							
						 
					 
					
						
						
							
							synced with recent i18ndude and updated missing german translations (mostly in settings form)  
						
						 
						
						
						
						
					 
					
						2014-03-25 19:13:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jens W. Klein 
							
						 
					 
					
						
						
						
						
							
						
						
							0a6d429237 
							
						 
					 
					
						
						
							
							corrected outdated help text  
						
						 
						
						
						
						
					 
					
						2014-03-25 18:53:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jens W. Klein 
							
						 
					 
					
						
						
						
						
							
						
						
							334b01f9ff 
							
						 
					 
					
						
						
							
							run of update translations. nothing really changed. anyway, no we're sure. next: missing translations (de)  
						
						 
						
						
						
						
					 
					
						2014-03-25 18:39:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jens W. Klein 
							
						 
					 
					
						
						
						
						
							
						
						
							6609ab6af5 
							
						 
					 
					
						
						
							
							make flake8 happy  
						
						 
						
						
						
						
					 
					
						2014-03-25 18:38:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jens W. Klein 
							
						 
					 
					
						
						
						
						
							
						
						
							a145413ac2 
							
						 
					 
					
						
						
							
							make flake8 happy  
						
						 
						
						
						
						
					 
					
						2014-03-25 18:37:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jens W. Klein 
							
						 
					 
					
						
						
						
						
							
						
						
							67213b70eb 
							
						 
					 
					
						
						
							
							make flake8 happy  
						
						 
						
						
						
						
					 
					
						2014-03-25 18:36:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tisto 
							
						 
					 
					
						
						
						
						
							
						
						
							01641b4957 
							
						 
					 
					
						
						
							
							Merge branch 'fix_reindex_on_publish' of git://github.com/RedTurtle/plone.app.discussion into RedTurtle-fix_reindex_on_publish  
						
						 
						
						
						
						
					 
					
						2014-03-24 20:49:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tisto 
							
						 
					 
					
						
						
						
						
							
						
						
							9c9c2e2aaa 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://github.com/huubbouma/plone.app.discussion into huubbouma-master  
						
						 
						
						... 
						
						
						
						Conflicts:
	CHANGES.rst 
						
						
					 
					
						2014-03-23 18:54:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								maartenkling 
							
						 
					 
					
						
						
						
						
							
						
						
							0ea9a7131f 
							
						 
					 
					
						
						
							
							merge upstream and fix numbering  
						
						 
						
						
						
						
					 
					
						2014-03-04 09:16:36 +01:00