Philip Häusler
|
9cabdb1d78
|
shift edit for shifttypes
|
10 years ago |
|
Philip Häusler
|
33bafad9b7
|
fix wrong redirect after shift edit
|
10 years ago |
|
Philip Häusler
|
34e2f49875
|
shift signup improvements for shift view
|
10 years ago |
|
Philip Häusler
|
3770ab8271
|
add import progress
|
10 years ago |
|
Philip Häusler
|
0fda4a9181
|
update german translation
|
10 years ago |
|
Philip Häusler
|
342b79ff3f
|
more fixes
|
10 years ago |
|
Philip Häusler
|
2d587478a1
|
fix different bugs with shift types
|
10 years ago |
|
Philip Häusler
|
702047de53
|
add more icons for better shift view
|
10 years ago |
|
Philip Häusler
|
c12e5336fb
|
display shifts with title
|
10 years ago |
|
Philip Häusler
|
6a05c3d9de
|
rewrite create shifts for shifttypes
|
10 years ago |
|
Philip Häusler
|
0dbd0ea599
|
add basic shift view
|
10 years ago |
|
Felix Favre
|
2f20540a6b
|
more infos in shift view
|
10 years ago |
|
Philip Häusler
|
d02272afd6
|
add basic shift view
|
10 years ago |
|
Philip Häusler
|
a791a75b0a
|
integrate shift type into shifts
|
10 years ago |
|
Felix Favre
|
807e420883
|
only log if api key was reset on purpose
|
10 years ago |
|
Felix Favre
|
b299b0e085
|
reworked user editing of angeltypes
fixes #170
|
10 years ago |
|
Felix Favre
|
f20e24f589
|
shift page styling
|
10 years ago |
|
Felix Favre
|
be1bb5fbeb
|
add simple search to log view
|
10 years ago |
|
Philip Häusler
|
388dd0e136
|
display date
|
10 years ago |
|
Felix Favre
|
ed001633e6
|
Own Shifts ignore the filled filter.
issue #134
|
10 years ago |
|
Felix Favre
|
3e958227aa
|
fix shift collision display
|
10 years ago |
|
Felix Favre
|
e9bbd967ff
|
add freeload info to shiftentry update log
issue #28
|
10 years ago |
|
Felix Favre
|
bc6aa9a209
|
responsify create room form
|
10 years ago |
|
Felix Favre
|
1cc84a967a
|
change default selection
|
10 years ago |
|
Philip Häusler
|
b75700ee1b
|
add shift delete model
|
10 years ago |
|
Philip Häusler
|
d26f8aa12c
|
add shift update model
|
10 years ago |
|
Philip Häusler
|
fa0e38ebff
|
add shift create model
|
10 years ago |
|
Philip Häusler
|
156db1eadd
|
add shift entry update model
|
10 years ago |
|
Philip Häusler
|
0a74ab94a8
|
add shift entry delete model
|
10 years ago |
|
Philip Häusler
|
9176261762
|
add shift entry create model
|
10 years ago |
|
Felix Favre
|
8bcce0e003
|
change button size in user_news
|
10 years ago |
|
Felix Favre
|
45ac884474
|
Merge branch 'master' of github.com:engelsystem/engelsystem
|
10 years ago |
|
Felix Favre
|
921449f3ef
|
more styling
|
10 years ago |
|
Philip Häusler
|
d34fae3c40
|
move hints to toolbar
|
10 years ago |
|
Philip Häusler
|
8261933bec
|
try to prevent hint duplication
|
10 years ago |
|
Felix Favre
|
40d83367bb
|
beautify messages form
|
10 years ago |
|
Felix Favre
|
703de07a63
|
remove striped table from shift view
|
10 years ago |
|
Philip Häusler
|
481e52cf77
|
add email shiftinfo checkbox/flag
|
10 years ago |
|
Philip Häusler
|
57a92dbdcd
|
add opt-in bool for shiftinfo mails and remove icq from users
|
10 years ago |
|
Felix Favre
|
191ba6e1b1
|
replace all the remaining old icons with glyphicons
|
10 years ago |
|
Felix Favre
|
524acb15ba
|
use the new very cool glyph button
|
10 years ago |
|
Felix Favre
|
2654fcf228
|
use glyph_bool in admin_active view
|
10 years ago |
|
Felix Favre
|
67bca99571
|
Use more Striped Tables
issue #159
|
10 years ago |
|
Robert Oehlmann
|
a42ba2f5a1
|
Fixed field assignments in shift entry creation form
|
10 years ago |
|
Robert Oehlmann
|
4edaa26911
|
Fixed shift edit/delete URLs in new layout
|
10 years ago |
|
Philip Häusler
|
785fd45d3a
|
fix register privilege
|
10 years ago |
|
Philip Häusler
|
4931fbb372
|
replace icons with glyphicons
|
10 years ago |
|
Philip Häusler
|
bd2a8b441f
|
clear up mvc for user list
|
10 years ago |
|
Philip Häusler
|
1d9e1c467c
|
user list rewritten
|
10 years ago |
|
Philip Häusler
|
0f77edc4fb
|
hint for disabled registration
|
10 years ago |
|
Philip Häusler
|
e4a042c8c3
|
clear userlist
|
10 years ago |
|
Philip Häusler
|
f06e4a0f47
|
move user messages to menu icon right
|
10 years ago |
|
Philip Häusler
|
094715e6ee
|
optimize navbar for 1024 px width
|
10 years ago |
|
Philip Häusler
|
46575d90c2
|
pulled complete menu to the top (go for mobile...)
|
10 years ago |
|
Philip Häusler
|
1785c38698
|
fix login layout and add mobile nav
|
10 years ago |
|
Moritz Kaspar Rudert (mortzu)
|
27b8223611
|
removed bootstrap.php
|
10 years ago |
|
Philip Häusler
|
fbdb8ae472
|
move new messages badge
|
10 years ago |
|
Philip Häusler
|
0e2b257342
|
begin to refactor user shift state
|
10 years ago |
|
Philip Häusler
|
25b5096c7e
|
update german translation
|
10 years ago |
|
Philip Häusler
|
f9e577352d
|
remove html templates
|
10 years ago |
|
Philip Häusler
|
7f43f3bfe5
|
remove html templates
|
10 years ago |
|
Philip Häusler
|
66f166399c
|
better preselected angeltypes
|
10 years ago |
|
Philip Häusler
|
d60c2f0c40
|
better layout for user register
|
10 years ago |
|
Philip Häusler
|
51cecb27e5
|
better layout for user settings
|
10 years ago |
|
Philip Häusler
|
f5a094fd8b
|
add user view, better bootstrap
|
10 years ago |
|
Philip Häusler
|
74647e16d3
|
add basic bootstrap theme
|
10 years ago |
|
Philip Häusler
|
721aa7f160
|
#148 fix wrong password validation message
|
10 years ago |
|
Philip Häusler
|
e107dff1ce
|
button style and redirect fixes
|
11 years ago |
|
Philip Häusler
|
3401c6f8b6
|
admin import now without template files
|
11 years ago |
|
Philip Häusler
|
cf20bc1c29
|
test for existing shifts
|
11 years ago |
|
Philip Häusler
|
13f8a513d4
|
fix error messages on password recovery
|
11 years ago |
|
Philip Häusler
|
ab450600d7
|
better integration of angeltypes about
|
11 years ago |
|
Philip Häusler
|
f40b78faac
|
angeltypes about section
|
11 years ago |
|
Philip Häusler
|
239c2b1684
|
reviewed cookies api
|
11 years ago |
|
Philip Häusler
|
71feeee3f2
|
innodb and foreign keys
|
11 years ago |
|
Philip Häusler
|
6664433fab
|
cookie-0006-API-add-cmd-sendMessage.patch
|
11 years ago |
|
Philip Häusler
|
316c18f912
|
removed old user angeltypes
|
11 years ago |
|
Philip Häusler
|
5e84539928
|
rewritten angeltypes and user angeltypes
|
11 years ago |
|
Philip Häusler
|
d921cf903e
|
tshirt sum
|
11 years ago |
|
Philip Häusler
|
8c2157c546
|
shirt statistics
|
11 years ago |
|
Philip Häusler
|
124cf64d4f
|
try to fix ical, but still broken
|
11 years ago |
|
Philip Häusler
|
f2b0756296
|
user hover displays angeltypes
|
11 years ago |
|
Philip Häusler
|
0a4bd66c5f
|
removed email and age from user list
|
11 years ago |
|
Philip Häusler
|
1174b11c0a
|
display freeloads in angel list
|
11 years ago |
|
Philip Häusler
|
299652e070
|
fix broken ical export
|
11 years ago |
|
Philip Häusler
|
400dc093c6
|
force active function fix
|
11 years ago |
|
Philip Häusler
|
a9fb05b128
|
force active function
|
11 years ago |
|
Philip Häusler
|
8ce67793df
|
form text fields now make htmlspecialchars
|
11 years ago |
|
Philip Häusler
|
9da2ff6f9f
|
#137 fixed xss on login
|
11 years ago |
|
Philip Häusler
|
9d709b2a73
|
freeloader fix, admins should edit user shifts
|
11 years ago |
|
Philip Häusler
|
c589219a96
|
freeloader feature
|
11 years ago |
|
Philip Häusler
|
fdd4b44c0e
|
fixed button font and added star to shirt size at registration
|
11 years ago |
|
Philip Häusler
|
0c98f13eee
|
user password recovery
|
11 years ago |
|
Philip Häusler
|
e46528ff21
|
#134 removed empty line at the end of admin log php
|
11 years ago |
|
Philip Häusler
|
ec4f173a61
|
admin import uses now msg functions
|
11 years ago |
|
Philip Häusler
|
9a1ffdf198
|
fixed wrong lock icon paths
|
11 years ago |
|
Philip Häusler
|
821e37c1b2
|
removed faq feature
|
11 years ago |
|
Philip Häusler
|
d5b0311061
|
german translation update
|
11 years ago |
|
Philip Häusler
|
c1539ef5bb
|
display stored dect number in settings
|
11 years ago |
|
Philip Häusler
|
ef66360f69
|
fix angeltype assign error
|
11 years ago |
|
Philip Häusler
|
347a861da0
|
register with default config theme
|
11 years ago |
|
Philip Häusler
|
33785f45a2
|
missing start and end shift in session
|
11 years ago |
|
Philip Häusler
|
e60b0df2ec
|
gettext some german translation
|
11 years ago |
|
Philip Häusler
|
c8041fa27f
|
template cleanup
|
11 years ago |
|
Philip Häusler
|
1e05da6c81
|
gettext for user sites
|
11 years ago |
|
Philip Häusler
|
8a5915594f
|
gettext for admin active
|
11 years ago |
|
Philip Häusler
|
85d9bf4f9c
|
angel views in english complete
|
11 years ago |
|
Philip Häusler
|
aad54bfe88
|
basic gettext integration
|
11 years ago |
|
Philip Häusler
|
96a263f712
|
initial gettext integration
|
11 years ago |
|
Philip Häusler
|
bfb0cacd54
|
mysql to mysqli and a lot of cleanup and mvc
|
11 years ago |
|
Philip Häusler
|
d50cc21f50
|
#119 extended json shift information for angeltypes and taken places
|
11 years ago |
|
Philip Häusler
|
fb8241039b
|
#119 added links to json export
|
11 years ago |
|
Philip Häusler
|
a47b1935cb
|
#119 added basic shift json export support using same pattern like ical export
|
11 years ago |
|
Philip Häusler
|
98aac2a429
|
brought back hour sum on my shifts
|
12 years ago |
|
Philip Häusler
|
a573b4e325
|
replaced header with redirect function
|
12 years ago |
|
Philip Häusler
|
8fd5ffb335
|
cleanup user myshifts
|
12 years ago |
|
Philip Häusler
|
dd4530d760
|
User Nick function, enhanced log with some links
|
12 years ago |
|
Jan-Philipp Litza
|
b32ade0a34
|
Fix new shift time filter and show dates for longer shift tables
|
12 years ago |
|
Jan-Philipp Litza
|
3efe63fa10
|
fix #49: "Array" after preview in mass-shift-generation
|
12 years ago |
|
Jan-Philipp Litza
|
de695c0fe4
|
make shifts filterable by timespan instead of days and enable new view for arbitrary timespans
|
12 years ago |
|
Jan-Philipp Litza
|
0d47caa09b
|
simplified stats generation
|
12 years ago |
|
Jan-Philipp Litza
|
f91e00adc7
|
fix bug in signing off from shifts
|
12 years ago |
|
Jan-Philipp Litza
|
7e44546f5c
|
use bin icon instead of cross for deletion
|
12 years ago |
|
Jan-Philipp Litza
|
d509a10121
|
Prevent from signing up for colliding shifts servier-side
|
12 years ago |
|
Jan-Philipp Litza
|
0dae68a9a3
|
indicate colliding shifts in new shift view
|
12 years ago |
|
Jan-Philipp Litza
|
bf226f87dc
|
revert scrollable table because of bad browser implementation and replace by non-fixed header scrolling
|
12 years ago |
|
Philip Häusler
|
38366b0285
|
fix admin user angeltypes, preventing from deleting all permissions
|
12 years ago |
|
Philip Häusler
|
1f764e20a3
|
fixed strange hour sum impossible
|
12 years ago |
|
Philip Häusler
|
b7b8b142e3
|
fixed strange hour sum
|
12 years ago |
|
Philip Häusler
|
a7c44d8dce
|
fixed strange hour sum
|
12 years ago |
|
Philip Häusler
|
8ca71f66cd
|
fixed leaving done shifts by angels bug
|
12 years ago |
|
Philip Häusler
|
19e3cc3434
|
fixed leaving done shifts by angels bug
|
12 years ago |
|
Jan-Philipp Litza
|
2d0b2542c9
|
a few fixes and polishes in myshifts, shifts and menu
|
12 years ago |
|
Philip Häusler
|
b60603d76c
|
news reload duplication bug fixed
|
12 years ago |
|
Jan-Philipp Litza
|
7c7b2d3b54
|
polished code and display of shiftview and used more icons
|
12 years ago |
|
Philip Häusler
|
1867c88484
|
more stats
|
12 years ago |
|
Philip Häusler
|
263edf58f2
|
stats for infobeamer/monitor
|
12 years ago |
|
Philip Häusler
|
7044c07c00
|
link to edit page and shift mates on myshifts page
|
12 years ago |
|
Jan-Philipp Litza
|
01c9d1a810
|
hotfix: show completely free shifts when searching for free shifts
|
12 years ago |
|
Philip Häusler
|
f759296db3
|
make new angeltype confirmes less annoying
|
12 years ago |
|
Philip Häusler
|
ff99dd5b71
|
fixed merge fail - reconstructed new shift view
|
12 years ago |
|
Jan-Philipp Litza
|
9270b54eb1
|
optimizations and minor fixes for user_shifts and admin_user
|
12 years ago |
|
Philip Häusler
|
c5438d5228
|
merged shift view fixes
|
12 years ago |
|
Philip Häusler
|
e61cb06ee8
|
enable deny/confirm all for restricted angeltypes
|
12 years ago |
|
Jan-Philipp Litza
|
cc8f117ed1
|
fix remembering of new-style-setting and fix a bug with signing up for shifts after they startet
|
12 years ago |
|
Jan-Philipp Litza
|
378d524fbd
|
polished the table view by offloading "is this shift free" to SQL. Might put too much load on db server, need to evaluate. Also, replaced loads of & with & and simplified some expressions
|
12 years ago |
|
Jan-Philipp Litza
|
4c329ecbf9
|
more CSS an JS voodoo for bugblues table view
|
12 years ago |
|
Philip Häusler
|
76efad3c5b
|
fix duplicating user angel types
|
12 years ago |
|
Jan-Philipp Litza
|
dd5ca95975
|
fixes for last commit
|
12 years ago |
|
Jan-Philipp Litza
|
13747c62fd
|
more CSS an JS voodoo for bugblues table view
|
12 years ago |
|
Philip Häusler
|
a0ec26126e
|
fix duplicating user angel types
|
12 years ago |
|
Philip Häusler
|
622b856298
|
merge css
|
12 years ago |
|
Philip Häusler
|
88134641b8
|
made angel types usable
|
12 years ago |
|
Philip Häusler
|
242408b71c
|
fixed shift view bug
|
12 years ago |
|
Philip Häusler
|
62e72eda93
|
simplified shift view
|
12 years ago |
|
Jan-Philipp Litza
|
5c8290d880
|
made the user list a bit nicer
|
12 years ago |
|
Jan-Philipp Litza
|
3af1d09d61
|
reworked admin_user again
|
12 years ago |
|
Jan-Philipp Litza
|
b01ab50367
|
Revert "simplified shift view"
This reverts commit 43970df0f3.
|
12 years ago |
|
Philip Häusler
|
f787a2ec70
|
Merge branch 'master' of https://vcs.wybt.net/engelsystem/git
|
12 years ago |
|
Philip Häusler
|
43970df0f3
|
simplified shift view
|
12 years ago |
|
Jan-Philipp Litza
|
e12608ee73
|
made the user list a bit nicer
|
12 years ago |
|
Philip Häusler
|
e82c31a76d
|
Merge branch 'master' of https://vcs.wybt.net/engelsystem/git
|
12 years ago |
|
Philip Häusler
|
1cf84a87be
|
fix bad html at user_shifts
|
12 years ago |
|
Jan-Philipp Litza
|
7a2eae0a4b
|
fix sign out button and remove edit button for "myshifts" when viewing other users
|
12 years ago |
|
Jan-Philipp Litza
|
c0bdfe0871
|
link to Volunteers page of 29C3 whereever angeltypes are mentioned
|
12 years ago |
|
Jan-Philipp Litza
|
5a7a32d559
|
make search case-insensitive
|
12 years ago |
|
Philip Häusler
|
7fa2353c38
|
#28 array hotfix for log
|
12 years ago |
|
Jan-Philipp Litza
|
0f0f847af4
|
minor fixes for logging and user editing and searching
|
12 years ago |
|
Philip Häusler
|
670cd715c5
|
#28 logging doku
|
12 years ago |
|
Philip Häusler
|
29a6f020e6
|
#28 finnished logging, fixes, inverted log order
|
12 years ago |
|
Philip Häusler
|
9293cea5a1
|
Merge branch 'dev' of https://vcs.wybt.net/engelsystem/git into dev
|
12 years ago |
|
Philip Häusler
|
12fb781946
|
#28 finnished logging
|
12 years ago |
|
Philip Häusler
|
74098af09d
|
#28 finnished logging
|
12 years ago |
|
Philip Häusler
|
7c42769ab8
|
#28 finnished logging
|
12 years ago |
|
Jan-Philipp Litza
|
0c9dccacfb
|
allow angels to sign up for shifts whose types are not selected as preferred in settings and auto-prefer these types
|
12 years ago |
|
Jan-Philipp Litza
|
e0e44fc8c3
|
added Atom feed for news and meetings
|
12 years ago |
|
Jan-Philipp Litza
|
fe6fab67be
|
filter free angels by angeltype
|
12 years ago |
|
Jan-Philipp Litza
|
3cc2896376
|
multiply night shifts by 2 (confable with raw mysql)
|
12 years ago |
|
Jan-Philipp Litza
|
51c6547610
|
advanced form in user administration for confirming angeltypes
|
12 years ago |
|
Jan-Philipp Litza
|
7344a08a2f
|
Merge branch 'master' into dev
|
12 years ago |
|
Jan-Philipp Litza
|
26dafba606
|
hotfix for time lock before unsigning from shifts
|
12 years ago |
|
Philip Häusler
|
0dabaa505e
|
#28 begin log
|
12 years ago |
|
Philip Häusler
|
213b6261c8
|
right fix
|
12 years ago |
|
Philip Häusler
|
b8854f7158
|
right fix
|
12 years ago |
|
Philip Häusler
|
419da73bef
|
right fix
|
12 years ago |
|
Philip Häusler
|
fd199ea3a0
|
fix user shift joined nicknames
|
12 years ago |
|
Philip Häusler
|
2d5449f213
|
sort angeltypes on user shifts
|
12 years ago |
|
Philip Häusler
|
ad9695573f
|
#89 profile link in admin user angeltypes
|
12 years ago |
|
Philip Häusler
|
95880bb7d6
|
#77 bugblue-layout fix
|
12 years ago |
|
Philip Häusler
|
6a30868814
|
#77 bugblue-layout fix
|
12 years ago |
|
Philip Häusler
|
b3df228845
|
#77 bugblue-one-day-calendar-layout-patch
|
12 years ago |
|
Philip Häusler
|
8591fb4b5f
|
#10 fix password mind length check
|
12 years ago |
|
Jan-Philipp Litza
|
db95fe6485
|
new authentication framework with stronger passwords and real salts - please proofread!
|
12 years ago |
|
Jan-Philipp Litza
|
697b756c4e
|
more translations and fixes
|
12 years ago |
|
Jan-Philipp Litza
|
910af3eaf7
|
fixes for the last commit
|
12 years ago |
|
Jan-Philipp Litza
|
a007a23d75
|
fix #91 (SQL error in shift filter) and translate "shifts" and "my shifts" a lot
|
12 years ago |
|
Philip Häusler
|
e0b4562de6
|
#83 sort angeltypes to be confirmed
|
12 years ago |
|
Philip Häusler
|
5660d36ef9
|
#83 sort angeltypes to be confirmed
|
12 years ago |
|
Philip Häusler
|
079279a1d0
|
code maintenance
|
12 years ago |
|
Philip Häusler
|
d0c82e1037
|
#86 discard angel type requests
|
12 years ago |