Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	7cb3a772ed  
						 
						
							
							
								
								
								integrate vouche into user state  
							
							
							
							
						 
						
							2014-12-26 01:56:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	4ce9c7da87  
						 
						
							
							
								
								
								Merge branch 'feature-voucher'  
							
							
							
							
						 
						
							2014-12-26 01:50:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	8ed077bcec  
						 
						
							
							
								
								
								user voucher feature  
							
							
							
							
						 
						
							2014-12-26 01:49:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	33bafad9b7  
						 
						
							
							
								
								
								fix wrong redirect after shift edit  
							
							
							
							
						 
						
							2014-12-26 01:26:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	e89acc0c1d  
						 
						
							
							
								
								
								merge feature-shift-types  
							
							
							
							
						 
						
							2014-12-25 22:32:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	544a51612f  
						 
						
							
							
								
								
								update install sql  
							
							
							
							
						 
						
							2014-12-25 22:28:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	34e2f49875  
						 
						
							
							
								
								
								shift signup improvements for shift view  
							
							
							
							
						 
						
							2014-12-25 22:23:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	74b98b8c3e  
						 
						
							
							
								
								
								fix update script for shifttypes  
							
							
							
							
						 
						
							2014-12-25 20:57:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	3770ab8271  
						 
						
							
							
								
								
								add import progress  
							
							
							
							
						 
						
							2014-12-22 20:30:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	0fda4a9181  
						 
						
							
							
								
								
								update german translation  
							
							
							
							
						 
						
							2014-12-22 20:25:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	342b79ff3f  
						 
						
							
							
								
								
								more fixes  
							
							
							
							
						 
						
							2014-12-22 20:18:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	2d587478a1  
						 
						
							
							
								
								
								fix different bugs with shift types  
							
							
							
							
						 
						
							2014-12-22 20:06:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	702047de53  
						 
						
							
							
								
								
								add more icons for better shift view  
							
							
							
							
						 
						
							2014-12-22 18:22:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	c12e5336fb  
						 
						
							
							
								
								
								display shifts with title  
							
							
							
							
						 
						
							2014-12-22 18:06:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	6a05c3d9de  
						 
						
							
							
								
								
								rewrite create shifts for shifttypes  
							
							
							
							
						 
						
							2014-12-22 17:55:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	0dbd0ea599  
						 
						
							
							
								
								
								add basic shift view  
							
							
							
							
						 
						
							2014-12-19 23:04:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Favre 
								
							 
						 
						
							
							
								
							
							
	2f20540a6b  
						 
						
							
							
								
								
								more infos in shift view  
							
							
							
							
						 
						
							2014-12-19 23:02:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	038bf97178  
						 
						
							
							
								
								
								link to next shift in menu  
							
							
							
							
						 
						
							2014-12-19 22:59:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	d02272afd6  
						 
						
							
							
								
								
								add basic shift view  
							
							
							
							
						 
						
							2014-12-19 22:41:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Favre 
								
							 
						 
						
							
							
								
							
							
	bcd33c02c8  
						 
						
							
							
								
								
								more infos in shift view  
							
							
							
							
						 
						
							2014-12-17 19:16:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	a791a75b0a  
						 
						
							
							
								
								
								integrate shift type into shifts  
							
							
							
							
						 
						
							2014-12-17 17:22:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	634a3739b2  
						 
						
							
							
								
								
								better shift type links  
							
							
							
							
						 
						
							2014-12-17 16:08:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	3f8e5e47c0  
						 
						
							
							
								
								
								add update, delete and view for shift type  
							
							
							
							
						 
						
							2014-12-17 14:59:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	526167ed11  
						 
						
							
							
								
								
								add create shift type  
							
							
							
							
						 
						
							2014-12-17 14:59:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	c8cc46886b  
						 
						
							
							
								
								
								shift type list  
							
							
							
							
						 
						
							2014-12-17 14:59:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	a73e98a8e0  
						 
						
							
							
								
								
								prepare shift types controller and view  
							
							
							
							
						 
						
							2014-12-17 14:59:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	294a21d163  
						 
						
							
							
								
								
								add shift types model  
							
							
							
							
						 
						
							2014-12-17 14:59:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	25889920cf  
						 
						
							
							
								
								
								prepare for shift types model, add db update  
							
							
							
							
						 
						
							2014-12-17 14:59:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Favre 
								
							 
						 
						
							
							
								
							
							
	8a51e5d822  
						 
						
							
							
								
								
								added headings template function  
							
							... 
							
							
							
							
							(cherry picked from commit 02457f00b809282d5fa4be19239a33afb3e927c3) 
							
						 
						
							2014-12-16 03:39:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Favre 
								
							 
						 
						
							
							
								
							
							
	807e420883  
						 
						
							
							
								
								
								only log if api key was reset on purpose  
							
							
							
							
						 
						
							2014-12-16 00:54:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Favre 
								
							 
						 
						
							
							
								
							
							
	d2e59e8f86  
						 
						
							
							
								
								
								make FAQ Buttom more visible  
							
							... 
							
							
							
							
							fixes  #166  
						
							2014-12-16 00:36:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Favre 
								
							 
						 
						
							
							
								
							
							
	84b0a9c96c  
						 
						
							
							
								
								
								user shift styling  
							
							... 
							
							
							
							
							fixes  #168  
						
							2014-12-16 00:30:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Favre 
								
							 
						 
						
							
							
								
							
							
	b299b0e085  
						 
						
							
							
								
								
								reworked user editing of angeltypes  
							
							... 
							
							
							
							
							fixes  #170  
						
							2014-12-16 00:16:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Favre 
								
							 
						 
						
							
							
								
							
							
	f20e24f589  
						 
						
							
							
								
								
								shift page styling  
							
							
							
							
						 
						
							2014-12-15 23:09:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Favre 
								
							 
						 
						
							
							
								
							
							
	c18c0983fc  
						 
						
							
							
								
								
								only show "arrived" button if user has rights for it  
							
							... 
							
							
							
							
							fixes  #172  
						
							2014-12-15 21:31:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Favre 
								
							 
						 
						
							
							
								
							
							
	be1bb5fbeb  
						 
						
							
							
								
								
								add simple search to log view  
							
							
							
							
						 
						
							2014-12-15 21:23:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	388dd0e136  
						 
						
							
							
								
								
								display date  
							
							
							
							
						 
						
							2014-12-15 19:08:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	9125f7e5ab  
						 
						
							
							
								
								
								show 10000 log entries  
							
							
							
							
						 
						
							2014-12-15 19:07:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	af091594c4  
						 
						
							
							
								
								
								new bug link  
							
							
							
							
						 
						
							2014-12-15 19:00:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	f39df75b4e  
						 
						
							
							
								
								
								list user buttons size  
							
							
							
							
						 
						
							2014-12-15 18:36:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Philip Häusler 
								
							 
						 
						
							
							
								
							
							
	8befe4f7db  
						 
						
							
							
								
								
								make info text visible  
							
							
							
							
						 
						
							2014-12-15 18:31:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									msquare 
								
							 
						 
						
							
							
								
							
							
	8c3fd7a2ab  
						 
						
							
							
								
								
								Merge pull request  #165  from LeSpocky/improve-readme  
							
							... 
							
							
							
							
							Hinweis auf Git submodules beim Auschecken ergänzt 
							
						 
						
							2014-12-14 13:22:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Dahl 
								
							 
						 
						
							
							
								
							
							
	9762f0a647  
						 
						
							
							
								
								
								Hinweis auf Git submodules beim Auschecken ergänzt  
							
							... 
							
							
							
							
							Hintergrund: beim Installieren nach Anleitung ohne Initialisierung der
