Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop-olympus' into develop | Joas Schilling | 2013-11-26 | 2 | -1/+2 |
|\ | | | | | | | | | | | | | | | * develop-olympus: [ticket/12037] Fix hard-coded text in acp_inactive.html. Conflicts: phpBB/adm/style/acp_inactive.html | ||||
| * | Merge remote-tracking branch 'prototech/ticket/12037' into develop-olympus | Joas Schilling | 2013-11-26 | 2 | -1/+2 |
| |\ | | | | | | | | | | | | | * prototech/ticket/12037: [ticket/12037] Fix hard-coded text in acp_inactive.html. | ||||
| | * | [ticket/12037] Fix hard-coded text in acp_inactive.html. | Cesar G | 2013-11-25 | 2 | -1/+2 |
| |/ | | | | | | | PHPBB3-12037 | ||||
* | | Merge pull request #1886 from nickvergessen/ticket/12027 | Nils Adermann | 2013-11-22 | 1 | -0/+3 |
|\ \ | | | | | | | [Ticket/12027] List redis as service in .travis.yml | ||||
| * | | [ticket/12027] List redis as service in .travis.yml | Joas Schilling | 2013-11-22 | 1 | -0/+3 |
| | | | | | | | | | | | | PHPBB3-12027 | ||||
* | | | Merge pull request #1884 from nickvergessen/ticket/12015-2 | Nathan Guse | 2013-11-21 | 1 | -6/+14 |
|\ \ \ | |/ / |/| | | [ticket/12015] Fix variable name and event version | ||||
| * | | [ticket/12015] Fix variable name and event version | Joas Schilling | 2013-11-21 | 1 | -6/+14 |
|/ / | | | | | | | PHPBB3-12015 | ||||
* | | Merge pull request #1883 from s9e/ticket/12028 | Nathan Guse | 2013-11-21 | 2 | -2/+2 |
|\ \ | | | | | | | [ticket/12028] Replace L_COLON with literal colon | ||||
| * | | [ticket/12028] Replace L_COLON with literal colon | s9e | 2013-11-21 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Replace L_COLON with literal colon in JavaScript context. [ci skip] PHPBB3-12028 | ||||
* | | | Merge pull request #1870 from nickvergessen/ticket/12015 | Nathan Guse | 2013-11-21 | 2 | -4/+40 |
|\ \ \ | |/ / |/| | | Ticket/12015 Enhance events in viewtopic to increase their usability | ||||
| * | | [ticket/12015] Fix english grammar | Joas Schilling | 2013-11-21 | 1 | -1/+1 |
| | | | | | | | | | | | | PHPBB3-12015 | ||||
| * | | [ticket/12015] Add some parameters to viewonline events | Joas Schilling | 2013-11-13 | 1 | -2/+7 |
| | | | | | | | | | | | | PHPBB3-12015 | ||||
| * | | [ticket/12015] Add @change to events that got changed | Joas Schilling | 2013-11-13 | 1 | -1/+3 |
| | | | | | | | | | | | | PHPBB3-12015 | ||||
| * | | [ticket/12015] Add post counting information to event | Joas Schilling | 2013-11-13 | 1 | -3/+10 |
| | | | | | | | | | | | | PHPBB3-12015 | ||||
| * | | [ticket/12015] Add an event after the post has been assigned to the template | Joas Schilling | 2013-11-13 | 1 | -0/+14 |
| | | | | | | | | | | | | PHPBB3-12015 | ||||
| * | | [ticket/12015] Add attachments to core.viewtopic_modify_post_row | Joas Schilling | 2013-11-13 | 1 | -1/+2 |
| | | | | | | | | | | | | PHPBB3-12015 | ||||
| * | | [ticket/12015] Add more parameters to core.viewtopic_get_post_data | Joas Schilling | 2013-11-13 | 1 | -1/+8 |
| | | | | | | | | | | | | PHPBB3-12015 | ||||
* | | | Merge pull request #1854 from Pico88/ticket/12005 | Nathan Guse | 2013-11-21 | 12 | -109/+43 |
|\ \ \ | | | | | | | | | [ticket/12005] Remove code responsible for PM popup completely | ||||
| * | | | [ticket/12005] Remove PM popup module from DB | Lukasz | 2013-11-08 | 1 | -0/+42 |
| | | | | | | | | | | | | | | | | PHPBB3-12005 | ||||
| * | | | [ticket/12005] Delete templates files | Lukasz | 2013-11-08 | 2 | -62/+0 |
| | | | | | | | | | | | | | | | | PHPBB3-12005 | ||||
| * | | | [ticket/12005] Remove language vars used by PM popup | Lukasz | 2013-11-08 | 2 | -7/+0 |
| | | | | | | | | | | | | | | | | PHPBB3-12005 | ||||
| * | | | [ticket/12005] Remove PM popup | Lukasz | 2013-11-08 | 2 | -3/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-12005 | ||||
| * | | | [ticket/12005] Remove PM popup UCP module | Lukasz | 2013-11-08 | 2 | -28/+0 |
| | | | | | | | | | | | | | | | | PHPBB3-12005 | ||||
| * | | | [ticket/12005] Remove PM popup from converter | Lukasz | 2013-11-08 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | PHPBB3-12005 | ||||
| * | | | [ticket/12005] Remove PM popup setting from user preferences | Lukasz | 2013-11-08 | 2 | -8/+0 |
| | | | | | | | | | | | | | | | | PHPBB3-12005 | ||||
* | | | | Merge pull request #1856 from prototech/ticket/12001 | Nathan Guse | 2013-11-21 | 3 | -28/+31 |
|\ \ \ \ | | | | | | | | | | | [ticket/12001] Ensure that form data is sent to server in AJAX requests. | ||||
| * | | | | [ticket/12001] Ensure that form data is sent to server in AJAX requests. | Cesar G | 2013-11-08 | 3 | -28/+31 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-12001 | ||||
* | | | | | Merge pull request #1860 from prototech/ticket/12010 | Nathan Guse | 2013-11-21 | 6 | -26/+35 |
|\ \ \ \ \ | | | | | | | | | | | | | [ticket/12010] Make the navbar icons clickable. | ||||
| * | | | | | [ticket/12010] Make the navbar icons clickable. | Cesar G | 2013-11-08 | 6 | -26/+35 |
| |/ / / / | | | | | | | | | | | | | | | | PHPBB3-12010 | ||||
* | | | | | Merge pull request #1834 from cyberalien/ticket/11984 | Nathan Guse | 2013-11-21 | 5 | -11/+18 |
|\ \ \ \ \ | | | | | | | | | | | | | Move responsive design adjustments | ||||
| * | | | | | [ticket/11984] Do not resize textarea on touch devices | Vjacheslav Trushkin | 2013-11-19 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11984 | ||||
| * | | | | | [ticket/11984] Hide <dfn> for invalid extensions | Vjacheslav Trushkin | 2013-11-19 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11984 | ||||
| * | | | | | [ticket/11984] Fix stray </ul> and active tab hover in ACP | Vjacheslav Trushkin | 2013-11-19 | 2 | -11/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11984 | ||||
| * | | | | | [ticket/11984] Prevent AJAX background animation flicker in prosilver | Vjacheslav Trushkin | 2013-11-19 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11984 | ||||
| * | | | | | [ticket/11984] Prevent AJAX background animation flicker in ACP | Vjacheslav Trushkin | 2013-11-19 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11984 | ||||
* | | | | | | Merge pull request #1869 from prototech/ticket/10810 | Nathan Guse | 2013-11-21 | 15 | -207/+117 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [ticket/10810] Move color swatches from popup windows to inline blocks. | ||||
| * | | | | | | [ticket/10810] Remove obsolete swatch code. | Cesar G | 2013-11-13 | 4 | -134/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10810 | ||||
| * | | | | | | [ticket/10810] Update all palettes. | Cesar G | 2013-11-13 | 9 | -12/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10810 | ||||
| * | | | | | | [ticket/10810] Make the color palette usable outside of the editor context. | Cesar G | 2013-11-13 | 1 | -8/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10810 | ||||
| * | | | | | | [ticket/10810] Move the color palette code to core.js. | Cesar G | 2013-11-12 | 2 | -61/+57 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10810 | ||||
* | | | | | | | Merge pull request #1882 from prototech/ticket/11959 | Nathan Guse | 2013-11-21 | 2 | -3/+33 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | [ticket/11959] Trim the list of users from post notifications. | ||||
| * | | | | | | | [ticket/11959] Rename $extra_cnt to something more descriptive. | Cesar G | 2013-11-21 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11959 | ||||
| * | | | | | | | [ticket/11959] Use COMMA_SEPARATOR to join the user list. | Cesar G | 2013-11-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11959 | ||||
| * | | | | | | | [ticket/11959] Trim the list of users from post notifications. | Cesar G | 2013-11-21 | 2 | -2/+32 |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | PHPBB3-11959 | ||||
* | | | | | | | Merge pull request #1878 from blitze/ticket/12024 | Nathan Guse | 2013-11-21 | 5 | -0/+22 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | [ticket/12024] Template event overall_header_content_before | ||||
| * | | | | | | | [ticket/12024] Add new line | OpenShift guest | 2013-11-19 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12024 | ||||
| * | | | | | | | [ticket/12024] Correct the 'since' information in event list | OpenShift guest | 2013-11-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12024 | ||||
| * | | | | | | | [ticket/12024] Update events list | OpenShift guest | 2013-11-18 | 1 | -0/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12024 | ||||
| * | | | | | | | [ticket/12024] Replace newline | OpenShift guest | 2013-11-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12024 | ||||
| * | | | | | | | [ticket/12024] Template event overall_header_content_before | OpenShift guest | 2013-11-18 | 4 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44959 http://tracker.phpbb.com/browse/PHPBB3-12024 PHPBB3-12024 |