aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | [ŧicket/11896] Set form_time with time() when marking all notifications readMarc Alexander2013-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | form_time is only set if is passed via the form. Since the mark notifications read link does not use the form, it will default to 0 causing the mark notifications logic to only mark notifications read if their time is smaller or equal to 0. This patch will change ucp_notifications to correctly set form_time for the confirm_box. PHPBB3-11896
* | | | | Merge pull request #1877 from nickvergessen/ticket/12023Nils Adermann2013-11-182-1/+3
|\ \ \ \ \ | | | | | | | | | | | | Ticket/12023 New css files missing after update
| * | | | | [ticket/12023] Correctly compare the size of the array in ignore_new_filesJoas Schilling2013-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12023
| * | | | | [ticket/12023] Add test for failing .css copyJoas Schilling2013-11-191-0/+2
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-12023
* | | | | Merge remote-tracking branch 'Marc/ticket/12018' into developJoas Schilling2013-11-141-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/12018: [ticket/12018] Use path_helper for admin style CSS in sql report
| * | | | | [ticket/12018] Use path_helper for admin style CSS in sql reportMarc Alexander2013-11-141-2/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The path to the admin style CSS is currently created with $phpbb_admin_path. We should however use the path_helper to correctly link to this file in order to have a correct link on pages like extensions PHPBB3-12018
* | | | | Merge remote-tracking branch 'prototech/ticket/12008' into developJoas Schilling2013-11-146-3/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prototech/ticket/12008: [ticket/12008] Update the run time value for the prune notifications cron task [ticket/12008] The read_notification_last_gc config setting should be dynamic.
| * | | | | [ticket/12008] Update the run time value for the prune notifications cron taskCesar G2013-11-144-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12008
| * | | | | [ticket/12008] The read_notification_last_gc config setting should be dynamic.Cesar G2013-11-142-1/+28
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-12008
* | | | | Merge pull request #1872 from nickvergessen/ticket/12017David King2013-11-136-21/+7
|\ \ \ \ \ | | | | | | | | | | | | Ticket/12017 Extension tests are broken on current develop
| * | | | | [ticket/12017] Fix phpbb requirement in composer.jsonJoas Schilling2013-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12017
| * | | | | [ticket/12017] Copy config/ dir so events workJoas Schilling2013-11-143-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12017
| * | | | | [ticket/12017] Remove IN_PHPBB defined checkJoas Schilling2013-11-142-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12017
* | | | | | Merge pull request #1815 from marc1706/ticket/11525Nils Adermann2013-11-137-53/+65
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [ticket/11525] Only remove group or user prefix from given avatar data
| * | | | | [ticket/11525] Use foreach instead of array_walk in method clean_row()Marc Alexander2013-11-132-60/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This approach is cleaner and probably even faster the previous ways that included using array_walk() or array_map() and other helper functions and methods. PHPBB3-11525
| * | | | | Merge pull request #3 from nickvergessen/marc/ticket/11525Marc Alexander2013-11-101-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | Marc/ticket/11525 Part 2
| | * | | | | [ticket/11525] Fix expected value of group avatar testJoas Schilling2013-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11525
| | * | | | | [ticket/11525] Compare correct array to expected valueJoas Schilling2013-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11525
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 01:27:04 +0000