aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge branch 'prep-release-3.1.0' into develop-ascraeusNils Adermann2014-10-271-2/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.0: [ticket/13230] Add missing globals and missing request object for path helper [ticket/13226] Add functional test for group ranks [ticket/13226] Fix the usage of $rank_img
| | * | | [ticket/13230] Add missing globals and missing request object for path helperJoas Schilling2014-10-271-2/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-13230
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-10-261-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13193] Swap ternary condition members [ticket/13193] Make template more readable [ticket/13193] Add load_search config check [ticket/13193] Add link to post count in PMs
| * | | | Merge pull request #3054 from Senky/ticket/13193Andreas Fischer2014-10-261-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13193] Post count in PMs not a link * Senky/ticket/13193: [ticket/13193] Swap ternary condition members [ticket/13193] Make template more readable [ticket/13193] Add load_search config check [ticket/13193] Add link to post count in PMs
| | * | | | [ticket/13193] Swap ternary condition membersJakub Senko2014-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13193
| | * | | | [ticket/13193] Add load_search config checkJakub Senko2014-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13193
| | * | | | [ticket/13193] Add link to post count in PMsJakub Senko2014-10-211-0/+1
| | | |/ / | | |/| | | | | | | | | | | | PHPBB3-13193
| * | | | [develop-ascraeus] Update version number to 3.1.1-RC1-devNils Adermann2014-10-251-1/+1
| | |/ / | |/| |
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-251-1/+27
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13207] Add notification manager mock to user_add method in tests [ticket/13207] Move default user notifications settings to user_add() [ticket/13207] Add default subscription options for newly registered users
| * | | [ticket/13207] Move default user notifications settings to user_add()Marc Alexander2014-10-252-14/+18
| | | | | | | | | | | | | | | | PHPBB3-13207
| * | | [ticket/13207] Add default subscription options for newly registered usersMarc Alexander2014-10-252-2/+24
| | | | | | | | | | | | | | | | PHPBB3-13207
| * | | [prep-release-3.1.0] Update version to 3.1.0Joas Schilling2014-10-231-1/+1
| | | |
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-231-1/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | | [prep-release-3.1.0-RC6] Update phpBB Version for RC7 developmentJoas Schilling2014-10-231-1/+1
| | | |
| * | | [prep-release-3.1.0-RC6] Update version to 3.1.0-RC6Joas Schilling2014-10-231-1/+1
| | | |
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-231-5/+14
|\ \ \ \ | |/ / /
| * | | Merge pull request #3 from phpbb/ticket/security-161Joas Schilling2014-10-231-5/+14
| |\ \ \ | | | | | | | | | | | | | | | [ticket/security-161] Add form token to styles management form.
| | * | | [ticket/security-161] Add form token to styles management form.Cesar G2014-10-221-5/+14
| | | | | | | | | | | | | | | | | | | | SECURITY-161
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-10-222-1/+41
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3058 from naderman/ticket/13205Marc Alexander2014-10-222-1/+41
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13205] Add a mark all messages read link to PM folders
| | * | | | [ticket/13205] Explicitly cast ids to integers and reformat SQLNils Adermann2014-10-222-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13205
| | * | | | [ticket/13205] Remove superfluous newlineNils Adermann2014-10-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13205
| | * | | | [ticket/13205] Add a mark all messages read link to PM foldersNils Adermann2014-10-222-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13205
* | | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-221-2/+7
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/security-159] Only show first 8 characters of login keys in UCP
| * | | | | [ticket/security-159] Only show first 8 characters of login keys in UCPMarc Alexander2014-10-221-2/+7
| |/ / / / | | | | | | | | | | | | | | | SECURITY-159
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-10-211-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3053 from Senky/ticket/13194Marc Alexander2014-10-211-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13194] BBCode isn't parsed when issuing a warning for a post
| | * | | | [ticket/13194] Use correct array to access bbcode_bitfieldJakub Senko2014-10-211-1/+1
| | | |/ / | | |/| | | | | | | | | | | | PHPBB3-13194
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-211-24/+14
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13189] Do not use confirm box for marking all notifications read
| * | | | [ticket/13189] Do not use confirm box for marking all notifications readMarc Alexander2014-10-201-24/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already use a token for preventing CSRF when marking notifications read. Making a user confirm the marking read action serves no real purpose. No information will be lost by just marking the notifications read but it will prevent users from always having to confirm this action. PHPBB3-13189
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-10-201-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
| * | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-10-201-2/+2
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | * develop-olympus: [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
| | * | | Merge pull request #3047 from Elsensee/ticket/13168Andreas Fischer2014-10-201-2/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility * Elsensee/ticket/13168: [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
| | | * | | [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibilityOliver Schramm2014-10-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13168
| | * | | | [ticket/13138] Do not use cookie data and autologin while forcing a user_idJoas Schilling2014-10-161-28/+31
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-13138
| | * | | Merge pull request #2460 from Nicofuma/ticket/11224Joas Schilling2014-10-061-2/+14
| | |\ \ \ | | | | | | | | | | | | | | | | | | [ticket/11224] SQL cache destroy does not destroy queries to tables joined
| | | * | | [ticket/11224] Remove new line in acm_memory.phpTristan Darricau2014-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11224
| | | * | | [ticket/11224] Fix coding styleTristan Darricau2014-05-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11224
| | | * | | [ticket/11224] Fix the blank line after ?>Tristan Darricau2014-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11224
| | | * | | [ticket/11224] Fix returned dataTristan Darricau2014-05-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11224
| | | * | | [ticket/11224] SQL cache destroy does not destroy queries to tables joinedTristan Darricau2014-05-141-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-11224 PHPBB3-11224
| | * | | | [ticket/13096] Add phpbb_ prefix to ldap_escape()Jakub Senko2014-09-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13096
| | * | | | Merge pull request #2981 from nickvergessen/ticket/10729Marc Alexander2014-09-231-8/+20
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Ticket/10729 Update editor information when user being deleted
| | * \ \ \ \ Merge pull request #2350 from Nicofuma/ticket/11480Joas Schilling2014-08-011-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11480] PM : "Unknown folder" returned when inbox folder is full * Nicofuma/ticket/11480: [ticket/11480] Move the test into get_folder() [ticket/11480] Fix the double spaces in phpbb_functional_test_case [ticket/11480] Fix typos [ticket/11480] Add functionnal test [ticket/11480] PM : "Unknown folder" returned when inbox folder is full
* | | \ \ \ \ \ Merge branch 'develop-ascraeus' into developMarc Alexander2014-10-181-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3030 from Senky/ticket/13164Marc Alexander2014-10-181-0/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13164] data sent to core.submit_post_end event does not include fresh post_visibility
| | * | | | | | | [ticket/13164] Fix syntax errorJakub Senko2014-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13164
| | * | | | | | | [ticket/13164] Add post_visibility to core.submit_post_end eventJakub Senko2014-10-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13164
| | * | | | | | | [ticket/13164] Update post_visibility before event is triggeredJakub Senko2014-10-101-0/+2
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | PHPBB3-13164
* | | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-10-181-2/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 02:21:33 +0000