Philip Häusler
|
8a0bd3d55c
|
several fixes
- syntax error in index.php
- switched from sass to less because of bootstrap submodule
|
2014-09-08 14:12:42 +02:00 |
|
Philip Häusler
|
1785c38698
|
fix login layout and add mobile nav
|
2014-09-08 13:57:36 +02:00 |
|
Moritz Kaspar Rudert (mortzu)
|
5d8615a958
|
moved external libraries into gitmodules
|
2014-09-08 08:16:09 +02:00 |
|
Felix Favre
|
20e66633a3
|
Merge branch 'master' of github.com:planetcyborg/engelsystem
Conflicts:
templates/layout.html
|
2014-08-24 16:55:26 +02:00 |
|
Felix Favre
|
1f43c46a2c
|
Added moment-countdown inclue
|
2014-08-24 16:44:05 +02:00 |
|
Philip Häusler
|
abb6d8bfd8
|
move moment js to vendor
|
2014-08-24 16:09:56 +02:00 |
|
Felix Favre
|
4faca9864f
|
Merge branch 'master' of github.com:planetcyborg/engelsystem
Conflicts:
themes/theme1.scss
|
2014-08-24 15:52:25 +02:00 |
|
Philip Häusler
|
f9e577352d
|
remove html templates
|
2014-08-23 19:15:10 +02:00 |
|
Felix Favre
|
efe853246f
|
Moved Javascript includes to bottom of layout
|
2014-08-23 17:31:20 +02:00 |
|
Philip Häusler
|
7f43f3bfe5
|
remove html templates
|
2014-08-23 17:24:11 +02:00 |
|
Philip Häusler
|
c8f652f57b
|
fix layout
|
2014-08-23 16:03:46 +02:00 |
|
Philip Häusler
|
6bfa410f90
|
add moment js
|
2014-08-23 15:59:18 +02:00 |
|
Philip Häusler
|
f5a094fd8b
|
add user view, better bootstrap
|
2014-08-23 01:55:18 +02:00 |
|
Philip Häusler
|
74647e16d3
|
add basic bootstrap theme
|
2014-08-22 22:34:13 +02:00 |
|
Philip Häusler
|
3401c6f8b6
|
admin import now without template files
|
2014-03-26 20:04:11 +01:00 |
|
Philip Häusler
|
ff67fb053c
|
e7p added to credits
|
2014-01-06 18:55:19 +01:00 |
|
Philip Häusler
|
5e84539928
|
rewritten angeltypes and user angeltypes
|
2014-01-05 19:30:06 +01:00 |
|
Moritz Rudert (helios)
|
3cc147d235
|
advanced credits
|
2013-12-17 17:00:09 +01:00 |
|
Philip Häusler
|
821e37c1b2
|
removed faq feature
|
2013-12-03 16:28:37 +01:00 |
|
Philip Häusler
|
c8041fa27f
|
template cleanup
|
2013-11-28 22:49:15 +01:00 |
|
Philip Häusler
|
1e05da6c81
|
gettext for user sites
|
2013-11-28 22:40:48 +01:00 |
|
Philip Häusler
|
8a5915594f
|
gettext for admin active
|
2013-11-28 22:00:49 +01:00 |
|
Philip Häusler
|
85d9bf4f9c
|
angel views in english complete
|
2013-11-25 21:56:56 +01:00 |
|
Philip Häusler
|
3c4321ff76
|
30c3 theme
|
2013-10-13 00:52:44 +02:00 |
|
Philip Häusler
|
5b4c7fe15e
|
changed some ical key texts to api key
|
2013-09-10 14:31:25 +02:00 |
|
Philip Häusler
|
8fd5ffb335
|
cleanup user myshifts
|
2012-12-30 18:23:10 +01:00 |
|
Philip Häusler
|
f5f698a2a5
|
footer correction
|
2012-12-30 18:06:20 +01:00 |
|
Jan-Philipp Litza
|
b26994f518
|
moved footer to navigation and removed left-padding of headings, reworked credits
|
2012-12-30 17:13:28 +01:00 |
|
Jan-Philipp Litza
|
15668bad18
|
More filter functions and bigger filter button
|
2012-12-30 16:47:36 +01:00 |
|
Jan-Philipp Litza
|
de695c0fe4
|
make shifts filterable by timespan instead of days and enable new view for arbitrary timespans
|
2012-12-30 15:06:52 +01:00 |
|
Jan-Philipp Litza
|
0dae68a9a3
|
indicate colliding shifts in new shift view
|
2012-12-30 12:09:48 +01:00 |
|
Jan-Philipp Litza
|
2d0b2542c9
|
a few fixes and polishes in myshifts, shifts and menu
|
2012-12-29 14:41:09 +01:00 |
|
Philip Häusler
|
7044c07c00
|
link to edit page and shift mates on myshifts page
|
2012-12-28 20:55:13 +01:00 |
|
Jan-Philipp Litza
|
4c329ecbf9
|
more CSS an JS voodoo for bugblues table view
|
2012-12-27 23:05:09 +01:00 |
|
Jan-Philipp Litza
|
5c8290d880
|
made the user list a bit nicer
|
2012-12-27 17:35:42 +01:00 |
|
Philip Häusler
|
1cf84a87be
|
fix bad html at user_shifts
|
2012-12-27 15:00:21 +01:00 |
|
Jan-Philipp Litza
|
0f0f847af4
|
minor fixes for logging and user editing and searching
|
2012-12-27 02:54:57 +01:00 |
|
Philip Häusler
|
7c42769ab8
|
#28 finnished logging
|
2012-12-27 01:35:05 +01:00 |
|
Jan-Philipp Litza
|
e0e44fc8c3
|
added Atom feed for news and meetings
|
2012-12-26 20:39:54 +01:00 |
|
Jan-Philipp Litza
|
fe6fab67be
|
filter free angels by angeltype
|
2012-12-26 18:14:23 +01:00 |
|
Jan-Philipp Litza
|
910af3eaf7
|
fixes for the last commit
|
2012-12-12 00:45:29 +01:00 |
|
Jan-Philipp Litza
|
a007a23d75
|
fix #91 (SQL error in shift filter) and translate "shifts" and "my shifts" a lot
|
2012-12-12 00:22:30 +01:00 |
|
Philip Häusler
|
079279a1d0
|
code maintenance
|
2012-12-10 09:49:23 +01:00 |
|
Philip Häusler
|
734447b40c
|
29c3 design
|
2012-12-07 18:00:19 +01:00 |
|
Philip Häusler
|
417769091f
|
fixes #74: better shift delete security question
|
2012-12-01 11:44:28 +01:00 |
|
Philip Häusler
|
ddbc5a9db2
|
old faq version
|
2012-11-06 00:28:27 +01:00 |
|
Jan-Philipp Litza
|
34582524ba
|
adapted admin section for FAQ to new database scheme
|
2012-04-26 19:18:17 +02:00 |
|
Philip Häusler
|
b864f2c5b1
|
cleanup old unused files, display tshirt size in admin_active
|
2011-12-29 14:58:50 +01:00 |
|
Philip Häusler
|
8968763ff3
|
provide more information (multiple rooms) in available shifts
|
2011-12-29 14:47:04 +01:00 |
|
Philip Häusler
|
1633d62772
|
ical export for available shifts
|
2011-12-28 14:45:49 +01:00 |
|
Philip Häusler
|
3271f72dcf
|
#44 user angeltypes shift filter
|
2011-12-27 22:28:06 +01:00 |
|
Jan-Philipp Litza
|
037f19a137
|
Give MANY more filter options on shift view
|
2011-12-27 22:13:17 +01:00 |
|
Philip Häusler
|
8259266297
|
#44 shiftplan
|
2011-12-27 15:42:13 +01:00 |
|
Philip Häusler
|
77381ebca8
|
#44 confirm angel types
|
2011-12-26 19:28:34 +01:00 |
|
Philip Häusler
|
d1078f60fd
|
#44 new register form
|
2011-12-26 15:55:17 +01:00 |
|
Philip Häusler
|
10b4f94e5b
|
#29 list of currently unemployed angels
|
2011-12-17 16:25:54 +01:00 |
|
Philip Häusler
|
61d61848a4
|
#1, #3, angels active and t-shirts
|
2011-12-17 15:18:13 +01:00 |
|
Philip Häusler
|
d4c17f48f5
|
#35 admin_shifts: escape from preview
|
2011-10-12 17:02:48 +02:00 |
|
Philip Häusler
|
a06ffd2e49
|
#27 ical export, key reset
|
2011-10-11 22:24:33 +02:00 |
|
Philip Häusler
|
f8ec85e4c6
|
#27 ical export, link explained
|
2011-10-11 22:18:36 +02:00 |
|
Philip Häusler
|
b47b6ed7e4
|
#5 begin edit shifts feature, simplified needed angels
|
2011-10-11 18:35:29 +02:00 |
|
Philip Häusler
|
403c11047b
|
#5 begin edit shifts feature
|
2011-10-11 18:29:26 +02:00 |
|
Jan-Philipp Litza
|
01463f0ac0
|
make shift creation more comfortable by automatically selecting mode on changes to the according fields and remembering entries if error occurs
|
2011-09-16 12:22:03 +02:00 |
|
Jan-Philipp Litza
|
4309131a7d
|
modified credits
|
2011-09-14 23:26:48 +02:00 |
|
Philip Häusler
|
95e9e7b147
|
translated user_shifts to german
|
2011-09-14 23:05:43 +02:00 |
|
Philip Häusler
|
1342dc49cf
|
translated *_question to german
|
2011-09-14 22:50:16 +02:00 |
|
Philip Häusler
|
a5c6ad4393
|
translated some pages to german
|
2011-09-14 22:32:13 +02:00 |
|
Philip Häusler
|
fc90174dd8
|
joined login+start
|
2011-09-14 22:19:10 +02:00 |
|
Philip Häusler
|
ddf309717b
|
#5 delete shifts
|
2011-09-12 18:32:45 +02:00 |
|
Philip Häusler
|
b399227956
|
#5 fixed shift calculation
|
2011-09-12 14:43:13 +02:00 |
|
Philip Häusler
|
024c5ff2e2
|
#5 preview for shifts to be created
|
2011-09-11 23:01:39 +02:00 |
|
Philip Häusler
|
4303b05d08
|
form validation for creating shifts (admin_shifts) and changed database layout
|
2011-09-07 23:30:05 +02:00 |
|
Philip Häusler
|
82522881d4
|
begin form validation
|
2011-09-06 21:05:09 +02:00 |
|
Philip Häusler
|
e665d1701f
|
create multiple shifts
|
2011-09-06 20:45:06 +02:00 |
|
Philip Häusler
|
c3a9e66c32
|
#2 search function for arrived angels
|
2011-07-19 21:18:14 +02:00 |
|
Philip Häusler
|
24e402c6e0
|
#2 mark angels as arrived
|
2011-07-19 21:08:19 +02:00 |
|
Philip Häusler
|
e8c035e166
|
#6 edit my shift comment
|
2011-07-19 19:56:15 +02:00 |
|
Philip Häusler
|
112e449f0f
|
spending some <p>s
|
2011-07-19 19:21:59 +02:00 |
|
Philip Häusler
|
05410ba89a
|
#6 my shifts | cancel my shifts
|
2011-07-19 19:12:36 +02:00 |
|
Philip Häusler
|
4f220e30ce
|
#6 prepare for shift entries
|
2011-07-13 15:17:15 +02:00 |
|
Philip Häusler
|
1bb1997e04
|
#6 browse shifts
|
2011-07-13 15:01:17 +02:00 |
|
Philip Häusler
|
526b9783aa
|
#6 angels shifts
|
2011-07-13 14:30:19 +02:00 |
|
Philip Häusler
|
eeff48ad97
|
#4 import shift names
|
2011-07-13 14:29:40 +02:00 |
|
Philip Häusler
|
d3d6d2e3f1
|
#4 completed import with file-upload and fsock-open method
|
2011-07-12 16:03:07 +02:00 |
|
Philip Häusler
|
4e802b2127
|
#4 pentabarf xml import done
|
2011-07-11 22:41:58 +02:00 |
|
Philip Häusler
|
f058a07a5e
|
#4 pentabarf shift import
|
2011-07-11 21:58:06 +02:00 |
|
Philip Häusler
|
f59f0eae9c
|
#4 pentabarf room import
|
2011-07-11 20:40:27 +02:00 |
|
Philip Häusler
|
dafbb0c10e
|
#4 begin pentabarf-import
|
2011-06-12 17:07:55 +02:00 |
|
Philip Häusler
|
2ba728c71f
|
added bug-report mail-address link
|
2011-06-12 17:07:31 +02:00 |
|
Daniel Friesel
|
5d9335fe18
|
admin_questions: More templates + sql fixes
|
2011-06-03 20:24:36 +02:00 |
|
Daniel Friesel
|
14820a5741
|
user_wakeup template: no tab/newline fuckup
|
2011-06-03 17:29:20 +02:00 |
|
Daniel Friesel
|
c7657ca7ff
|
user_wakeup: Cleanup, use template
|
2011-06-03 17:24:52 +02:00 |
|
Philip Häusler
|
626b9a81f3
|
admin faq
|
2011-06-03 01:03:39 +02:00 |
|
Philip Häusler
|
32b3ce5f90
|
admin questions
|
2011-06-03 00:22:11 +02:00 |
|
Philip Häusler
|
0d6499f7f1
|
user questions
|
2011-06-02 23:45:54 +02:00 |
|
Philip Häusler
|
3afd05636e
|
admin groups
|
2011-06-02 22:40:08 +02:00 |
|
Philip Häusler
|
c0b15dfe0d
|
user messages
|
2011-06-02 21:38:19 +02:00 |
|
Philip Häusler
|
d381f57951
|
user settings
|
2011-06-02 20:18:01 +02:00 |
|
Philip Häusler
|
1c38d62127
|
admin angel types done
|
2011-06-02 17:48:27 +02:00 |
|
Philip Häusler
|
8297d3ba41
|
begin angel types
|
2011-06-02 17:30:17 +02:00 |