aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | 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
| * | | | | | | | | Merge pull request #2 from nickvergessen/marc/ticket/11525Marc Alexander2013-11-101-7/+17
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | Marc/ticket/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-247-15/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-133-13/+25
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | Ticket/12016 Event listeners should be services
| * | | | | | | | [ticket/12016] Update functional tests to use service for event listenersJoas Schilling2013-11-131-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12016
| * | | | | | | | [ticket/12016] Use a service provider for event listenersJoas Schilling2013-11-132-13/+16
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows them to use dependency injection PHPBB3-12016
* | | | | | | | Merge pull request #1800 from prototech/ticket/11472David King2013-11-1213-779/+61
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/11472] Make prosilver's editor.js an asset used by all styles.
| * | | | | | | | [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
* | | | | | | | Merge remote-tracking branch 'naderman/ticket/11998' into developAndreas Fischer2013-11-121-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/11998: [ticket/11998] Make phpbbcli executable and add shebang
| * | | | | | | | [ticket/11998] Make phpbbcli executable and add shebangNils Adermann2013-11-121-0/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11998