vangheem 
							
						 
					 
					
						
						
						
						
							
						
						
							4bd649e021 
							
						 
					 
					
						
						
							
							fix test  
						
						 
						
						
						
						
					 
					
						2015-05-30 19:28:22 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vangheem 
							
						 
					 
					
						
						
						
						
							
						
						
							e2192e5973 
							
						 
					 
					
						
						
							
							use modal pattern for comment edit  
						
						 
						
						
						
						
					 
					
						2015-05-30 15:20:32 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vangheem 
							
						 
					 
					
						
						
						
						
							
						
						
							68665b6f2b 
							
						 
					 
					
						
						
							
							Only use edit overlay if available for editing comments. We will need a plone 5 alternative  
						
						 
						
						
						
						
					 
					
						2015-05-30 11:45:02 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Low Kian Seong 
							
						 
					 
					
						
						
						
						
							
						
						
							da84d4d642 
							
						 
					 
					
						
						
							
							Fixing broken test on travis  
						
						 
						
						
						
						
					 
					
						2015-05-13 20:03:11 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gil Forcada Codinachs 
							
						 
					 
					
						
						
						
						
							
						
						
							4556486082 
							
						 
					 
					
						
						
							
							Merge pull request  #67  from plonejp/master  
						
						 
						
						... 
						
						
						
						Updated Japanese translation 
						
						
					 
					
						2015-05-11 08:39:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Takanori Suzuki 
							
						 
					 
					
						
						
						
						
							
						
						
							44e7f16636 
							
						 
					 
					
						
						
							
							fix fuzzy translation for japanese  
						
						 
						
						
						
						
					 
					
						2015-05-09 15:12:29 +09:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Takanori Suzuki 
							
						 
					 
					
						
						
						
						
							
						
						
							f745e7c976 
							
						 
					 
					
						
						
							
							update japanese translation  
						
						 
						
						
						
						
					 
					
						2015-05-09 15:05:35 +09:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vangheem 
							
						 
					 
					
						
						
						
						
							
						
						
							1a04b5b042 
							
						 
					 
					
						
						
							
							fix test failures with csrf protection and locking behavior  
						
						 
						
						
						
						
					 
					
						2015-05-08 12:06:29 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gil Forcada 
							
						 
					 
					
						
						
						
						
							
						
						
							7c8a1371ee 
							
						 
					 
					
						
						
							
							'X not in Y'  
						
						 
						
						
						
						
					 
					
						2015-05-03 08:56:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gil Forcada 
							
						 
					 
					
						
						
						
						
							
						
						
							dcb2a5f51b 
							
						 
					 
					
						
						
							
							2 spaces between top level classes  
						
						 
						
						
						
						
					 
					
						2015-05-03 08:43:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gil Forcada 
							
						 
					 
					
						
						
						
						
							
						
						
							8410b7525f 
							
						 
					 
					
						
						
							
							Do not redefine comment  
						
						 
						
						
						
						
					 
					
						2015-05-03 08:42:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gil Forcada 
							
						 
					 
					
						
						
						
						
							
						
						
							754e712372 
							
						 
					 
					
						
						
							
							Typo  
						
						 
						
						
						
						
					 
					
						2015-05-03 08:42:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gil Forcada 
							
						 
					 
					
						
						
						
						
							
						
						
							ce48a9ed46 
							
						 
					 
					
						
						
							
							2 spaces before inline comment  
						
						 
						
						
						
						
					 
					
						2015-05-03 08:41:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gil Forcada 
							
						 
					 
					
						
						
						
						
							
						
						
							8b883451ca 
							
						 
					 
					
						
						
							
							80 chars  
						
						 
						
						
						
						
					 
					
						2015-05-03 08:41:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gil Forcada 
							
						 
					 
					
						
						
						
						
							
						
						
							fad5a96129 
							
						 
					 
					
						
						
							
							Unused variable  
						
						 
						
						
						
						
					 
					
						2015-05-03 08:27:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gil Forcada 
							
						 
					 
					
						
						
						
						
							
						
						
							411f36e708 
							
						 
					 
					
						
						
							
							One argument per line  
						
						 
						
						
						
						
					 
					
						2015-05-03 08:27:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gil Forcada 
							
						 
					 
					
						
						
						
						
							
						
						
							2baafcbfd8 
							
						 
					 
					
						
						
							
							Typo  
						
						 
						
						
						
						
					 
					
						2015-05-03 08:25:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gil Forcada 
							
						 
					 
					
						
						
						
						
							
						
						
							0ade2c4329 
							
						 
					 
					
						
						
							
							'X not in Y' is recommended  
						
						 
						
						
						
						
					 
					
						2015-05-03 08:25:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gil Forcada 
							
						 
					 
					
						
						
						
						
							
						
						
							9066183ea9 
							
						 
					 
					
						
						
							
							2 lines between top level functions/classes  
						
						 
						
						
						
						
					 
					
						2015-05-03 08:24:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gil Forcada 
							
						 
					 
					
						
						
						
						
							
						
						
							4bc77a2831 
							
						 
					 
					
						
						
							
							Sort imports  
						
						 
						
						... 
						
						
						
						Remove unused ones as well. 
						
						
					 
					
						2015-05-03 08:16:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Takanori Suzuki 
							
						 
					 
					
						
						
						
						
							
						
						
							acae47c17a 
							
						 
					 
					
						
						
							
							update japanese translation  
						
						 
						
						
						
						
					 
					
						2015-04-29 17:57:23 +09:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manabu TERADA 
							
						 
					 
					
						
						
						
						
							
						
						
							b235f74f46 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:plone/plone.app.discussion  
						
						 
						
						... 
						
						
						
						Conflicts:
	plone/app/discussion/locales/ja/LC_MESSAGES/plone.app.discussion.po 
						
						
					 
					
						2015-04-29 17:39:14 +09:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Takanori Suzuki 
							
						 
					 
					
						
						
						
						
							
						
						
							b868b44ba0 
							
						 
					 
					
						
						
							
							update japanese translation  
						
						 
						
						
						
						
					 
					
						2015-04-29 17:27:40 +09:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David\ Beitey 
							
						 
					 
					
						
						
						
						
							
						
						
							285dbcd918 
							
						 
					 
					
						
						
							
							i18n for ICaptcha interface field  
						
						 
						
						
						
						
					 
					
						2015-03-23 18:06:29 +10:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Glick 
							
						 
					 
					
						
						
						
						
							
						
						
							8690461ffb 
							
						 
					 
					
						
						
							
							create doc1 in the text fixture rather than in setup for each test  
						
						 
						
						
						
						
					 
					
						2015-03-09 21:51:45 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gil Forcada 
							
						 
					 
					
						
						
						
						
							
						
						
							4ea41aba43 
							
						 
					 
					
						
						
							
							Fix tests  
						
						 
						
						
						
						
					 
					
						2015-02-16 16:35:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gil Forcada 
							
						 
					 
					
						
						
						
						
							
						
						
							d5b5b1c2cd 
							
						 
					 
					
						
						
							
							Fix total_comments indexer  
						
						 
						
						... 
						
						
						
						"@property removes Acquisition wrappers from 'self'.
