Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | [ticket/10524] Changed Olympus to Ascraeus in Coding Docs in 3 places | David King | 2011-12-12 | 1 | -3/+3 | |
* | | | | | | | | Merge remote-tracking branch 'github-igorw/feature/functional-tests' into dev... | Nils Adermann | 2011-12-14 | 1 | -2/+10 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | [feature/functional-tests] Introduce bootstrap method | Igor Wiedler | 2011-10-14 | 1 | -0/+8 | |
| * | | | | | | | [feature/functional-tests] Make sure functional tests only install once | Igor Wiedler | 2011-10-14 | 1 | -2/+2 | |
* | | | | | | | | Merge branch 'develop-olympus' into develop | Nils Adermann | 2011-12-09 | 3 | -1/+28 | |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | Merge branch 'prep-release-3.0.10' into develop-olympus | Nils Adermann | 2011-12-09 | 3 | -1/+28 | |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | * | | | | | | Merge branch 'ticket/cyberalien/10319' into prep-release-3.0.10 | Nils Adermann | 2011-12-09 | 3 | -1/+28 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | [ticket/10319] Missing hidden fields in search form | Vjacheslav Trushkin | 2011-12-09 | 3 | -1/+28 | |
| | |/ / / / / / | ||||||
* | | | | | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2011-12-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Merge remote-tracking branch 'p/ticket/10511' into develop-olympus | Andreas Fischer | 2011-12-08 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | [ticket/10511] Fix a grammar defect in permissions language. | Oleg Pudeyev | 2011-12-03 | 1 | -1/+1 | |
* | | | | | | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2011-12-08 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Merge remote-tracking branch 'p/ticket/9876' into develop-olympus | Andreas Fischer | 2011-12-08 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | [ticket/9876] Distinctly name user and forum roles for newly registered users. | Oleg Pudeyev | 2011-12-03 | 1 | -2/+2 | |
| | |/ / / / / / / | ||||||
* | | | | | | | | | Merge branch 'develop-olympus' into develop | Oleg Pudeyev | 2011-12-03 | 1 | -0/+137 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Merge remote-tracking branch 'bantu/ticket/10434' into develop-olympus | Oleg Pudeyev | 2011-12-03 | 1 | -0/+137 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | [ticket/10434] Add script for creating search index from CLI. | Andreas Fischer | 2011-10-30 | 1 | -0/+137 | |
* | | | | | | | | | | Merge branch 'develop-olympus' into develop | Oleg Pudeyev | 2011-12-03 | 4 | -88/+17 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge remote-tracking branch 'Noxwizard/ticket/10349' into develop-olympus | Oleg Pudeyev | 2011-12-03 | 4 | -88/+17 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | [ticket/10349] Removed duplicated functions from schema loading in tests | Patrick Webster | 2011-10-29 | 2 | -44/+4 | |
| | * | | | | | | | | | [ticket/10349] Update function comment | Patrick Webster | 2011-09-28 | 1 | -2/+0 | |
| | * | | | | | | | | | [ticket/10349] Use new schema comment function in installer | Patrick Webster | 2011-09-28 | 3 | -50/+11 | |
| | * | | | | | | | | | [ticket/10349] Unit tests: Consolidate schema comment removal functions | Patrick Webster | 2011-09-20 | 1 | -58/+11 | |
| | * | | | | | | | | | [ticket/10349] Unit tests: Remove comments while loading schema files | Patrick Webster | 2011-09-03 | 1 | -1/+58 | |
* | | | | | | | | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2011-12-04 | 2 | -3/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | Merge branch 'prep-release-3.0.10' into develop-olympus | Andreas Fischer | 2011-12-04 | 2 | -3/+8 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | [prep-release-3.0.10] Bumping version number for 3.0.10-RC3. | Andreas Fischer | 2011-12-04 | 4 | -6/+11 | |
* | | | | | | | | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2011-12-04 | 1 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | Merge branch 'prep-release-3.0.10' into develop-olympus | Andreas Fischer | 2011-12-04 | 1 | -3/+4 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10503' into prep-release-3... | Andreas Fischer | 2011-12-04 | 1 | -3/+4 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | [ticket/10503] Debug error "Invalid arguments" when previewing edits | Joas Schilling | 2011-11-28 | 1 | -3/+4 | |
* | | | | | | | | | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2011-12-04 | 1 | -28/+72 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge remote-tracking branch 'p/ticket/10093' into develop-olympus | Andreas Fischer | 2011-12-03 | 1 | -28/+72 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | [ticket/10093] Use correct ANSI code for clearing color. | Oleg Pudeyev | 2011-12-03 | 1 | -2/+2 | |
| | * | | | | | | | | | | [ticket/10093] Make commit-msg always not fatal by nuking all fatal logic. | Oleg Pudeyev | 2011-12-03 | 1 | -18/+3 | |
| | * | | | | | | | | | | [ticket/10093] Use color in commit-msg hook warning/error messages. | Oleg Pudeyev | 2011-11-26 | 1 | -1/+50 | |
| | * | | | | | | | | | | [ticket/10093] Refactor complaining in commit-msg hook for color support. | Oleg Pudeyev | 2011-11-26 | 1 | -17/+22 | |
| | * | | | | | | | | | | [ticket/10093] Respect phpbb.hooks.commit-msg.fatal on syntax errors. | Oleg Pudeyev | 2011-11-26 | 1 | -1/+1 | |
| | * | | | | | | | | | | [ticket/10093] Document phpbb.hooks.commit-msg.fatal setting. | Oleg Pudeyev | 2011-11-26 | 1 | -0/+5 | |
* | | | | | | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/develop/10345' into develop | Oleg Pudeyev | 2011-12-03 | 51 | -401/+733 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | [ticket/10345] Check directly whether the key to use exists | Joas Schilling | 2011-11-30 | 1 | -8/+16 | |
| * | | | | | | | | | | | | [ticket/10345] Return the language key when the key has an empty array | Joas Schilling | 2011-11-30 | 2 | -0/+10 | |
| * | | | | | | | | | | | | [ticket/10345] Document behaviour for floating numbers on phpbb_get_plural_form | Joas Schilling | 2011-11-30 | 2 | -2/+2 | |
| * | | | | | | | | | | | | [ticket/10345] Remove doubled check for valid plural rule | Joas Schilling | 2011-11-30 | 1 | -4/+0 | |
| * | | | | | | | | | | | | [ticket/10345] Add documentation and phpbb_ prefix to the new avatar functions | Joas Schilling | 2011-11-30 | 5 | -14/+26 | |
| * | | | | | | | | | | | | [ticket/10345] Add cases for 1 pixel height on MAX_FLASH and MAX_IMG sizes | Joas Schilling | 2011-11-27 | 1 | -0/+4 | |
| * | | | | | | | | | | | | [ticket/10345] Fix parsing error in language/en/viewtopic.php | Joas Schilling | 2011-11-27 | 1 | -1/+1 | |
| * | | | | | | | | | | | | [ticket/10345] Move rule determination code into a new function | Joas Schilling | 2011-11-25 | 2 | -153/+173 | |
| * | | | | | | | | | | | | [ticket/10345] Fix little type in unit test | Joas Schilling | 2011-11-25 | 1 | -1/+1 | |
| * | | | | | | | | | | | | [ticket/10345] Remove more useless 0-cases | Joas Schilling | 2011-11-25 | 6 | -25/+0 |