aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11256] Remove unused controller.provider serviceIgor Wiedler2012-12-071-3/+0
* [ticket/11256] Remove unused service with non-existent classIgor Wiedler2012-12-071-6/+0
* Merge branch 'develop-olympus' into developIgor Wiedler2012-12-070-0/+0
|\
| * Merge remote-tracking branch 'p/ticket/11248' into develop-olympusIgor Wiedler2012-12-071-51/+50
| |\
| | * [ticket/11248] Line endings to LF.Oleg Pudeyev2012-12-051-51/+50
* | | Merge PR #607 branch 'nickvergessen/ticket/10679' into developOleg Pudeyev2012-12-076-6/+62
|\ \ \
| * | | [ticket/10679] Update module basename, we added the xcp_ prefix in 3.1Joas Schilling2012-12-071-1/+1
| * | | [ticket/10679] Use module_auth to limit access to the moduleJoas Schilling2012-12-063-7/+9
| * | | [ticket/10679] Add new permission for changing profile field informationJoas Schilling2012-12-066-5/+59
|/ / /
* | | Merge PR #1101 branch 'develop-olympus' into developOleg Pudeyev2012-12-063-1/+181
|\ \ \ | |/ /
| * | Merge PR #1101 branch 'Noxwizard/ticket/11219' into develop-olympusOleg Pudeyev2012-12-063-1/+181
| |\ \ | | |/ | |/|
| | * [ticket/11219] Coding guidelines and naming consistency changesPatrick Webster2012-12-052-12/+14
| | * [ticket/11219] Only update sequences that are affected by a fixturePatrick Webster2012-12-012-36/+55
| | * [ticket/11219] Recreate Oracle sequences instead of altering themPatrick Webster2012-11-201-53/+18
| | * [ticket/11219] Add unit test for inserting into a sequence columnJoas Schilling2012-11-191-0/+55
| | * [ticket/11219] Update sequence values after loading fixturesPatrick Webster2012-11-182-0/+139
* | | Merge PR #1053 branch 'develop-olympus' into developOleg Pudeyev2012-12-053-6/+43
|\ \ \ | |/ /
| * | Merge PR #1053 branch 'p/ticket/10841' into develop-olympusOleg Pudeyev2012-12-053-6/+42
| |\ \
| | * | [ticket/10841] Revert more whitespace changes.Oleg Pudeyev2012-12-051-2/+2
| | * | [ticket/10841] Revert whitespace changes.Oleg Pudeyev2012-12-052-20/+20
| | * | [ticket/10841] adding space after ifSenky2012-12-051-2/+2
| | * | [ticket/10841] removing unnecessary spacingSenky2012-12-051-2/+2
| | * | [ticket/10841] changing affectedrows check to COUNT in sqlSenky2012-12-051-6/+8
| | * | [ticket/10841] Modifying style and language selectors in UCPSenky2012-12-053-28/+62
| |/ /
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-051-3/+10
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'p/ticket/10602' into develop-olympusAndreas Fischer2012-12-051-3/+10
| |\ \
| | * | [ticket/10602] Avoid a race condition.Oleg Pudeyev2012-12-051-2/+4
| | * | [ticket/10602] Use last_queue_run for its intended purpose.Oleg Pudeyev2012-12-051-3/+8
| |/ /
* | | Merge remote-tracking branch 'p/ticket/11247' into developAndreas Fischer2012-12-051-1/+1
|\ \ \
| * | | [ticket/11247] Fix wrong property reference in flock class.Oleg Pudeyev2012-12-051-1/+1
|/ / /
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-051-0/+74
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'p/ticket/10716' into develop-olympusAndreas Fischer2012-12-051-0/+74
| |\ \
| | * | [ticket/10716] Collect standard error from executed php process.Oleg Pudeyev2012-12-041-2/+3
| | * | [ticket/10716] Skip test if php is not in PATH.Oleg Pudeyev2012-12-041-0/+8
| | * | [ticket/10716] Exclude our dependencies from linting.Oleg Pudeyev2012-12-041-1/+12
| | * | [ticket/10716] Only lint on php 5.3+.Oleg Pudeyev2012-12-041-0/+5
| | * | [ticket/10716] php parse all php files as part of the test suite.Oleg Pudeyev2012-12-041-0/+49
| |/ /
* | | Merge remote-tracking branch 'p/ticket/10103' into developAndreas Fischer2012-12-045-72/+266
|\ \ \
| * | | [ticket/10103] New and improved wording.Oleg Pudeyev2012-12-041-2/+2
| * | | [ticket/10103] Assert with messages.Oleg Pudeyev2012-12-041-2/+2
| * | | [ticket/10103] assertLessThan/assertGreaterThan.Oleg Pudeyev2012-12-041-2/+2
| * | | [ticket/10103] Inline assignment is bad?Oleg Pudeyev2012-12-041-1/+2
| * | | [ticket/10103] $rv had too few characters.Oleg Pudeyev2012-12-041-3/+3
| * | | [ticket/10103] Correct flock class documentation.Oleg Pudeyev2012-12-041-4/+13
| * | | [ticket/10103] Try a longer sleep for travis.Oleg Pudeyev2012-12-041-1/+1
| * | | [ticket/10103] Convert the rest of the tree to flock class.Oleg Pudeyev2012-12-042-8/+16
| * | | [ticket/10103] Test for flock lock class, with concurrency no less.Oleg Pudeyev2012-12-041-0/+108
| * | | [ticket/10103] Use flock lock class in messenger.Oleg Pudeyev2012-12-041-6/+8
| * | | [ticket/10103] Factor out flock lock class.Oleg Pudeyev2012-12-042-58/+124
* | | | Merge remote-tracking branch 'p/ticket/9983' into developAndreas Fischer2012-12-044-118/+33
|\ \ \ \