I don't remember why exactly (some implementation detail of Acquisition),
but it's a fact of life."
Quote from @davisagli on
https://github.com/plone/plone.app.discussion/pull/58 
In short: removing the @property from total_comments fix the problem. 
						
						
					 
					
						2015-02-16 11:31:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gil Forcada 
							
						 
					 
					
						
						
						
						
							
						
						
							535af3aace 
							
						 
					 
					
						
						
							
							Count acquisition wrapped comments  
						
						 
						
						... 
						
						
						
						If the View permission is not set directly on the workflow,
but instead is left to be acquired,
total_comments will always return 0. 
						
						
					 
					
						2015-02-16 11:28:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gil Forcada 
							
						 
					 
					
						
						
						
						
							
						
						
							b4c1d9e42d 
							
						 
					 
					
						
						
							
							Sort imports  
						
						 
						
						... 
						
						
						
						As per the styleguide 
						
						
					 
					
						2015-02-16 10:22:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vangheem 
							
						 
					 
					
						
						
						
						
							
						
						
							bd0637e0b2 
							
						 
					 
					
						
						
							
							fix window load event to use  
						
						 
						
						
						
						
					 
					
						2015-02-11 16:30:03 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vangheem 
							
						 
					 
					
						
						
						
						
							
						
						
							c49c9707ec 
							
						 
					 
					
						
						
							
							more js improvements  
						
						 
						
						
						
						
					 
					
						2015-02-10 16:41:00 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vangheem 
							
						 
					 
					
						
						
						
						
							
						
						
							ad3953f794 
							
						 
					 
					
						
						
							
							use requirejs if available  
						
						 
						
						
						
						
					 
					
						2015-02-10 16:21:17 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Timo Stollenwerk 
							
						 
					 
					
						
						
						
						
							
						
						
							5f1a7fb5bc 
							
						 
					 
					
						
						
							
							Merge branch 'master' into plip10359-z3cform  
						
						 
						
						... 
						
						
						
						Conflicts:
	CHANGES.rst 
						
						
					 
					
						2015-01-29 21:31:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Timo Stollenwerk 
							
						 
					 
					
						
						
						
						
							
						
						
							c852609111 
							
						 
					 
					
						
						
							
							Merge branch 'master' into delete-own-comments  
						
						 
						
						... 
						
						
						
						Conflicts:
	CHANGES.rst 
						
						
					 
					
						2015-01-29 21:14:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Timo Stollenwerk 
							
						 
					 
					
						
						
						
						
							
						
						
							785bc7b890 
							
						 
					 
					
						
						
							
							Read mail settings from new (Plone 5) registry.  
						
						 
						
						
						
						
					 
					
						2014-12-13 16:20:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Diaz 
							
						 
					 
					
						
						
						
						
							
						
						
							609e9f61aa 
							
						 
					 
					
						
						
							
							Updated SPANISH .po file  
						
						 
						
						
						
						
					 
					
						2014-12-11 16:26:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Diaz 
							
						 
					 
					
						
						
						
						
							
						
						
							2a130ffeb1 
							
						 
					 
					
						
						
							
							Updated CATALAN .po file  
						
						 
						
						
						
						
					 
					
						2014-12-11 16:26:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								João Toss Molon 
							
						 
					 
					
						
						
						
						
							
						
						
							744b5b6380 
							
						 
					 
					
						
						
							
							Updated pt-br translation  
						
						 
						
						
						
						
					 
					
						2014-12-05 17:38:04 -02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gil Forcada 
							
						 
					 
					
						
						
						
						
							
						
						
							19026439dd 
							
						 
					 
					
						
						
							
							Use spaces please  
						
						 
						
						
						
						
					 
					
						2014-12-03 12:03:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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