aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | [ticket/12024] Update events listOpenShift guest2013-11-181-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12024
| * | | | | [ticket/12024] Replace newlineOpenShift guest2013-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12024
| * | | | | [ticket/12024] Template event overall_header_content_beforeOpenShift guest2013-11-184-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44959 http://tracker.phpbb.com/browse/PHPBB3-12024 PHPBB3-12024
* | | | | | Merge pull request #1881 from prototech/ticket/11484Nathan Guse2013-11-212-17/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | [ticket/11484] Display login box for users following email notification link.
| * | | | | [ticket/11484] Display login box for users following email notification link.Cesar G2013-11-212-17/+4
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The link used for the latest post now uses view=unread so redirecting the user using the value for the e parameter is no longer necessary. PHPBB3-11484
* | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-11-191-2/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11814] Remove redundant text from the topic reply email notification.
| * \ \ \ \ Merge remote-tracking branch 'prototech/ticket/11814' into develop-olympusJoas Schilling2013-11-191-2/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prototech/ticket/11814: [ticket/11814] Remove redundant text from the topic reply email notification.
| | * | | | | [ticket/11814] Remove redundant text from the topic reply email notification.Cesar G2013-11-191-2/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-11814
* | | | | | Merge branch 'prep-release-3.1.0-a2' into developJoas Schilling2013-11-198-32/+137
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.0-a2: [prep-release-3.1.0-a2] Update version to 3.1.0-a3-dev in install and constant [prep-release-3.1.0-a2] Add changelog for alpha2 [prep-release-3.1.0-a2] Prepare Changelog [prep-release-3.1.0-a2] Add migration for 3.1.0-a2 [prep-release-3.1.0-a2] Update version to 3.1.0-a2
| * | | | | | [prep-release-3.1.0-a2] Update version to 3.1.0-a3-dev in install and constantJoas Schilling2013-11-192-2/+2
| | | | | | |
| * | | | | | [prep-release-3.1.0-a2] Add changelog for alpha2Joas Schilling2013-11-191-0/+74
| | | | | | |
| * | | | | | [prep-release-3.1.0-a2] Prepare ChangelogJoas Schilling2013-11-191-22/+25
| | | | | | |
| * | | | | | [prep-release-3.1.0-a2] Add migration for 3.1.0-a2Joas Schilling2013-11-191-0/+28
| | | | | | |
| * | | | | | [prep-release-3.1.0-a2] Update version to 3.1.0-a2Joas Schilling2013-11-196-10/+10
|/ / / / / /
* | | | | | Merge remote-tracking branch 'Marc/ticket/11896' into developJoas Schilling2013-11-193-10/+52
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/11896: [ticket/11896] Use $form_time and fix out of bounds $form_time [ticket/11896] Correctly document return of null in docblocks [ticket/11896] Minor code improvements in phpbb_functional_test_case [ticket/11896] Add functional tests for marking all notifications read [ticket/11896] Add ability to define expected message after posting [ŧicket/11896] Set form_time with time() when marking all notifications read
| * | | | | | [ticket/11896] Use $form_time and fix out of bounds $form_timeMarc Alexander2013-11-141-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11896
| * | | | | | [ticket/11896] Correctly document return of null in docblocksMarc Alexander2013-11-141-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also got rid of previous incorrect comment in docblocks. PHPBB3-11896
| * | | | | | [ticket/11896] Minor code improvements in phpbb_functional_test_caseMarc Alexander2013-11-141-21/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use assertContainsLang() and get rid of unnecessary logic in create_post() and create_topic(). The docblocks were also slightly improved. PHPBB3-11896
| * | | | | | [ticket/11896] Add functional tests for marking all notifications readMarc Alexander2013-11-091-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11896
| * | | | | | [ticket/11896] Add ability to define expected message after postingMarc Alexander2013-11-091-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change will add the ability to define the expected message after a topic or post has been submitted with the methods create_post() and create_topic(). If the expected message is not 'POST_STORED', we will not try to get the topic and post id. PHPBB3-11896