| 
								
								
									 Philip Häusler | a4a4a0aecc | fix missing ; | 2014-12-07 19:47:36 +01:00 |  | 
				
					
						| 
								
								
									 Philip Häusler | f4fa7f5d33 | union shift update model | 2014-12-07 19:47:02 +01:00 |  | 
				
					
						| 
								
								
									 Felix Favre | 07b9de84c5 | use mail helpers for shift delete and shift change | 2014-12-07 19:44:59 +01:00 |  | 
				
					
						| 
								
								
									 Felix Favre | 8f918422f4 | mailer functions for shift delete,assign,remove | 2014-12-07 19:43:48 +01:00 |  | 
				
					
						| 
								
								
									 Felix Favre | 5b3e5750eb | Merge branch 'master' of github.com:engelsystem/engelsystem Conflicts:
	includes/model/ShiftEntry_model.php | 2014-12-07 18:04:03 +01:00 |  | 
				
					
						| 
								
								
									 Felix Favre | 09ef38ff35 | change shift mail function | 2014-12-07 18:01:45 +01:00 |  | 
				
					
						| 
								
								
									 Felix Favre | 4b490167ac | added User.Nick to ShiftEntries_by_shift function | 2014-12-07 18:01:05 +01:00 |  | 
				
					
						| 
								
								
									 Philip Häusler | b75700ee1b | add shift delete model | 2014-12-07 17:48:35 +01:00 |  | 
				
					
						| 
								
								
									 Philip Häusler | d26f8aa12c | add shift update model | 2014-12-07 17:41:40 +01:00 |  | 
				
					
						| 
								
								
									 Philip Häusler | fa0e38ebff | add shift create model | 2014-12-07 17:34:29 +01:00 |  | 
				
					
						| 
								
								
									 Philip Häusler | 156db1eadd | add shift entry update model | 2014-12-07 17:13:14 +01:00 |  | 
				
					
						| 
								
								
									 Philip Häusler | 0a74ab94a8 | add shift entry delete model | 2014-12-07 17:07:19 +01:00 |  | 
				
					
						| 
								
								
									 Philip Häusler | 514d2aca64 | add function to list users subscribed to a shift | 2014-12-07 16:54:13 +01:00 |  | 
				
					
						| 
								
								
									 Philip Häusler | 9176261762 | add shift entry create model | 2014-12-07 16:54:13 +01:00 |  | 
				
					
						| 
								
								
									 Felix Favre | 09e65d1a84 | Merge branch 'master' of github.com:engelsystem/engelsystem | 2014-12-07 16:38:45 +01:00 |  | 
				
					
						| 
								
								
									 Felix Favre | 9e0cc40e6d | added shift mailer | 2014-12-07 16:38:31 +01:00 |  | 
				
					
						| 
								
								
									 Philip Häusler | 663526246b | add settings button to user page | 2014-12-07 16:15:20 +01:00 |  | 
				
					
						| 
								
								
									 Felix Favre | e9ae329be4 | added another theme | 2014-12-07 15:43:25 +01:00 |  | 
				
					
						| 
								
								
									 Felix Favre | 8bcce0e003 | change button size in user_news | 2014-12-07 00:10:47 +01:00 |  | 
				
					
						| 
								
								
									 Felix Favre | 6ade63f11d | change popover sybol based on message | 2014-12-07 00:10:09 +01:00 |  | 
				
					
						| 
								
								
									 Felix Favre | 69878fa458 | changes to messages popover | 2014-12-07 00:09:38 +01:00 |  | 
				
					
						| 
								
								
									 Felix Favre | 45ac884474 | Merge branch 'master' of github.com:engelsystem/engelsystem | 2014-12-06 22:46:40 +01:00 |  | 
				
					
						| 
								
								
									 Felix Favre | 921449f3ef | more styling | 2014-12-06 22:46:23 +01:00 |  | 
				
					
						| 
								
								
									 Philip Häusler | a48fd8fc37 | change hint color on urgency | 2014-12-06 22:31:42 +01:00 |  | 
				
					
						| 
								
								
									 Philip Häusler | d34fae3c40 | move hints to toolbar | 2014-12-06 22:26:56 +01:00 |  | 
				
					
						| 
								
								
									 Philip Häusler | 8261933bec | try to prevent hint duplication | 2014-12-06 21:40:16 +01:00 |  | 
				
					
						| 
								
								
									 Felix Favre | 40d83367bb | beautify messages form | 2014-12-06 20:02:47 +01:00 |  | 
				
					
						| 
								
								
									 Felix Favre | b97154d19e | form_element helper now supports empty labels | 2014-12-06 20:01:47 +01:00 |  | 
				
					
						| 
								
								
									 Felix Favre | 703de07a63 | remove striped table from shift view | 2014-12-06 19:49:16 +01:00 |  | 
				
					
						| 
								
								
									 Felix Favre | 2f445eb90c | Merge branch 'master' of github.com:engelsystem/engelsystem | 2014-12-06 19:02:26 +01:00 |  | 
				
					
						| 
								
								
									 Felix Favre | 3973236f6e | css and layout fixes. font path fix | 2014-12-06 19:02:02 +01:00 |  | 
				
					
						| 
								
								
									 Philip Häusler | 10d7fce163 | fix wrong angel type alarm | 2014-12-06 18:55:24 +01:00 |  | 
				
					
						| 
								
								
									 Philip Häusler | 481e52cf77 | add email shiftinfo checkbox/flag | 2014-12-06 18:37:39 +01:00 |  | 
				
					
						| 
								
								
									 Philip Häusler | 57a92dbdcd | add opt-in bool for shiftinfo mails and remove icq from users | 2014-12-06 18:37:39 +01:00 |  | 
				
					
						| 
								
								
									 Felix Favre | 191ba6e1b1 | replace all the remaining old icons with glyphicons | 2014-12-06 18:16:18 +01:00 |  | 
				
					
						| 
								
								
									 Felix Favre | 524acb15ba | use the new very cool glyph button | 2014-12-06 17:42:29 +01:00 |  | 
				
					
						| 
								
								
									 Felix Favre | de65cd64e1 | add very cool button_glyph helper | 2014-12-06 17:41:16 +01:00 |  | 
				
					
						| 
								
								
									 Felix Favre | 2654fcf228 | use glyph_bool in admin_active view | 2014-12-06 17:30:35 +01:00 |  | 
				
					
						| 
								
								
									 Felix Favre | 67bca99571 | Use more Striped Tables issue #159 | 2014-12-06 17:15:22 +01:00 |  | 
				
					
						| 
								
								
									 illuxio | 90a5e5ec14 | Update User_view.php Fix Nickname and DECT bug in settings. | 2014-11-25 17:30:17 +01:00 |  | 
				
					
						| 
								
								
									 Philip Häusler | 4516cbe5d6 | renamed mysql provider to mysqli, updated system requirements, fixes #145 | 2014-11-04 11:22:32 +01:00 |  | 
				
					
						| 
								
								
									 Robert Oehlmann | a42ba2f5a1 | Fixed field assignments in shift entry creation form | 2014-11-03 19:37:47 +01:00 |  | 
				
					
						| 
								
								
									 Robert Oehlmann | c4039f72bb | Fixed shift duration calculation Fixes issue #136 | 2014-11-03 19:28:43 +01:00 |  | 
				
					
						| 
								
								
									 Robert Oehlmann | 4edaa26911 | Fixed shift edit/delete URLs in new layout | 2014-11-03 08:51:23 +01:00 |  | 
				
					
						| 
								
								
									 Philip Häusler | 785fd45d3a | fix register privilege | 2014-09-28 19:47:57 +02:00 |  | 
				
					
						| 
								
								
									 Philip Häusler | 4931fbb372 | replace icons with glyphicons | 2014-09-28 19:44:53 +02:00 |  | 
				
					
						| 
								
								
									 Philip Häusler | bd2a8b441f | clear up mvc for user list | 2014-09-28 15:01:02 +02:00 |  | 
				
					
						| 
								
								
									 Philip Häusler | 1d9e1c467c | user list rewritten | 2014-09-28 14:50:08 +02:00 |  | 
				
					
						| 
								
								
									 Philip Häusler | 0f77edc4fb | hint for disabled registration | 2014-09-28 14:14:04 +02:00 |  | 
				
					
						| 
								
								
									 Philip Häusler | e4a042c8c3 | clear userlist | 2014-09-24 15:36:26 +02:00 |  |