summaryrefslogtreecommitdiffstats
path: root/application/controllers
Commit message (Collapse)AuthorAgeFilesLines
...
* ausgewählter Pool in Session SpeichernBjörn Geiger2011-09-131-0/+8
|
* Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrlsebastian wagner2011-09-121-5/+138
|\
| * verschiedenesBjörn Geiger2011-09-121-5/+138
| |
* | some changessebastian wagner2011-09-121-1/+1
|/
* Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrlsebastian wagner2011-09-121-22/+45
|\
| * Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrlBjörn Geiger2011-09-121-2/+15
| |\
| * | Immediate Event funktioniert jetztBjörn Geiger2011-09-121-22/+45
| | |
* | | minorsebastian wagner2011-09-121-3/+6
| |/ |/|
* | Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrlsebastian wagner2011-09-122-40/+8Star
|\|
| * weitere KorrekturBjörn Geiger2011-09-121-3/+7
| |
| * verschiedene KorrekturenBjörn Geiger2011-09-122-36/+0Star
| |
| * verschiedene KorrekturenBjörn Geiger2011-09-121-1/+1
| |
* | bug fixsebastian wagner2011-09-121-2/+15
|/
* chmod +xroot2011-09-126-0/+0
|
* Immediate Events werden nun direkt ausgeführtBjörn Geiger2011-09-121-4/+112
|
* typeButtons now active! -> change opacity = .5Sebastian Wagner2011-09-101-2/+3
|
* add repeat to eventobjectsebastian wagner2011-09-101-2/+2
|
* addEvent button, new event attr: selectedSebastian Wagner2011-09-091-0/+1
|
* poolselectbox added, events selectabelsebastian wagner2011-09-081-0/+23
|
* Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrlBjörn Geiger2011-09-081-1/+1
|\
| * Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrlSebastian Wagner2011-09-081-8/+16
| |\
| * | minorSebastian Wagner2011-09-081-1/+1
| | |
* | | kleine KOrrekturenBjörn Geiger2011-09-081-1/+1
| |/ |/|
* | immediate eventsBjörn Geiger2011-09-081-8/+16
|/
* Fehler korrigiertBjörn Geiger2011-09-081-15/+27
|
* Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrlSebastian Wagner2011-09-081-2/+9
|\
| * Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrlBjörn Geiger2011-09-081-3/+7
| |\
| * | verschiedenesBjörn Geiger2011-09-081-2/+9
| | |
* | | clean upSebastian Wagner2011-09-081-0/+1
| |/ |/|
* | selection and addEvent fixSebastian Wagner2011-09-081-3/+7
|/
* verschiedene Änderungen + DB UpdateBjörn Geiger2011-09-081-0/+1
|
* Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrlBjörn Geiger2011-09-081-12/+8Star
|\
| * Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrlSebastian Wagner2011-09-081-1/+1
| |\
| * | some changesSebastian Wagner2011-09-081-12/+8Star
| | |
* | | weitere KorrekturBjörn Geiger2011-09-081-2/+3
| |/ |/|
* | weitere Fehler korrigiertBjörn Geiger2011-09-081-1/+1
|/
* Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrlSebastian Wagner2011-09-082-11/+27
|\
| * Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrlBjörn Geiger2011-09-081-0/+4
| |\
| * | kleine korrekturenBjörn Geiger2011-09-082-11/+27
| | |
* | | edit events by dblclickSebastian Wagner2011-09-081-4/+0Star
| |/ |/|
* | delete events by keySebastian Wagner2011-09-081-0/+4
|/
* default eventcategory geändertBjörn Geiger2011-09-071-2/+2
|
* kleine ÄnderungBjörn Geiger2011-09-071-14/+18
|
* Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrlBjörn Geiger2011-09-071-1/+3
|\
| * timeselection to add events implementedSebastian Wagner2011-09-071-1/+3
| |
* | minorBjörn Geiger2011-09-071-5/+5
|/
* Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrlSebastian Wagner2011-09-071-124/+133
|\ | | | | | | | | Conflicts: application/controllers/EventController.php
| * Rechte hinzugefügtBjörn Geiger2011-09-071-45/+75
| |
| * kleine Korrektur von ebenBjörn Geiger2011-09-071-280/+284
| |
| * Run und Report Event auf Recht prüfenBjörn Geiger2011-09-071-356/+329Star
| |