You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Carsten Brandt
3518813ac4
Merge branch 'master' into redis
* master: (108 commits)
fixed indentation in test files
cleanup tests
Travis-CI build status.
CS fixes.
CS fixes.
Change magic property to normal method. (Thanks to @maxlapko.)
CS fixes.
Fixed duplicated merge.
Fixes issue #50: implemented pager widgets.
fix: remove pointless unset
remove fix for unset timezone from bootstrap app
mod: don't use ArrayHelper to avoid loading another class during every request
better have timezone fix in application
Add exception classes hierarchy UML diagram.
Initial Gettext support.
RBAC sql files identation fix
RBAC sql files
DbManager some Db fields renaming
DbManager code style fix + right Exception type fix
Unit tests fix
...
Conflicts:
tests/unit/framework/caching/ApcCacheTest.php
tests/unit/framework/caching/CacheTest.php
|
12 years ago |
| .. |
|
unit
|
Merge branch 'master' into redis
|
12 years ago |
|
web/app
|
Moved "framework" to "iii".
|
12 years ago |
