aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2352 from nickvergessen/ticket/11917Andreas Fischer2014-04-251-2/+2
|\ | | | | | | | | | | | | [ticket/11917] Replace space with tabs * nickvergessen/ticket/11917: [ticket/11917] Replace space with tabs
| * [ticket/11917] Replace space with tabsJoas Schilling2014-04-251-2/+2
|/ | | | PHPBB3-11917
* Merge pull request #2348 from bantu/ticket/12436Joas Schilling2014-04-241-2/+2
|\ | | | | | | | | | | | | [ticket/12436] Data passed to sql_multi_insert is expected to be multi-d... * bantu/ticket/12436: [ticket/12436] Data passed to sql_multi_insert is expected to be multi-dim.
| * [ticket/12436] Data passed to sql_multi_insert is expected to be multi-dim.Andreas Fischer2014-04-241-2/+2
|/ | | | PHPBB3-12436
* Merge remote-tracking branch 'github-nickvergessen/ticket/11917' into ↵Nils Adermann2014-04-244-2/+55
|\ | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/11917: [ticket/11917] Move OAuth Module to the bottom while installing [ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backend Conflicts: phpBB/install/install_install.php
| * [ticket/11917] Move OAuth Module to the bottom while installingJoas Schilling2014-04-121-0/+12
| | | | | | | | PHPBB3-11917
| * [ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backendJoas Schilling2014-04-123-1/+42
| | | | | | | | PHPBB3-11917
* | Merge pull request #2036 from prototech/ticket/12201Joas Schilling2014-04-226-37/+58
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12201] Clean up ACP attachment management page * prototech/ticket/12201: [ticket/12201] Decreased pagination font size. [ticket/12201] Update select element to follow same design as prosilver. [ticket/12201] Increase sort font size just slightly. [ticket/12201] Add link to resync file stats after error. [ticket/12201] Fix typos in language pack. [ticket/12201] Display error and sorting options when there are no attachments [ticket/12201] Only the top pagination should be floated to the right. [ticket/12201] Rearrange pagination, sorting, and submit elements. [ticket/12201] Center the file size and mark columns. [ticket/12201] Separate pagination from table.
| * | [ticket/12201] Decreased pagination font size.Cesar G2014-04-151-0/+1
| | | | | | | | | | | | PHPBB3-12201
| * | [ticket/12201] Update select element to follow same design as prosilver.Cesar G2014-04-151-0/+3
| | | | | | | | | | | | PHPBB3-12201
| * | [ticket/12201] Increase sort font size just slightly.Cesar G2014-04-151-1/+1
| | | | | | | | | | | | PHPBB3-12201
| * | [ticket/12201] Add link to resync file stats after error.Cesar G2014-04-153-14/+15
| | | | | | | | | | | | PHPBB3-12201
| * | [ticket/12201] Fix typos in language pack.Cesar G2014-04-151-4/+4
| | | | | | | | | | | | PHPBB3-12201
| * | [ticket/12201] Display error and sorting options when there are no attachmentsCesar G2014-04-152-1/+8
| | | | | | | | | | | | PHPBB3-12201
| * | [ticket/12201] Only the top pagination should be floated to the right.Cesar G2014-04-151-1/+1
| | | | | | | | | | | | PHPBB3-12201
| * | [ticket/12201] Rearrange pagination, sorting, and submit elements.Cesar G2014-04-151-15/+16
| | | | | | | | | | | | PHPBB3-12201
| * | [ticket/12201] Center the file size and mark columns.Cesar G2014-04-152-4/+8
| | | | | | | | | | | | PHPBB3-12201
| * | [ticket/12201] Separate pagination from table.Cesar G2014-04-153-2/+6
| | | | | | | | | | | | PHPBB3-12201
* | | Merge pull request #2337 from prototech/ticket/12130Joas Schilling2014-04-221-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12130] Fix issue with li:first-child in <ul> having a bullet in IE8. * prototech/ticket/12130: [ticket/12130] Fix issue with li:first-child in <ul> having a bullet in IE8.
| * | | [ticket/12130] Fix issue with li:first-child in <ul> having a bullet in IE8.Cesar G2014-04-201-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12130
* | | | Merge pull request #2335 from Elsensee/ticket/12422Joas Schilling2014-04-223-3/+62
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12422] Fix debug warning in log search * Elsensee/ticket/12422: [ticket/12422] Add tests [ticket/12422] Fix debug warning in log search
| * | | | [ticket/12422] Add testsOliver Schramm2014-04-222-1/+46
| | | | | | | | | | | | | | | | | | | | PHPBB3-12422
| * | | | [ticket/12422] Fix debug warning in log searchOliver Schramm2014-04-201-2/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-12422
* | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-04-220-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | * develop-olympus:
| * \ \ \ \ Merge pull request #2341 from nickvergessen/ticket/12413Andreas Fischer2014-04-221-70/+9
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0 in olympus * nickvergessen/ticket/12413: [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0
* | \ \ \ \ \ Merge pull request #2342 from nickvergessen/ticket/12413-ascraeusAndreas Fischer2014-04-220-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12413-ascraeus] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0 in olympus * nickvergessen/ticket/12413-ascraeus: [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0
| * \ \ \ \ \ \ [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0 in olympusJoas Schilling2014-04-220-0/+0
| |\ \ \ \ \ \ \ |/ / / / / / / / | | | _ / / / / | | | / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ticket/12413' into ticket/12413-ascraeus * ticket/12413: [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0 Conflicts: phpBB/feed.php The reverting is not done for develop-ascraeus and above. We want to fix it properly there instead. PHPBB3-12413
| * | | | | | [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0Joas Schilling2014-04-221-70/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Merge remote-tracking branch 'dhruvgoel92/ticket/11271' into develop-olympus" This reverts commit e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0, reversing changes made to 214f515e9ccc71e368882384fb38bd7135b0e40f. PHPBB3-12413
* | | | | | Merge pull request #2248 from Elsensee/ticket/12193Joas Schilling2014-04-222-0/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12193] Fix broken HTML if SQL error occurs during migration * Elsensee/ticket/12193: [ticket/12193] Fix broken HTML if SQL error occurs during migration
| * | | | | | [ticket/12193] Fix broken HTML if SQL error occurs during migrationOliver Schramm2014-04-192-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12193
* | | | | | | Merge pull request #2334 from bantu/ticket/12423Joas Schilling2014-04-222-66/+97
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stable Composer Minimum Stability + Some Composer Dependency Updates * bantu/ticket/12423: [ticket/12424] Update Symfony component from v2.3.4 to v2.3.12. [ticket/12423] Move PHP CodeSniffer from non-stable 1.5.0RC4 to latest 1.5.2. [ticket/12423] Increase Composer minimum-stability to stable.
| * | | | | | [ticket/12424] Update Symfony component from v2.3.4 to v2.3.12.Andreas Fischer2014-04-201-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12424
| * | | | | | [ticket/12423] Move PHP CodeSniffer from non-stable 1.5.0RC4 to latest 1.5.2.Andreas Fischer2014-04-201-30/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12423
| * | | | | | [ticket/12423] Increase Composer minimum-stability to stable.Andreas Fischer2014-04-201-1/+0
| | |_|/ / / | |/| | | | | | | | | | | | | | | | PHPBB3-12423
* | | | | | Merge remote-tracking branch 'PayBas/ticket/12347' into develop-ascraeusCesar G2014-04-203-4/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PayBas/ticket/12347: [ticket/12347] Remove unknown/unnecessary hack [ticket/12347] IE8 compatible CSS selector [ticket/12347] Changed from :after to :before [ticket/12347] Changed to the new navbar templates
| * | | | | | [ticket/12347] Remove unknown/unnecessary hackPayBas2014-04-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12347
| * | | | | | [ticket/12347] IE8 compatible CSS selectorPayBas2014-04-202-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12347
| * | | | | | [ticket/12347] Changed from :after to :beforePayBas2014-04-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12347
| * | | | | | [ticket/12347] Changed to the new navbar templatesPayBas2014-04-113-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12347
* | | | | | | Merge pull request #2332 from VSEphpbb/ticket/12405Joas Schilling2014-04-201-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12405] Valid timezone and dateformat for create_user() in tests * VSEphpbb/ticket/12405: [ticket/12405] Valid timezone and dateformat for create_user() in tests
| * | | | | | | [ticket/12405] Valid timezone and dateformat for create_user() in testsMatt Friedman2014-04-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12405
* | | | | | | | Merge remote-tracking branch 'PayBas/ticket/12363' into develop-ascraeusCesar G2014-04-204-2/+6
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PayBas/ticket/12363: [ticket/12363] Fix typo [ticket/12363] changed _winner_ to _most-votes_ [ticket/12363] Mark winning (most votes) results bar
| * | | | | | | [ticket/12363] Fix typoPayBas2014-04-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12363
| * | | | | | | [ticket/12363] changed _winner_ to _most-votes_PayBas2014-04-064-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12363
| * | | | | | | [ticket/12363] Mark winning (most votes) results barPayBas2014-04-064-2/+6
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-12363
* | | | | | | Merge pull request #2299 from nickvergessen/ticket/12390Andreas Fischer2014-04-202-0/+93
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12390] Remove documentation, tests and other files from vendor/ * nickvergessen/ticket/12390: [ticket/12390] Add comment to composer.json to update the build target [ticket/12390] Move cleaning of vendor into it's own target [ticket/12390] Remove documentation, tests and other files from vendor/
| * | | | | | [ticket/12390] Add comment to composer.json to update the build targetJoas Schilling2014-04-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12390
| * | | | | | [ticket/12390] Move cleaning of vendor into it's own targetJoas Schilling2014-04-161-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12390
| * | | | | | [ticket/12390] Remove documentation, tests and other files from vendor/Joas Schilling2014-04-121-0/+83
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | PHPBB3-12390
* | | | | | Merge remote-tracking branch 'VSEphpbb/ticket/12419' into develop-ascraeusCesar G2014-04-181-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * VSEphpbb/ticket/12419: [ticket/12419] Also shrink the size of "See All" in footer a little bit [ticket/12419] Improve font size in notifications drop-down