aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11912Marc Alexander2013-11-23423-4806/+5718
|\
| * Merge pull request #1886 from nickvergessen/ticket/12027Nils Adermann2013-11-221-0/+3
| |\
| | * [ticket/12027] List redis as service in .travis.ymlJoas Schilling2013-11-221-0/+3
| * | Merge pull request #1884 from nickvergessen/ticket/12015-2Nathan Guse2013-11-211-6/+14
| |\ \ | | |/ | |/|
| | * [ticket/12015] Fix variable name and event versionJoas Schilling2013-11-211-6/+14
| |/
| * Merge pull request #1883 from s9e/ticket/12028Nathan Guse2013-11-212-2/+2
| |\
| | * [ticket/12028] Replace L_COLON with literal colons9e2013-11-212-2/+2
| * | Merge pull request #1870 from nickvergessen/ticket/12015Nathan Guse2013-11-212-4/+40
| |\ \ | | |/ | |/|
| | * [ticket/12015] Fix english grammarJoas Schilling2013-11-211-1/+1
| | * [ticket/12015] Add some parameters to viewonline eventsJoas Schilling2013-11-131-2/+7
| | * [ticket/12015] Add @change to events that got changedJoas Schilling2013-11-131-1/+3
| | * [ticket/12015] Add post counting information to eventJoas Schilling2013-11-131-3/+10
| | * [ticket/12015] Add an event after the post has been assigned to the templateJoas Schilling2013-11-131-0/+14
| | * [ticket/12015] Add attachments to core.viewtopic_modify_post_rowJoas Schilling2013-11-131-1/+2
| | * [ticket/12015] Add more parameters to core.viewtopic_get_post_dataJoas Schilling2013-11-131-1/+8
| * | Merge pull request #1854 from Pico88/ticket/12005Nathan Guse2013-11-2112-109/+43
| |\ \
| | * | [ticket/12005] Remove PM popup module from DBLukasz2013-11-081-0/+42
| | * | [ticket/12005] Delete templates filesLukasz2013-11-082-62/+0
| | * | [ticket/12005] Remove language vars used by PM popupLukasz2013-11-082-7/+0
| | * | [ticket/12005] Remove PM popupLukasz2013-11-082-3/+1
| | * | [ticket/12005] Remove PM popup UCP moduleLukasz2013-11-082-28/+0
| | * | [ticket/12005] Remove PM popup from converterLukasz2013-11-081-1/+0
| | * | [ticket/12005] Remove PM popup setting from user preferencesLukasz2013-11-082-8/+0
| * | | 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.Cesar G2013-11-083-28/+31
| * | | | Merge pull request #1860 from prototech/ticket/12010Nathan Guse2013-11-216-26/+35
| |\ \ \ \
| | * | | | [ticket/12010] Make the navbar icons clickable.Cesar G2013-11-086-26/+35
| | |/ / /
| * | | | Merge pull request #1834 from cyberalien/ticket/11984Nathan Guse2013-11-215-11/+18
| |\ \ \ \
| | * | | | [ticket/11984] Do not resize textarea on touch devicesVjacheslav Trushkin2013-11-191-2/+4
| | * | | | [ticket/11984] Hide <dfn> for invalid extensionsVjacheslav Trushkin2013-11-191-0/+3
| | * | | | [ticket/11984] Fix stray </ul> and active tab hover in ACPVjacheslav Trushkin2013-11-192-11/+8
| | * | | | [ticket/11984] Prevent AJAX background animation flicker in prosilverVjacheslav Trushkin2013-11-191-0/+3
| | * | | | [ticket/11984] Prevent AJAX background animation flicker in ACPVjacheslav Trushkin2013-11-191-0/+2
| * | | | | Merge pull request #1869 from prototech/ticket/10810Nathan Guse2013-11-2115-207/+117
| |\ \ \ \ \
| | * | | | | [ticket/10810] Remove obsolete swatch code.Cesar G2013-11-134-134/+0
| | * | | | | [ticket/10810] Update all palettes.Cesar G2013-11-139-12/+26
| | * | | | | [ticket/10810] Make the color palette usable outside of the editor context.Cesar G2013-11-131-8/+42
| | * | | | | [ticket/10810] Move the color palette code to core.js.Cesar G2013-11-122-61/+57
| * | | | | | Merge pull request #1882 from prototech/ticket/11959Nathan Guse2013-11-212-3/+33
| |\ \ \ \ \ \
| | * | | | | | [ticket/11959] Rename $extra_cnt to something more descriptive.Cesar G2013-11-211-3/+3
| | * | | | | | [ticket/11959] Use COMMA_SEPARATOR to join the user list.Cesar G2013-11-211-1/+1
| | * | | | | | [ticket/11959] Trim the list of users from post notifications.Cesar G2013-11-212-2/+32
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #1878 from blitze/ticket/12024Nathan Guse2013-11-215-0/+22
| |\ \ \ \ \ \
| | * | | | | | [ticket/12024] Add new lineOpenShift guest2013-11-192-0/+2
| | * | | | | | [ticket/12024] Correct the 'since' information in event listOpenShift guest2013-11-191-2/+2
| | * | | | | | [ticket/12024] Update events listOpenShift guest2013-11-181-0/+16
| | * | | | | | [ticket/12024] Replace newlineOpenShift guest2013-11-181-1/+1
| | * | | | | | [ticket/12024] Template event overall_header_content_beforeOpenShift guest2013-11-184-0/+4
| * | | | | | | Merge pull request #1881 from prototech/ticket/11484Nathan Guse2013-11-212-17/+4
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | [ticket/11484] Display login box for users following email notification link.Cesar G2013-11-212-17/+4
| |/ / / / / /