aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11842Marc Alexander2013-11-27422-4805/+5718
|\ | | | | | | | | Conflicts: phpBB/includes/acp/acp_groups.php
| * Merge remote-tracking branch 'prototech/ticket/12036' into developJoas Schilling2013-11-261-1/+1
| |\ | | | | | | | | | | | | * prototech/ticket/12036: [ticket/12036] Re-add missing move up button to module management page.
| | * [ticket/12036] Re-add missing move up button to module management page.Cesar G2013-11-251-1/+1
| | | | | | | | | | | | PHPBB3-12036
| * | Merge branch 'develop-olympus' into developJoas Schilling2013-11-262-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-olympusJoas Schilling2013-11-262-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 G2013-11-252-1/+2
| | |/ | | | | | | | | | PHPBB3-12037
| * | Merge pull request #1886 from nickvergessen/ticket/12027Nils Adermann2013-11-221-0/+3
| |\ \ | | | | | | | | [Ticket/12027] List redis as service in .travis.yml
| | * | [ticket/12027] List redis as service in .travis.ymlJoas Schilling2013-11-221-0/+3
| | | | | | | | | | | | | | | | PHPBB3-12027
| * | | Merge pull request #1884 from nickvergessen/ticket/12015-2Nathan Guse2013-11-211-6/+14
| |\ \ \ | | |/ / | |/| | [ticket/12015] Fix variable name and event version
| | * | [ticket/12015] Fix variable name and event versionJoas Schilling2013-11-211-6/+14
| |/ / | | | | | | | | | PHPBB3-12015
| * | Merge pull request #1883 from s9e/ticket/12028Nathan Guse2013-11-212-2/+2
| |\ \ | | | | | | | | [ticket/12028] Replace L_COLON with literal colon
| | * | [ticket/12028] Replace L_COLON with literal colons9e2013-11-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace L_COLON with literal colon in JavaScript context. [ci skip] PHPBB3-12028
| * | | Merge pull request #1870 from nickvergessen/ticket/12015Nathan Guse2013-11-212-4/+40
| |\ \ \ | | |/ / | |/| | Ticket/12015 Enhance events in viewtopic to increase their usability
| | * | [ticket/12015] Fix english grammarJoas Schilling2013-11-211-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12015
| | * | [ticket/12015] Add some parameters to viewonline eventsJoas Schilling2013-11-131-2/+7
| | | | | | | | | | | | | | | | PHPBB3-12015
| | * | [ticket/12015] Add @change to events that got changedJoas Schilling2013-11-131-1/+3
| | | | | | | | | | | | | | | | PHPBB3-12015
| | * | [ticket/12015] Add post counting information to eventJoas Schilling2013-11-131-3/+10
| | | | | | | | | | | | | | | | PHPBB3-12015
| | * | [ticket/12015] Add an event after the post has been assigned to the templateJoas Schilling2013-11-131-0/+14
| | | | | | | | | | | | | | | | PHPBB3-12015
| | * | [ticket/12015] Add attachments to core.viewtopic_modify_post_rowJoas Schilling2013-11-131-1/+2
| | | | | | | | | | | | | | | | PHPBB3-12015
| | * | [ticket/12015] Add more parameters to core.viewtopic_get_post_dataJoas Schilling2013-11-131-1/+8
| | | | | | | | | | | | | | | | PHPBB3-12015
| * | | Merge pull request #1854 from Pico88/ticket/12005Nathan Guse2013-11-2112-109/+43
| |\ \ \ | | | | | | | | | | [ticket/12005] Remove code responsible for PM popup completely
| | * | | [ticket/12005] Remove PM popup module from DBLukasz2013-11-081-0/+42
| | | | | | | | | | | | | | | | | | | | PHPBB3-12005
| | * | | [ticket/12005] Delete templates filesLukasz2013-11-082-62/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12005
| | * | | [ticket/12005] Remove language vars used by PM popupLukasz2013-11-082-7/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12005
| | * | | [ticket/12005] Remove PM popupLukasz2013-11-082-3/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12005
| | * | | [ticket/12005] Remove PM popup UCP moduleLukasz2013-11-082-28/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12005
| | * | | [ticket/12005] Remove PM popup from converterLukasz2013-11-081-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12005
| | * | | [ticket/12005] Remove PM popup setting from user preferencesLukasz2013-11-082-8/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12005
| * | | | Merge pull request #1856 from prototech/ticket/12001Nathan Guse2013-11-213-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 G2013-11-083-28/+31
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12001
| * | | | | Merge pull request #1860 from prototech/ticket/12010Nathan Guse2013-11-216-26/+35
| |\ \ \ \ \ | | | | | | | | | | | | | | [ticket/12010] Make the navbar icons clickable.
| | * | | | | [ticket/12010] Make the navbar icons clickable.Cesar G2013-11-086-26/+35
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-12010
| * | | | | Merge pull request #1834 from cyberalien/ticket/11984Nathan Guse2013-11-215-11/+18
| |\ \ \ \ \ | | | | | | | | | | | | | | Move responsive design adjustments
| | * | | | | [ticket/11984] Do not resize textarea on touch devicesVjacheslav Trushkin2013-11-191-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11984
| | * | | | | [ticket/11984] Hide <dfn> for invalid extensionsVjacheslav Trushkin2013-11-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11984
| | * | | | | [ticket/11984] Fix stray </ul> and active tab hover in ACPVjacheslav Trushkin2013-11-192-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11984
| | * | | | | [ticket/11984] Prevent AJAX background animation flicker in prosilverVjacheslav Trushkin2013-11-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11984
| | * | | | | [ticket/11984] Prevent AJAX background animation flicker in ACPVjacheslav Trushkin2013-11-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11984
| * | | | | | Merge pull request #1869 from prototech/ticket/10810Nathan Guse2013-11-2115-207/+117
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/10810] Move color swatches from popup windows to inline blocks.
| | * | | | | | [ticket/10810] Remove obsolete swatch code.Cesar G2013-11-134-134/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10810
| | * | | | | | [ticket/10810] Update all palettes.Cesar G2013-11-139-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10810
| | * | | | | | [ticket/10810] Make the color palette usable outside of the editor context.Cesar G2013-11-131-8/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10810
| | * | | | | | [ticket/10810] Move the color palette code to core.js.Cesar G2013-11-122-61/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10810
| * | | | | | | Merge pull request #1882 from prototech/ticket/11959Nathan Guse2013-11-212-3/+33
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/11959] Trim the list of users from post notifications.
| | * | | | | | | [ticket/11959] Rename $extra_cnt to something more descriptive.Cesar G2013-11-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11959
| | * | | | | | | [ticket/11959] Use COMMA_SEPARATOR to join the user list.Cesar G2013-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11959
| | * | | | | | | [ticket/11959] Trim the list of users from post notifications.Cesar G2013-11-212-2/+32
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | PHPBB3-11959
| * | | | | | | Merge pull request #1878 from blitze/ticket/12024Nathan Guse2013-11-215-0/+22
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12024] Template event overall_header_content_before
| | * | | | | | | [ticket/12024] Add new lineOpenShift guest2013-11-192-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12024
| | * | | | | | | [ticket/12024] Correct the 'since' information in event listOpenShift guest2013-11-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12024