aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12371] Fix language stringJoas Schilling2014-05-021-2/+2
| | | | PHPBB3-12371
* [ticket/12371] Fix typos in commentJoas Schilling2014-05-021-1/+1
| | | | PHPBB3-12371
* [ticket/12371] Fix redirect link for approve_post and post_in_queueJoas Schilling2014-04-252-0/+16
| | | | PHPBB3-12371
* [ticket/12371] Delete the approve_post notification when editing a postJoas Schilling2014-04-251-0/+8
| | | | | | | We need to delete the initial approve notification, so we can notify the user again, when his post got reapproved. PHPBB3-12371
* [ticket/12371] Fix language in commentJoas Schilling2014-04-251-3/+2
| | | | PHPBB3-12371
* [ticket/12371] Reapprove the post and topic again in testsJoas Schilling2014-04-251-0/+10
| | | | PHPBB3-12371
* [ticket/12371] Correctly set is_starter when editing first post of the topicJoas Schilling2014-04-251-1/+1
| | | | PHPBB3-12371
* [ticket/12371] Add functional tests for reapprovingJoas Schilling2014-04-251-0/+406
| | | | PHPBB3-12371
* [ticket/12371] Fix query in mcp_sorting()Joas Schilling2014-04-251-2/+1
| | | | PHPBB3-12371
* [ticket/12371] Rename disapprove and softdelete testsJoas Schilling2014-04-252-2/+2
| | | | PHPBB3-12371
* [ticket/12371] We do not group quote notifications anymoreJoas Schilling2014-04-251-1/+2
| | | | PHPBB3-12371
* [ticket/12371] Fix SQL queryJoas Schilling2014-04-251-1/+1
| | | | PHPBB3-12371
* [ticket/11772] Do not send out new topic/post notifications when reapprovingJoas Schilling2014-04-251-9/+24
| | | | | | | | Only add notifications, if we are not reapproving post When the topic was already approved, but was edited and now needs re-approval, we don't want to notify the users again. PHPBB3-11772
* [ticket/12052] Use different visibility when post was editedJoas Schilling2014-04-2518-42/+79
| | | | | | ... and needs to be reapproved. PHPBB3-12052
* [ticket/12052] Add support for ITEM_UNAPPROVED to set_post_visibility methodCesar G2014-04-251-41/+22
| | | | PHPBB3-12052
* [ticket/12371] Do not add unlimited users as respondersJoas Schilling2014-04-252-3/+27
| | | | | | | | We run into the risc that the data is longer then the character limit of the table column. However as we trim the users list anyway, we can also just stop adding them and display "many others" instead of "x others" PHPBB3-12371
* [ticket/12371] Do not update the notification entry unneccessarilyJoas Schilling2014-04-252-11/+20
| | | | | | When the data did not change, we also don't have to run the query at all. PHPBB3-12371
* [ticket/12371] Do not delete post related notifications when a post is deletedJoas Schilling2014-04-252-25/+2
| | | | | | | | | | | | | When a post is marked edited and therefor marked as softdeleted/unapproved, we should not delete the notifications, just like we can't delete the emails. Links are out there anyway and just keeping the notification is fail save. If we keep the notification we can just continue to update it when more posts are added. Also when we delete a post, we don't have to go though the table and find all related notifications to be able to delete them or even update them, when they have responders set. PHPBB3-12371
* [ticket/12371] Allow notification types to redirect to a different urlJoas Schilling2014-04-254-1/+24
| | | | | | | This way we can redirect the post and bookmark notification to the first unread post in the topic PHPBB3-12371
* [ticket/12371] Do not group "quote" notificationsJoas Schilling2014-04-251-23/+8
| | | | | | | Grouping these notification makes no sense, as the user will not find the posts he is quoted in, when they are spread over multiple pages PHPBB3-12371
* Merge pull request #2348 from bantu/ticket/12436Joas Schilling2014-04-241-2/+2
|\ | | | | | | | | | | | | [ticket/12436] Data passed to sql_multi_insert is expected to be multi-d... * bantu/ticket/12436: [ticket/12436] Data passed to sql_multi_insert is expected to be multi-dim.
| * [ticket/12436] Data passed to sql_multi_insert is expected to be multi-dim.Andreas Fischer2014-04-241-2/+2
|/ | | | PHPBB3-12436
* Merge remote-tracking branch 'github-nickvergessen/ticket/11917' into ↵Nils Adermann2014-04-244-2/+55
|\ | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/11917: [ticket/11917] Move OAuth Module to the bottom while installing [ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backend Conflicts: phpBB/install/install_install.php
| * [ticket/11917] Move OAuth Module to the bottom while installingJoas Schilling2014-04-121-0/+12
| | | | | | | | PHPBB3-11917
| * [ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backendJoas Schilling2014-04-123-1/+42
| | | | | | | | PHPBB3-11917
* | Merge pull request #2036 from prototech/ticket/12201Joas Schilling2014-04-226-37/+58
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12201] Clean up ACP attachment management page * prototech/ticket/12201: [ticket/12201] Decreased pagination font size. [ticket/12201] Update select element to follow same design as prosilver. [ticket/12201] Increase sort font size just slightly. [ticket/12201] Add link to resync file stats after error. [ticket/12201] Fix typos in language pack. [ticket/12201] Display error and sorting options when there are no attachments [ticket/12201] Only the top pagination should be floated to the right. [ticket/12201] Rearrange pagination, sorting, and submit elements. [ticket/12201] Center the file size and mark columns. [ticket/12201] Separate pagination from table.
| * | [ticket/12201] Decreased pagination font size.Cesar G2014-04-151-0/+1
| | | | | | | | | | | | PHPBB3-12201
| * | [ticket/12201] Update select element to follow same design as prosilver.Cesar G2014-04-151-0/+3
| | | | | | | | | | | | PHPBB3-12201
| * | [ticket/12201] Increase sort font size just slightly.Cesar G2014-04-151-1/+1
| | | | | | | | | | | | PHPBB3-12201
| * | [ticket/12201] Add link to resync file stats after error.Cesar G2014-04-153-14/+15
| | | | | | | | | | | | PHPBB3-12201
| * | [ticket/12201] Fix typos in language pack.Cesar G2014-04-151-4/+4
| | | | | | | | | | | | PHPBB3-12201
| * | [ticket/12201] Display error and sorting options when there are no attachmentsCesar G2014-04-152-1/+8
| | | | | | | | | | | | PHPBB3-12201
| * | [ticket/12201] Only the top pagination should be floated to the right.Cesar G2014-04-151-1/+1
| | | | | | | | | | | | PHPBB3-12201
| * | [ticket/12201] Rearrange pagination, sorting, and submit elements.Cesar G2014-04-151-15/+16
| | | | | | | | | | | | PHPBB3-12201
| * | [ticket/12201] Center the file size and mark columns.Cesar G2014-04-152-4/+8
| | | | | | | | | | | | PHPBB3-12201
| * | [ticket/12201] Separate pagination from table.Cesar G2014-04-153-2/+6
| | | | | | | | | | | | PHPBB3-12201
* | | Merge pull request #2337 from prototech/ticket/12130Joas Schilling2014-04-221-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12130] Fix issue with li:first-child in <ul> having a bullet in IE8. * prototech/ticket/12130: [ticket/12130] Fix issue with li:first-child in <ul> having a bullet in IE8.
| * | | [ticket/12130] Fix issue with li:first-child in <ul> having a bullet in IE8.Cesar G2014-04-201-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12130
* | | | Merge pull request #2335 from Elsensee/ticket/12422Joas Schilling2014-04-223-3/+62
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12422] Fix debug warning in log search * Elsensee/ticket/12422: [ticket/12422] Add tests [ticket/12422] Fix debug warning in log search
| * | | | [ticket/12422] Add testsOliver Schramm2014-04-222-1/+46
| | | | | | | | | | | | | | | | | | | | PHPBB3-12422
| * | | | [ticket/12422] Fix debug warning in log searchOliver Schramm2014-04-201-2/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-12422
* | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-04-220-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | * develop-olympus:
| * \ \ \ \ Merge pull request #2341 from nickvergessen/ticket/12413Andreas Fischer2014-04-221-70/+9
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0 in olympus * nickvergessen/ticket/12413: [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0
* | \ \ \ \ \ Merge pull request #2342 from nickvergessen/ticket/12413-ascraeusAndreas Fischer2014-04-220-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12413-ascraeus] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0 in olympus * nickvergessen/ticket/12413-ascraeus: [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0
| * \ \ \ \ \ \ [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0 in olympusJoas Schilling2014-04-220-0/+0
| |\ \ \ \ \ \ \ |/ / / / / / / / | | | _ / / / / | | | / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ticket/12413' into ticket/12413-ascraeus * ticket/12413: [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0 Conflicts: phpBB/feed.php The reverting is not done for develop-ascraeus and above. We want to fix it properly there instead. PHPBB3-12413
| * | | | | | [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0Joas Schilling2014-04-221-70/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Merge remote-tracking branch 'dhruvgoel92/ticket/11271' into develop-olympus" This reverts commit e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0, reversing changes made to 214f515e9ccc71e368882384fb38bd7135b0e40f. PHPBB3-12413
* | | | | | Merge pull request #2248 from Elsensee/ticket/12193Joas Schilling2014-04-222-0/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12193] Fix broken HTML if SQL error occurs during migration * Elsensee/ticket/12193: [ticket/12193] Fix broken HTML if SQL error occurs during migration
| * | | | | | [ticket/12193] Fix broken HTML if SQL error occurs during migrationOliver Schramm2014-04-192-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12193
* | | | | | | Merge pull request #2334 from bantu/ticket/12423Joas Schilling2014-04-222-66/+97
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stable Composer Minimum Stability + Some Composer Dependency Updates * bantu/ticket/12423: [ticket/12424] Update Symfony component from v2.3.4 to v2.3.12. [ticket/12423] Move PHP CodeSniffer from non-stable 1.5.0RC4 to latest 1.5.2. [ticket/12423] Increase Composer minimum-stability to stable.
| * | | | | | [ticket/12424] Update Symfony component from v2.3.4 to v2.3.12.Andreas Fischer2014-04-201-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12424