aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
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
* | | | [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.
| * | | [ticket/11814] Remove redundant text from the topic reply email notification.Cesar G2013-11-191-2/+1
| | | | | | | | | | | | | | | | PHPBB3-11814
* | | | [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-195-7/+7
| | | |
* | | | Merge remote-tracking branch 'Marc/ticket/11896' into developJoas Schilling2013-11-191-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | [ŧ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
* | | | | [ticket/12023] Correctly compare the size of the array in ignore_new_filesJoas Schilling2013-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12023
* | | | | [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
* | | | | [ticket/12008] Update the run time value for the prune notifications cron taskCesar G2013-11-142-1/+9
| | | | | | | | | | | | | | | | | | | | 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 #1815 from marc1706/ticket/11525Nils Adermann2013-11-136-26/+24
|\ \ \ \ \ | | | | | | | | | | | | [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-131-23/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | [ticket/11525] Prefix id parameter with 'g' again when its a group avatarJoas Schilling2013-11-101-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11525
| * | | | | [ticket/11525] Fix doc blocksJoas Schilling2013-11-101-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11525
| * | | | | [ticket/11525] Only remove group or user prefix from given avatar dataMarc Alexander2013-10-246-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now, the user data had both user_id and group_id keys in the avatar data. As both group_ and user_ prefixes were removed the group_id was collapsed onto the user_id and therefore all users in the same group had the same prefix for their uploaded avatars. This patch will make sure that the correct id is used depending on whether it's a group's or user's avatar data. PHPBB3-11525
* | | | | | Merge pull request #1871 from nickvergessen/ticket/12016Nils Adermann2013-11-132-13/+16
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Ticket/12016 Event listeners should be services
| * | | | | [ticket/12016] Use a service provider for event listenersJoas Schilling2013-11-132-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows them to use dependency injection PHPBB3-12016
* | | | | | [ticket/11472] Expand palette cell links to the full block size.Cesar G2013-11-124-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11472
* | | | | | [ticket/11472] Use {T_ASSETS_PATH}.Cesar G2013-11-125-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11472
* | | | | | [ticket/11472] Update the ACP user signature page.Cesar G2013-11-122-34/+39
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11472
* | | | | | [ticket/11472] Make the color swatch configurable and fix it in subsilver2Cesar G2013-11-126-20/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11472
* | | | | | [ticket/11472] Make prosilver's editor.js an asset used by all styles.Cesar G2013-11-128-726/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11472
* | | | | | [ticket/11998] Make phpbbcli executable and add shebangNils Adermann2013-11-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11998
* | | | | | Merge pull request #1849 from bantu/ticket/11998Nils Adermann2013-11-1114-130/+455
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/11998] Introduction of the phpBB Console
| * | | | | | [ticket/11998] Turn develop/extensions.php into console commands.Andreas Fischer2013-11-057-129/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11998
| * | | | | | [ticket/11998] Add phpBB abstraction for application and command.Andreas Fischer2013-11-054-9/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11998
| * | | | | | [ticket/11998] Move application file to bin/phpbbcli.phpAndreas Fischer2013-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11998
| * | | | | | [ticket/11998] Add console command for recalculating email hash.Andreas Fischer2013-11-032-0/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11998
| * | | | | | [ticket/11998] Also setup extension class loader.Andreas Fischer2013-11-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11998
| * | | | | | [ticket/11998] Use container to get all commands using 'console.command' tag.Andreas Fischer2013-11-032-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11998