Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								5792c62068 
								
							 
						 
						
							
							
								
								Merge pull request  #137  from miicha/master  
							
							... 
							
							
							
							raw sketch of ratings category 
							
						 
						
							2014-03-10 10:35:52 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael 
								
							 
						 
						
							
							
							
							
								
							
							
								790f9f6888 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/seblucas/master'  
							
							... 
							
							
							
							Conflicts:
	lang/Localization_nl.json 
							
						 
						
							2014-03-05 15:39:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								94072c440e 
								
							 
						 
						
							
							
								
								Merge pull request  #140  from miicha/patch-1  
							
							... 
							
							
							
							fix server side render 
							
						 
						
							2014-03-05 11:48:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael 
								
							 
						 
						
							
							
							
							
								
							
							
								1ad15d410c 
								
							 
						 
						
							
							
								
								adding ratings category to possible ignores and merge lang update (nl)  
							
							... 
							
							
							
							had to change rating.title to ratings.title due to $keyPlural in base.php#L997 
							
						 
						
							2014-03-05 11:15:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									miicha 
								
							 
						 
						
							
							
							
							
								
							
							
								0e6ef2fcd9 
								
							 
						 
						
							
							
								
								fix server side render  
							
							... 
							
							
							
							on devices listet in $config['cops_server_side_render'] a blank page was shown and apache error log reported all to undefined function getJson() in index.php 
							
						 
						
							2014-03-05 10:46:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								cb07d38590 
								
							 
						 
						
							
							
								
								Merge pull request  #139  from edent/master  
							
							... 
							
							
							
							Adding <meta charset="utf-8"> to relevant files 
							
						 
						
							2014-03-04 20:47:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								c200a54466 
								
							 
						 
						
							
							
								
								Reorder the script so that code coverage is run even for PR.  
							
							... 
							
							
							
							--HG--
extra : rebase_source : f8b07b7ebee8fb39978bd54d3a3ef5c30c4e5051 
							
						 
						
							2014-03-03 14:06:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									edent 
								
							 
						 
						
							
							
							
							
								
							
							
								549a975a76 
								
							 
						 
						
							
							
								
								Revert monocore changes  
							
							
							
						 
						
							2014-03-02 21:12:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								7a49600d4a 
								
							 
						 
						
							
							
								
								Merge pull request  #138  from Northguy/patch-2  
							
							... 
							
							
							
							Update Localization_nl.json 
							
						 
						
							2014-03-02 21:25:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								3ad6a396a6 
								
							 
						 
						
							
							
								
								Ignore the real configuration file  
							
							
							
						 
						
							2014-03-02 21:11:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									edent 
								
							 
						 
						
							
							
							
							
								
							
							
								ea92159631 
								
							 
						 
						
							
							
								
								Adding missing <h4>  
							
							
							
						 
						
							2014-03-02 16:12:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									edent 
								
							 
						 
						
							
							
							
							
								
							
							
								b2a4f349eb 
								
							 
						 
						
							
							
								
								Adding <meta charset="utf-8"> to relevant files  
							
							
							
						 
						
							2014-03-01 12:09:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Northguy 
								
							 
						 
						
							
							
							
							
								
							
							
								721b2a1958 
								
							 
						 
						
							
							
								
								Update Localization_nl.json  
							
							
							
						 
						
							2014-02-28 11:40:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Northguy 
								
							 
						 
						
							
							
							
							
								
							
							
								d68a836422 
								
							 
						 
						
							
							
								
								Update Localization_nl.json  
							
							... 
							
							
							
							Removed the ##TODO##'s ;-) 
							
						 
						
							2014-02-28 11:39:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael 
								
							 
						 
						
							
							
							
							
								
							
							
								5bc134ad80 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master'  
							
							
							
						 
						
							2014-02-28 11:10:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael 
								
							 
						 
						
							
							
							
							
								
							
							
								fa61d0e4ed 
								
							 
						 
						
							
							
								
								ratings detail title  
							
							
							
						 
						
							2014-02-28 11:10:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Northguy 
								
							 
						 
						
							
							
							
							
								
							
							
								78c551218b 
								
							 
						 
						
							
							
								
								Update Localization_nl.json  
							
							... 
							
							
							
							Updated translation for "Publishers" to "Uitgever" 
							
						 
						
							2014-02-28 07:45:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Micha 
								
							 
						 
						
							
							
							
							
								
							
							
								1047244270 
								
							 
						 
						
							
							
								
								next fix of pageTest (due to ratings)  
							
							
							
						 
						
							2014-02-27 22:17:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael 
								
							 
						 
						
							
							
							
							
								
							
							
								2c40201e58 
								
							 
						 
						
							
							
								
								pageTest fixes (due to new rating tab)  
							
							
							
						 
						
							2014-02-27 19:37:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael 
								
							 
						 
						
							
							
							
							
								
							
							
								b903f52bad 
								
							 
						 
						
							
							
								
								ratings category language strings (english and german)  
							
							
							
						 
						
							2014-02-27 19:14:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael 
								
							 
						 
						
							
							
							
							
								
							
							
								4c234a84f1 
								
							 
						 
						
							
							
								
								ratings category fixes  
							
							
							
						 
						
							2014-02-27 11:44:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									michael 
								
							 
						 
						
							
							
							
							
								
							
							
								4b7743397b 
								
							 
						 
						
							
							
								
								raw sketch of ratings category  
							
							
							
						 
						
							2014-02-27 00:33:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								4c4cd05eb1 
								
							 
						 
						
							
							
								
								Update the url, maybe it's the cause of Sauce fail ?  
							
							
							
						 
						
							2014-02-24 17:23:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								6014cdc601 
								
							 
						 
						
							
							
								
								Merge pull request  #136  from scorphus/localization-pt  
							
							... 
							
							
							
							Update Brazilian Portuguese language file 
							
						 
						
							2014-02-24 11:25:05 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pablo Aguiar 
								
							 
						 
						
							
							
							
							
								
							
							
								bf23ec6a1a 
								
							 
						 
						
							
							
								
								Update Brazilian Portuguese language file  
							
							
							
						 
						
							2014-02-23 20:39:57 -03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								56e830aec6 
								
							 
						 
						
							
							
								
								Add new test for mail  
							
							
							
						 
						
							2014-02-21 20:38:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								9753938a2e 
								
							 
						 
						
							
							
								
								Prepare the code to test properly sendtomail.php  
							
							
							
						 
						
							2014-02-21 08:15:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								15fe0401bc 
								
							 
						 
						
							
							
								
								Finish the test for Monocle url rewriting (epubfs). re  #52  
							
							
							
						 
						
							2014-02-20 08:49:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								4993d08cdb 
								
							 
						 
						
							
							
								
								Update the navbar and change the style of the header. re  #79  
							
							
							
						 
						
							2014-02-17 17:35:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								3fdfbee5ea 
								
							 
						 
						
							
							
								
								Remove the container from the document and move it to the main. re  #79  
							
							
							
						 
						
							2014-02-17 17:34:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								04bee2b16b 
								
							 
						 
						
							
							
								
								Add ignore file for SublimeText  
							
							
							
						 
						
							2014-02-16 17:52:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								c07446a5c4 
								
							 
						 
						
							
							
								
								Remove placeholder. re  #79  
							
							
							
						 
						
							2014-02-16 16:59:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								8803152273 
								
							 
						 
						
							
							
								
								Move all default styles in the templates directory. re  #79  
							
							... 
							
							
							
							--HG--
