 Daniel
|
50883998a7
|
Merge branch 'feature-profilechilds' into beta
|
pirms 3 gadiem |
|
Daniel
|
97013e71e0
|
deployment script
|
pirms 3 gadiem |
|
Daniel
|
196f5810fd
|
deploy script
|
pirms 3 gadiem |
|
Daniel
|
54ccb37b08
|
Merge branch 'feature-profilechilds' into beta
|
pirms 3 gadiem |
|
Daniel
|
6dba411f67
|
minor styling
|
pirms 3 gadiem |
|
Daniel
|
535087356f
|
Merge branch 'feature-profilechilds' into beta
|
pirms 3 gadiem |
|
Daniel
|
f9b2c2a989
|
appointment filtering
|
pirms 3 gadiem |
|
Daniel
|
1a1fe14acb
|
Merge branch 'feature-profilechilds' into beta
|
pirms 3 gadiem |
|
Daniel
|
34c1fdbc05
|
eventhandler fixes
|
pirms 3 gadiem |
|
Daniel
|
e80ae19063
|
beta deploy script
|
pirms 3 gadiem |
|
Daniel
|
ddbbad283d
|
Merge branch 'feature-profilechilds' into beta
|
pirms 3 gadiem |
|
Daniel
|
90e96ddbe0
|
filter appointments
|
pirms 3 gadiem |
|
Daniel
|
9f071c26a5
|
manager console contract management improvements
|
pirms 3 gadiem |
|
Daniel
|
799be5c41e
|
manager stuff
|
pirms 3 gadiem |
|
Daniel
|
1a084a72fc
|
Merge branch 'master' into feature-profilechilds
# Conflicts:
# .DS_Store
# src/client/app/tmpl/home-appointment-item.html
# src/server/server/config/boot_local.php
|
pirms 3 gadiem |
|
Daniel
|
9d67453203
|
conflict solved
|
pirms 3 gadiem |
|
Daniel
|
1788e8ddd7
|
db dump job
|
pirms 3 gadiem |
|
Daniel
|
03c5e6b751
|
Merge branch 'feature-profilechilds' into beta
# Conflicts:
# .DS_Store
# src/client/app/tmpl/home-appointment-item.html
|
pirms 3 gadiem |
|
Daniel
|
8342067999
|
manager console button link
|
pirms 3 gadiem |
|
Daniel
|
f189cf19b2
|
appointment list time
|
pirms 3 gadiem |
 Florian Eisenmenger
|
e5f99bb230
|
re comment
|
pirms 3 gadiem |
|
Florian Eisenmenger
|
308e88ff55
|
Support: Styling
|
pirms 3 gadiem |
|
Daniel
|
e220c081d9
|
local config and gitignore
|
pirms 3 gadiem |
|
Daniel
|
be43e12d9b
|
fix
|
pirms 3 gadiem |
|
Daniel
|
8c331136ac
|
readme minor
|
pirms 3 gadiem |
|
Daniel
|
10da49c3cf
|
links in appointment, support formular
|
pirms 3 gadiem |
|
Daniel
|
3e8bded0cd
|
links in meeting description
|
pirms 3 gadiem |
|
Florian Eisenmenger
|
a24c36bb00
|
gebe zu gib
|
pirms 3 gadiem |
|
Florian Eisenmenger
|
e1184b0a2b
|
Minor text changes, minor bug changes
|
pirms 3 gadiem |
|
Daniel
|
bfa619e867
|
compose and minor text changes
|
pirms 3 gadiem |
|
Daniel
|
86923826ef
|
configs
|
pirms 3 gadiem |
|
Daniel
|
829f220748
|
test db
|
pirms 3 gadiem |
|
Daniel
|
162446745c
|
updated test db
|
pirms 3 gadiem |
|
Daniel
|
8fac342d99
|
docker setup
|
pirms 3 gadiem |
|
Florian Eisenmenger
|
6068e9b1b0
|
feature branch
|
pirms 3 gadiem |
|
Florian Eisenmenger
|
1e001f3b05
|
initial commit
|
pirms 3 gadiem |