Submodule schlägt das require auf /../vendor/parsedown/Parsedown.php
fehl, weil die entsprechenden Dateien gar nicht da sind. 
							
						 
						
							2014-12-14 09:54:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Favre 
								
							 
						 
						
							
							
								
							
							
	ed001633e6  
						 
						
							
							
								
								
								Own Shifts ignore the filled filter.  
							
							... 
							
							
							
							
							issue #134  
							
						 
						
							2014-12-13 01:56:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Favre 
								
							 
						 
						
							
							
								
							
							
	3e958227aa  
						 
						
							
							
								
								
								fix shift collision display  
							
							
							
							
						 
						
							2014-12-13 00:34:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Favre 
								
							 
						 
						
							
							
								
							
							
	d644952fcd  
						 
						
							
							
								
								
								also allow atom feed without login  
							
							
							
							
						 
						
							2014-12-12 23:51:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Favre 
								
							 
						 
						
							
							
								
							
							
	96d2aee2cb  
						 
						
							
							
								
								
								always allow access to ical and json_export_shifts  
							
							... 
							
							
							
							
							fixes  #140  
						
							2014-12-12 23:49:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Favre 
								
							 
						 
						
							
							
								
							
							
	e9bbd967ff  
						 
						
							
							
								
								
								add freeload info to shiftentry update log  
							
							... 
							
							
							
							
							issue #28  
							
						 
						
							2014-12-12 23:40:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Favre 
								
							 
						 
						
							
							
								
							
							
	5b3d0d302f  
						 
						
							
							
								
								
								on api-key reset also log the username  
							
							
							
							
						 
						
							2014-12-12 23:39:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Favre 
								
							 
						 
						
							
							
								
							
							
	bc6aa9a209  
						 
						
							
							
								
								
								responsify create room form  
							
							
							
							
						 
						
							2014-12-12 22:55:56 +01:00