rename : styles/FontAwesome.otf => templates/default/styles/FontAwesome.otf
rename : styles/font-awesome.css => templates/default/styles/font-awesome.css
rename : styles/fontawesome-webfont.eot => templates/default/styles/fontawesome-webfont.eot
rename : styles/fontawesome-webfont.svg => templates/default/styles/fontawesome-webfont.svg
rename : styles/fontawesome-webfont.ttf => templates/default/styles/fontawesome-webfont.ttf
rename : styles/fontawesome-webfont.woff => templates/default/styles/fontawesome-webfont.woff
rename : styles/style-base.css => templates/default/styles/style-base.css
rename : styles/style-default.css => templates/default/styles/style-default.css
rename : styles/style-eink.css => templates/default/styles/style-eink.css
rename : styles/style-iphone.css => templates/default/styles/style-iphone.css 
							
						 
						
							2014-02-16 16:55:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								96288dcb12 
								
							 
						 
						
							
							
								
								Placeholder  
							
							
							
						 
						
							2014-02-16 16:50:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								ba18c1ad76 
								
							 
						 
						
							
							
								
								Remove trailing spaces  
							
							
							
						 
						
							2014-02-16 09:36:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								7f9cf87cb6 
								
							 
						 
						
							
							
								
								Add a basic test for the header generation.  
							
							
							
						 
						
							2014-02-14 17:10:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								cc4f5e892f 
								
							 
						 
						
							
							
								
								Another test  
							
							
							
						 
						
							2014-02-14 16:50:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								6213a0e499 
								
							 
						 
						
							
							
								
								Add basic test to Json_renderer  
							
							
							
						 
						
							2014-02-13 21:32:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								655589d407 
								
							 
						 
						
							
							
								
								Duplicate  
							
							
							
						 
						
							2014-02-13 18:03:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								5bc09db6fb 
								
							 
						 
						
							
							
								
								Fix some problem with Monocle and add unit test. re  #52  
							
							
							
						 
						
							2014-02-13 13:51:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								40de093311 
								
							 
						 
						
							
							
								
								unused variables  
							
							
							
						 
						
							2014-02-13 11:07:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								e116655de7 
								
							 
						 
						
							
							
								
								Fix warning  
							
							
							
						 
						
							2014-02-13 11:07:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								ddb461d0ae 
								
							 
						 
						
							
							
								
								Simplify the test  
							
							
							
						 
						
							2014-02-12 14:09:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								01ba1a2342 
								
							 
						 
						
							
							
								
								Fix another issue  
							
							
							
						 
						
							2014-02-12 04:20:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								237a2ff39a 
								
							 
						 
						
							
							
								
								unused.  
							
							
							
						 
						
							2014-02-12 03:56:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								ed7b91633f 
								
							 
						 
						
							
							
								
								Not needed anymore with the return false.  
							
							
							
						 
						
							2014-02-12 03:55:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								9785d229de 
								
							 
						 
						
							
							
								
								Again  
							
							
							
						 
						
							2014-02-11 21:05:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								42492b5cf2 
								
							 
						 
						
							
							
								
								replace split by preg_split  
							
							
							
						 
						
							2014-02-11 21:00:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								e8088771c9 
								
							 
						 
						
							
							
								
								Forgot the book ... :(  
							
							
							
						 
						
							2014-02-11 20:54:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								755d6581ff 
								
							 
						 
						
							
							
								
								Add a test for the epubfs handler.  
							
							
							
						 
						
							2014-02-11 20:51:26 +01:00