1020 Commits

Author	SHA1	Message	Date
jwacalex	1324260e0f	forgot to remove if-statement -.-	2016-11-30 16:17:52 +01:00
jwacalex	f4f6dfefcb	fixed broken logic in controller (cf. to mail to @msquare)	2016-11-30 15:53:47 +01:00
Leandra Eberle	687c333322	Update Descriptions	2016-11-26 16:44:28 +01:00
Leandra Eberle	acbaaf4364	Update Descriptions	2016-11-26 16:43:22 +01:00
Leandra Eberle	10517213f6	Update Descriptions	2016-11-26 16:33:07 +01:00
Leandra Eberle	0401e90f00	Update Descriptions	2016-11-26 16:23:49 +01:00
msquare	561e8ec36c	better msg placement on angeltype view	2016-11-25 14:55:19 +01:00
msquare	34248bb20c	show freeload comments to supporters (user shift admin)	2016-11-25 14:27:47 +01:00
msquare	476d1daeb7	fixes #280 shift entries finished by user returns no freeloaded shifts	2016-11-25 13:58:43 +01:00
msquare	bae3ede662	fixes #279 fix exporting freeload comment in json export	2016-11-25 13:38:16 +01:00
msquare	a8bcb19eaa	fix shift view bars	2016-11-25 13:06:05 +01:00
msquare	4f6db20ae4	fix shift view bars	2016-11-25 13:03:41 +01:00
Leandra Eberle	67df8da061	Typo Changes and Descriptions	2016-11-24 22:47:32 +01:00
gnomus	dc49b9af41	Update guest_login.php	2016-11-24 12:22:18 +01:00
msquare	ff31d0a1c5	fix shift signup state being combined to null	2016-11-24 09:32:32 +01:00
msquare	16e9a69c0d	fixes #277 date parsing returns the start of the day now	2016-11-24 09:25:28 +01:00
msquare	321566d4b0	Merge pull request #278 from leaneb/master ... Change Ask an Arch Angel title	2016-11-24 09:15:05 +01:00
Leandra Eberle	4116e0114e	Change ask an Arch Angel, to Ask the Heaven because the Arch Angel only role is deprecated	2016-11-24 00:17:01 +01:00
msquare	3fd30add3c	fix NPE	2016-11-23 22:31:11 +01:00
msquare	be8c47a175	add 33c3 theme	2016-11-23 17:52:58 +01:00
msquare	5ae328b2b1	hide event countdown for mobile clients	2016-11-20 17:54:16 +01:00
msquare	409761ce4b	rebuild login page	2016-11-18 15:36:02 +01:00
msquare	9098b8e80d	reduce complexity of user view	2016-11-18 08:47:52 +01:00
msquare	bd54bec595	add ValidationResult to namespace	2016-11-18 08:20:17 +01:00
msquare	356cc9e1d0	reduce complexity of user driver license	2016-11-17 15:04:33 +01:00
msquare	7b8d191808	reduce complexity of user driver license	2016-11-17 14:40:21 +01:00
msquare	9c4636f5c4	reduce complexity of user driver license	2016-11-17 14:35:04 +01:00
msquare	b5784e5961	fix order problem	2016-11-17 13:16:15 +01:00
msquare	d64f96b6a1	reduce complexity of angeltype controller	2016-11-17 13:11:44 +01:00
msquare	1636688394	reduce complexity of angeltype edit controller	2016-11-17 13:03:28 +01:00
msquare	f2630162e9	reduce complexity of password recovery controller	2016-11-15 22:08:41 +01:00
msquare	ac53559fea	fix shift calendar headers	2016-11-15 22:00:17 +01:00
msquare	54f3253c32	fix js var names	2016-11-15 21:42:43 +01:00
msquare	79ca2f1772	add fixed shift calendar headers and timelane	2016-11-15 21:33:54 +01:00
msquare	5299ca2103	reduce complexity of shift view	2016-11-15 17:54:59 +01:00
msquare	5a93050a06	localize date rendering for eventconfig info	2016-11-15 17:41:02 +01:00
msquare	15243f15fc	fix shift view	2016-11-15 17:22:15 +01:00
msquare	ec40e10ebd	fix unused code	2016-11-15 16:58:12 +01:00
msquare	53a306f14b	make departure date nullable	2016-11-15 16:36:03 +01:00
msquare	918d41ca70	reduce complexity of menu and hints	2016-11-15 16:31:55 +01:00
msquare	ec6016cd38	reduce complexity of menu and hints	2016-11-15 16:28:20 +01:00
msquare	16ed2ae683	fixed settings validation	2016-11-14 19:10:29 +01:00
msquare	d3e942f742	Merge pull request #273 from anykraus/typo-sheduler-scheduler ... minor typo fixed (sheduler to scheduler)	2016-11-14 18:21:58 +01:00
msquare	7cf2a9bb9b	split templates into different files	2016-11-14 18:14:32 +01:00
msquare	1a1ca1d1b5	split templates into different files	2016-11-14 18:14:23 +01:00
msquare	f568141164	add shift legend and fix dark theme	2016-11-14 17:58:15 +01:00
msquare	0ab9f4f988	fix shift ended recognition and displayed time range end	2016-11-14 17:40:24 +01:00
msquare	1a3b4e2a33	redone shift coloring and shift signup state	2016-11-12 23:00:46 +01:00
msquare	106a678808	fix wrong variable	2016-11-12 20:15:25 +01:00
msquare	7bafe3f24c	fix shift occupied method	2016-11-12 19:05:36 +01:00
msquare	c61e888de4	change shift coloring	2016-11-12 12:56:10 +01:00
msquare	c10ab2d8d2	reduce complexity of shift signup allowed	2016-11-12 12:50:52 +01:00
msquare	5f2871538a	fix css problem with rooms table	2016-11-11 17:07:40 +01:00
msquare	03c9d1ef5d	reduce complexity of user settings main	2016-11-11 17:00:51 +01:00
msquare	beb0db6852	fix misspellings	2016-11-11 16:42:47 +01:00
msquare	247166f28b	improve code of user settings	2016-11-11 16:34:23 +01:00
msquare	f5a5f234e4	fixes #266: add checkbox allowing the users email to be used by humans like event-team	2016-11-11 15:24:51 +01:00
msquare	82b9436c50	rename coordinator to supporter	2016-11-11 14:59:25 +01:00
msquare	468a10774c	reduce complexity of user driver license controller	2016-11-10 13:55:16 +01:00
msquare	f6da9148e7	fix missing var check	2016-11-10 13:38:31 +01:00
msquare	defdb3007c	Merge pull request #272 from anykraus/#271-admin_active ... fix admin_active.php not displaying (issue #271)	2016-11-09 22:04:22 +01:00
msquare	dfc9e209a5	fix parsedown	2016-11-09 19:25:55 +01:00
msquare	af9328f558	split angeltype about view into different methods	2016-11-09 18:05:00 +01:00
msquare	0ba0ce207d	split angeltype view into different methods	2016-11-09 18:02:01 +01:00
msquare	22520532c7	fix shift occupied calculation	2016-11-07 21:24:05 +01:00
msquare	125f34133d	remove unused var	2016-11-07 21:11:05 +01:00
msquare	a8e3e91448	implement shift calendar into user shift page	2016-11-07 20:55:37 +01:00
msquare	db7f8c1ab3	split shift calendar renderer into different classes	2016-11-07 20:50:15 +01:00
anykraus	8c22ec7f6d	typo fixed (sheduler to scheduler)	2016-11-07 20:24:01 +01:00
msquare	cf8cc5f592	change shift table to html5	2016-11-05 10:06:06 +01:00
msquare	902866ff3a	add first design of new shift markup	2016-11-03 18:28:22 +01:00
anykraus	efb7dbfb01	fix admin_active.php not displaying (issue #271) ... Reverts 53ad1b5110 "fix codacy unused code" partially. (where $shift_sum_formula was removed from global)	2016-11-02 02:04:43 +01:00
msquare	1d4811cca5	remove unused code	2016-10-08 09:18:04 +02:00
msquare	c48335e702	improve shift rendering	2016-10-07 17:22:48 +02:00
msquare	6d97aa2d27	continue working on shifts calendar renderer	2016-10-05 22:28:39 +02:00
msquare	6fff6a6c1a	begin room view and shifts filter renderer	2016-10-05 18:56:50 +02:00
msquare	27c9650dc4	reduce complexity of shifts controller	2016-10-04 21:20:38 +02:00
msquare	a50b26490c	reduce complexity of shiftsfilter update	2016-10-04 18:52:52 +02:00
msquare	aa628208ec	reduce complexity of shift view	2016-10-04 18:36:57 +02:00
msquare	676f5e1627	small code style improvements	2016-10-04 18:11:26 +02:00
msquare	42144ed21c	move static access to datetime parse function	2016-10-04 17:58:56 +02:00
msquare	eec10ebfc5	reduce complexity of user angeltypes controller	2016-10-04 16:50:06 +02:00
msquare	455e417200	fix variable naming problems	2016-10-04 16:16:00 +02:00
msquare	51d270db28	restore ical export	2016-10-03 19:37:00 +02:00
msquare	f3a0ce865d	move sql queries from shifts controller to model	2016-10-03 18:32:25 +02:00
msquare	09c931dcf5	fix missing variables	2016-10-03 17:55:49 +02:00
msquare	6c8a113383	introduce ShiftsFilter	2016-10-03 17:41:14 +02:00
msquare	d59809d6d2	bring back session filter store	2016-10-02 23:32:10 +02:00
msquare	5e66007f06	introduce ShiftsFilter	2016-10-02 23:00:01 +02:00
msquare	6ff5e7997a	split user_shifts into different functions	2016-10-02 21:19:03 +02:00
msquare	d5d2acc7d8	improve code style	2016-10-01 10:48:19 +02:00
msquare	6dfefc3bb9	small code improvements	2016-09-30 18:49:33 +02:00
msquare	b87eb49b93	reduce complexity of table()	2016-09-30 17:38:26 +02:00
msquare	3738d071f8	remove long array syntax	2016-09-30 17:08:20 +02:00
msquare	1debe567f5	simplify user_angeltype_add_controller	2016-09-30 16:55:47 +02:00
msquare	9fce3b22aa	fix issues after changing codestyle	2016-09-30 16:55:23 +02:00
msquare	9ad9088260	make short variable names longer	2016-09-29 19:31:26 +02:00
msquare	a128bcbb38	use more ValidationResult	2016-09-29 16:04:05 +02:00
msquare	07ddbb0f4c	make short variable names longer	2016-09-29 12:45:06 +02:00
msquare	c231070dcc	rename ok to valid	2016-09-29 12:33:03 +02:00
msquare	f05f1a3cd4	rename to	2016-09-29 12:08:12 +02:00
msquare	81e5a6482c	remove unused global from login	2016-09-29 11:32:03 +02:00
msquare	4c288e957e	prohibit inline control structures on includes and index	2016-09-29 11:28:42 +02:00
msquare	e965f8d041	prohibit inline control structures on model and view	2016-09-29 11:18:17 +02:00
msquare	91dafb19ec	prohibit inline control structures on pages	2016-09-29 10:53:17 +02:00
msquare	1ec19b46f3	prohibit inline control structures on mailers	2016-09-29 09:50:31 +02:00
msquare	5170fd7f6e	prohibit inline control structures on helpers	2016-09-29 09:49:25 +02:00
msquare	bd9003f5d5	prohibit inline control structures on controllers	2016-09-29 09:43:08 +02:00
msquare	6685beb397	display event countdowns on start page	2016-09-29 09:25:06 +02:00
msquare	50bf7feff0	show event info in footer text line	2016-09-28 11:46:40 +02:00
msquare	6384eca1ce	display user welcome message	2016-09-28 07:28:51 +02:00
msquare	a083c198bb	better log when changing event config	2016-09-27 18:42:10 +02:00
msquare	6f6724e55b	update german translation	2016-09-27 18:08:55 +02:00
msquare	5957e05bf1	finished rename settings to event config and added more date validation for event config	2016-09-27 17:59:28 +02:00
msquare	031fc3057c	rename settings to event config and implement mvc pattern on it	2016-09-27 17:49:39 +02:00
msquare	45bbf95972	fix settings validation	2016-09-27 17:49:39 +02:00
msquare	9e884bb444	remove unused code	2016-08-22 20:40:31 +02:00
msquare	3f4be08865	remove old update script	2016-08-22 19:32:54 +02:00
msquare	14d20933f7	improve quality of user atom	2016-08-22 19:23:23 +02:00
msquare	54e6f422ce	cleanup guest stats	2016-08-22 19:11:09 +02:00
msquare	79588ff2cf	split user atom into different functions	2016-08-22 19:08:10 +02:00
msquare	d4bba0d468	remove exit code from shifts controller	2016-08-22 19:03:18 +02:00
msquare	de917bc543	remove unused code	2016-08-21 23:11:23 +02:00
msquare	f02148af35	fix rename bug	2016-08-21 23:00:58 +02:00
msquare	28e5a3b978	user_ical rewrite (remove codacy issues)	2016-08-21 22:58:09 +02:00
msquare	191328d703	fix method names, quotes, duplication in forms.js	2016-08-21 20:14:09 +02:00
msquare	53ad1b5110	fix codacy unused code	2016-08-21 18:00:39 +02:00
kamishetty sreeja	8a20b43f6d	Added Feature Admin Settings Page	2016-07-14 13:49:38 +05:30
Philip Häusler	99c8751059	some minor text changes on user vouchers	2016-03-22 14:51:30 +01:00
Philip Häusler	d0a07a74cc	remove preg replace with e flag for php 7	2016-03-22 14:41:36 +01:00
tike	661e5595c4	issue #242 - make app caluclate number of vouchers for angels	2016-02-07 13:00:28 +01:00
Philip Häusler	1da3cba5a7	fixes #241 problem when adding rooms	2016-02-01 11:48:40 +01:00
Philip Häusler	c4179df503	fixes #237 bug when editing a room without changing its name	2016-01-19 11:35:00 +01:00
Philip Häusler	ef60b95555	add a more secure way to delete users containing a password request	2015-12-30 15:48:41 +01:00
Philip Häusler	1983db901b	better error message for creating room with name that is already used	2015-12-29 21:50:09 +01:00
Philip Häusler	2af1fd582e	put message input to the top	2015-12-29 18:13:05 +01:00
Philip Häusler	b479cdaef8	fix room creation	2015-12-29 17:57:16 +01:00
Philip Häusler	522546795b	search only for nickname on active angel page	2015-12-29 15:32:58 +01:00
Philip Häusler	4684d708fb	better shift cancel messages and workflow	2015-12-28 17:47:02 +01:00
Philip Häusler	99d36e47b8	redirect to other users page on shift cancel	2015-12-28 17:42:29 +01:00
Philip Häusler	897053e049	redirect to users profile page after marking as arrived or not arrived	2015-12-27 23:20:09 +01:00
Philip Häusler	667466b9d0	add minutes to start and end of talks for frab import	2015-12-26 12:37:29 +01:00
Philip Häusler	570037eed0	fix problem that angeltypes lose their restriction when edited by a coordinator	2015-12-22 21:05:10 +01:00
Philip Häusler	dc5b0a6214	finish cleanup of angeltypes controller	2015-12-22 16:25:38 +01:00
Philip Häusler	f7cf9b327e	#198 log updates on driving license information	2015-12-20 21:07:08 +01:00
Philip Häusler	0ac05d251c	#198 fixed: driving license feature completed - integrated into angeltypes	2015-12-20 11:36:12 +01:00
Philip Häusler	2cb44fe517	make angeltype names clickable	2015-12-20 10:35:03 +01:00
Philip Häusler	facc32f133	#198 add basic driver license information	2015-12-19 23:31:08 +01:00
Philip Häusler	761897a942	add 32c3 design	2015-12-16 15:32:54 +01:00
Philip Häusler	28edf6bd48	make register log entry include link to userpage	2015-12-12 19:39:30 +01:00
Philip Häusler	7bff27d20b	fix #221: deleting angeltype doesn't log correctly	2015-12-12 19:35:07 +01:00
Philip Häusler	0e0f7f0516	fix #203: message popover not workin in safari	2015-12-12 19:27:53 +01:00
Philip Häusler	d68c91be18	remove sessionhelper	2015-12-09 16:31:51 +01:00
msquare	a92e1e3ea6	Merge pull request #213 from engelsystem/remove-sessionhelper ... remove sessionhelper	2015-12-09 16:29:04 +01:00
Philip Häusler	902a5852a4	fix user result check on user controller	2015-12-05 11:55:35 +01:00
Philip Häusler	3790818baf	fix user delete log entry	2015-12-04 21:50:39 +01:00
Max Weller	0dc8da68f4	display room number in admin_rooms edit form	2015-12-02 18:59:38 +01:00
Felix Favre	ecf25f5d2a	replace overcomplicated regex for email validation with php function	2015-08-26 15:24:33 +02:00
Felix Favre	73208016bf	change date format in shift table ... fixes #202	2015-08-26 15:03:53 +02:00
Felix Favre	e4bd324801	changed all y-m-d date formats to Y-m-d date formats ... part of #202	2015-08-26 15:00:48 +02:00
Felix Favre	1af6b8cf20	How Mysql Connection Error to user ... fixes #207	2015-08-26 14:51:00 +02:00
Felix Favre	2df2398b87	add more information to ical export ... fixes #175	2015-08-26 14:29:51 +02:00
Felix Favre	8c1f6d2c9c	removed sessionhelper. we should let this handle the server administrator within the PHP config	2015-08-26 13:33:38 +02:00
Philip Häusler	128ee0911f	fix wrong data at arrival statistics	2015-08-16 23:32:39 +02:00
Philip Häusler	c4ee004095	rework arrival stat graphs and tables	2015-08-16 23:13:13 +02:00
gnomus	a67237d0ef	Named Function Correctly	2015-08-16 21:05:27 +02:00
gnomus	73197995d7	Merge pull request #209 from engelsystem/feature-shift-types ... Add Email Form Helper	2015-08-16 20:42:25 +02:00
gnomus	7306545e32	Add Email Form Helper	2015-08-16 20:41:23 +02:00
gnomus	b3aa6cc473	Change Register form E-Mailfield to form_email	2015-08-16 20:38:41 +02:00
Philip Häusler	a7189482e9	add shift creator and editor	2015-08-15 23:36:38 +02:00
Philip Häusler	cac86ef509	add planned date of departure	2015-08-15 14:54:25 +02:00
Philip Häusler	bc84710e9d	wording	2015-08-14 17:40:58 +02:00
Philip Häusler	28788e6702	put shirt statistics into one table	2015-08-14 14:16:09 +02:00
Philip Häusler	e8daa4d2ce	add table of needed shirts to user active page	2015-08-14 14:06:33 +02:00
Philip Häusler	18e49ee06a	put active+shirt info into a new line	2015-08-14 13:20:24 +02:00
Philip Häusler	fc0d97344e	made shift creation angeltypes smaller (like room editing)	2015-08-14 12:42:18 +02:00
Philip Häusler	41280a17f5	added hint about nightshifts	2015-08-14 12:32:54 +02:00
Philip Häusler	42150cc6e9	add log entry for deleting own shift entries	2015-08-14 09:28:32 +02:00
Philip Häusler	3d7e378b67	change default end date on creating shifts	2015-08-13 22:57:40 +02:00
Philip Häusler	1cd6a4f4f6	keep the show all users checkbox	2015-08-13 22:57:29 +02:00
Philip Häusler	f9fb12c7f1	show all forced active angels	2015-08-13 22:38:32 +02:00
Philip Häusler	34be996f22	add possibility to show already done shifts in admin active view	2015-08-13 20:28:48 +02:00
Philip Häusler	1c9a3fa89e	fix group rights management	2015-08-13 11:46:06 +02:00
Philip Häusler	723961c19e	User shift admins see free and occupied shifts by default	2015-08-13 11:22:25 +02:00
Philip Häusler	df526fa2bf	fix problem with beeing informed about shift changes	2015-08-13 10:48:39 +02:00
Philip Häusler	5742306095	fix wrong user shift edit link	2015-08-13 09:13:13 +02:00
Philip Häusler	2823c0e438	fix angel list with multiple vouchers	2015-08-12 23:47:06 +02:00
Philip Häusler	803c0a552f	make multiple vouchers possible	2015-08-12 23:44:39 +02:00
Philip Häusler	681d52fe0f	fix frab import problem on creating rooms	2015-08-12 20:43:22 +02:00
Philip Häusler	18585285a3	fix user update problem	2015-08-11 12:04:22 +02:00
Philip Häusler	1dcd6c0f3f	fix loggin on setting rooms angeltypes	2015-08-09 17:56:03 +02:00
Philip Häusler	c06573bb87	add maintenance mode	2015-08-09 17:46:57 +02:00
Philip Häusler	bc0354fbff	responsive resizing for graphs is broken -> turn off	2015-07-27 17:36:42 +02:00
Philip Häusler	1a0ccddbe9	show number of user angel types to confirm in hint	2015-07-27 17:20:05 +02:00
Philip Häusler	6376b90e9f	introduce table buttons to angeltype view	2015-07-27 17:14:41 +02:00
Philip Häusler	386a3c3298	remove duplication from unconfirmed angeltypes hint	2015-07-27 17:05:16 +02:00
Philip Häusler	bae55f78fd	swap chart and table	2015-07-18 21:34:14 +02:00
Philip Häusler	d414c455a2	responsive chart	2015-07-18 21:32:50 +02:00
Philip Häusler	46f0636f2f	arrival statistics	2015-07-18 21:27:30 +02:00
Philip Häusler	18644cac7a	fixes #196: make users planned arrival date editable in user settings and show it in their own profile	2015-07-15 21:53:19 +02:00
Philip Häusler	4aec1b1536	fix doubleclick bug on user hint popover	2015-07-12 20:06:34 +02:00
Philip Häusler	8c518d4c34	add arrival date feature	2015-07-12 14:45:58 +02:00
Philip Häusler	66c7e67a03	remove avatars	2015-07-12 13:51:39 +02:00
Philip Häusler	53737666c6	add bootstrap datepicker	2015-07-12 13:45:47 +02:00
Philip Häusler	993d6a4f59	add cccamp15 design	2015-07-12 12:44:09 +02:00
Philip Häusler	86a4773243	add log entry test	2015-06-07 20:42:01 +02:00
Philip Häusler	eddafead49	add function to clear log to model	2015-06-07 20:12:18 +02:00
Philip Häusler	1da5604f47	remove json auth feature (will be covered by api)	2015-06-07 20:11:50 +02:00
Philip Häusler	45c8a68beb	deleted counter function - never needed in the last 4 years	2015-06-07 19:40:51 +02:00
Felix Favre	c88b1adcfe	Merge branch 'master' of github.com:engelsystem/engelsystem	2015-06-07 15:06:24 +02:00
Felix Favre	dc2c986522	fix location of session file storage	2015-06-07 15:05:59 +02:00
Philip Häusler	c6c0e8f2ff	fix test running	2015-06-07 13:45:47 +02:00
Philip Häusler	218b305a3e	fix broken session creation	2015-06-07 13:33:59 +02:00
Philip Häusler	0a59089e2b	add room model tests	2015-05-14 17:20:46 +02:00
Philip Häusler	284ed12f59	add bootstrap file	2015-05-14 16:37:12 +02:00
Philip Häusler	0cb28c05b1	fix creation of shift types	2015-01-10 11:12:02 +01:00
Philip Häusler	9af229094d	display user nicks on shift json export	2015-01-05 13:58:34 +01:00
Philip Häusler	48e4787548	set force active user to active	2015-01-05 13:58:24 +01:00
Philip Häusler	ca37de95da	fix shift update	2014-12-28 14:56:02 +01:00
Philip Häusler	739eddefd5	better shift sign up restriction	2014-12-28 14:20:16 +01:00
Philip Häusler	a470a5f5d3	fix shift creation	2014-12-28 13:57:50 +01:00
Philip Häusler	6bede2fd22	harden the sql queries	2014-12-28 13:44:56 +01:00
Philip Häusler	a6ab81b834	fix overfull progress bars	2014-12-28 01:35:36 +01:00
Philip Häusler	cb46534569	move shift edit buttons	2014-12-28 01:30:29 +01:00
Philip Häusler	0b70fc2a7f	better shift sign up buttons in shift view	2014-12-28 01:27:41 +01:00
Philip Häusler	502a52394e	redirect to users page on shift cancel by admin	2014-12-27 23:38:23 +01:00
Philip Häusler	16ce2eb969	begin cleanup of user edit	2014-12-27 21:55:24 +01:00
Philip Häusler	247d9b65c1	remove user angeltype administration from user-edit	2014-12-27 21:48:08 +01:00
Philip Häusler	af52251cef	angelnames were too fat.	2014-12-27 21:32:02 +01:00
Philip Häusler	582c429fd4	allow admin to sign up more angels than needed again	2014-12-27 00:15:41 +01:00
Philip Häusler	8d6175a273	user cannot signup for full shifts	2014-12-26 23:48:16 +01:00
Philip Häusler	af25ca9103	fix broken log nick	2014-12-26 22:03:35 +01:00
Philip Häusler	1ec2783a8e	use user nick render	2014-12-26 19:26:53 +01:00
Philip Häusler	dc412ba826	sort meetings by date	2014-12-26 19:22:03 +01:00
Philip Häusler	71a23be3d4	fade out for not arrived angels	2014-12-26 19:11:26 +01:00
Philip Häusler	77273425f7	fade out for not arrived angels	2014-12-26 18:59:32 +01:00
Philip Häusler	bd48de258a	update german translation	2014-12-26 18:51:06 +01:00
Philip Häusler	9007bb6790	sort news by date	2014-12-26 18:39:16 +01:00
Philip Häusler	47b52bc3f6	count confirmed and unconfirmed angels	2014-12-26 16:57:58 +01:00
Philip Häusler	8764be8604	display room per shift in shift table	2014-12-26 14:31:37 +01:00
Philip Häusler	fc4a5e0e7a	fix shift creation for shifttypes	2014-12-26 02:34:57 +01:00
Philip Häusler	9cabdb1d78	shift edit for shifttypes	2014-12-26 02:27:54 +01:00
Philip Häusler	c602d0208f	integrate voucher into user state	2014-12-26 01:57:15 +01:00
Philip Häusler	7cb3a772ed	integrate vouche into user state	2014-12-26 01:56:16 +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	34e2f49875	shift signup improvements for shift view	2014-12-25 22:23:18 +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
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	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	f39df75b4e	list user buttons size	2014-12-15 18:36:12 +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	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
Felix Favre	1cc84a967a	change default selection	2014-12-12 22:41:35 +01:00
Philip Häusler	7e650920d3	dont send mails for my own actions	2014-12-07 20:42:54 +01:00
Philip Häusler	1f572918ff	include all mailers	2014-12-07 20:29:01 +01:00
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
Philip Häusler	f06e4a0f47	move user messages to menu icon right	2014-09-24 15:24:32 +02:00
Philip Häusler	07b6541204	move language to submenu	2014-09-24 15:11:50 +02:00
Philip Häusler	094715e6ee	optimize navbar for 1024 px width	2014-09-24 15:03:41 +02:00
Philip Häusler	50fea6d371	fix session security issue (same session on multiple instances)	2014-09-20 18:31:59 +02:00
Philip Häusler	46575d90c2	pulled complete menu to the top (go for mobile...)	2014-09-08 14:45:41 +02:00
Philip Häusler	1785c38698	fix login layout and add mobile nav	2014-09-08 13:57:36 +02:00
Philip Häusler	4414358cf5	fix wrong nick and api sql query	2014-09-08 13:57:36 +02:00
Philip Häusler	2716c63648	fix wrong username on angeltype confirm	2014-09-08 13:57:36 +02:00
Moritz Kaspar Rudert (mortzu)	27b8223611	removed bootstrap.php	2014-09-08 08:38:08 +02:00
Philip Häusler	9adaeaa97a	shift state text update	2014-08-24 16:48:12 +02:00
Philip Häusler	fbdb8ae472	move new messages badge	2014-08-24 16:46:30 +02:00
Philip Häusler	53a10de5cf	move json and ical export buttons	2014-08-24 16:36:10 +02:00
Philip Häusler	3da1748e84	correct shift state strings	2014-08-24 16:22:43 +02:00
Philip Häusler	da6eaae215	refactor shift state	2014-08-24 16:08:12 +02:00
Philip Häusler	0e2b257342	begin to refactor user shift state	2014-08-24 15:51:42 +02:00
Philip Häusler	25b5096c7e	update german translation	2014-08-24 15:51:42 +02:00