| Commit message (Expand) | Author | Age | Files | Lines |
* | [feature/plupload/integration] Integration of Plupload | Andreas Fischer | 2013-10-11 | 1 | -2/+17 |
* | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2013-09-02 | 1 | -0/+5 |
|\ |
|
| * | [ticket/11769] Allow '0' as username | Joas Schilling | 2013-09-02 | 1 | -1/+1 |
| * | [ticket/11769] Fix language issues in the doc blocks | Joas Schilling | 2013-08-23 | 1 | -3/+3 |
| * | [ticket/11769] Correctly supply the post author's username in posting.php | Joas Schilling | 2013-08-23 | 1 | -1/+4 |
* | | Merge remote-tracking branch 'brunoais/ticket11639' into develop | Joas Schilling | 2013-08-04 | 1 | -9/+4 |
|\ \ |
|
| * | | [ticket/11639] Changing how censorship is handled. | brunoais | 2013-08-03 | 1 | -4/+2 |
| * | | [ticket/11639] Removed a non-needed unset | Bruno Ais | 2013-07-24 | 1 | -2/+0 |
| * | | [ticket/11639] Whitespace fixing | Bruno Ais | 2013-07-20 | 1 | -1/+1 |
| * | | [ticket/11639] Whitespace fixing | Bruno Ais | 2013-07-15 | 1 | -2/+2 |
| * | | [ticket/11639] Added an useful comment. | Bruno Ais | 2013-07-15 | 1 | -1/+2 |
| * | | [ticket/11639] generate_text_for_display on functions_posting.php | Bruno Ais | 2013-07-15 | 1 | -8/+6 |
* | | | [ticket/11717] Add 'has' to boolean variable and reduce line length | Marc Alexander | 2013-07-22 | 1 | -4/+5 |
* | | | [ticket/11717] Use topic_posts_approved instead of topic_replies | Marc Alexander | 2013-07-20 | 1 | -1/+4 |
* | | | [ticket/9657] Use the service instead of the static class | Joas Schilling | 2013-07-11 | 1 | -9/+14 |
* | | | Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permis... | Joas Schilling | 2013-07-11 | 1 | -32/+25 |
|\ \ \
| |/ / |
|
| * | | [ticket/11586] Move $filedata['thumbnail'] to where it might be returned. | Andreas Fischer | 2013-06-03 | 1 | -3/+3 |
| * | | [ticket/11586] Combine $filedata['post_attach'] assign into a single statement. | Andreas Fischer | 2013-06-03 | 1 | -8/+1 |
| * | | [ticket/11586] Use a variable for $cat_id == ATTACHMENT_CATEGORY_IMAGE. | Andreas Fischer | 2013-06-03 | 1 | -8/+8 |
| * | | [ticket/11586] Combine administrator/moderator checks together. | Andreas Fischer | 2013-06-03 | 1 | -7/+7 |
| * | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2013-06-03 | 1 | -10/+10 |
| |\ \
| | |/ |
|
| | * | [ticket/11145] Wrong error thrown when uploading a bigger image. | erangamapa | 2013-05-25 | 1 | -10/+10 |
* | | | [ticket/9657] Fix wrongly added notifications when post is posted softdeleted | Joas Schilling | 2013-03-06 | 1 | -1/+27 |
* | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softde... | Joas Schilling | 2013-03-03 | 1 | -237/+71 |
|\ \ \
| |/ / |
|
| * | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103 | Nathan Guse | 2013-01-15 | 1 | -2/+3 |
| |\ \ |
|
| * | | | [ticket/11103] Instantiate $phpbb_notifications as needed | Nathan Guse | 2012-12-13 | 1 | -2/+4 |
| * | | | [ticket/11103] Create user loader class, update for DIC | Nathan Guse | 2012-11-20 | 1 | -15/+15 |
| * | | | [ticket/11103] Revert an overwrite that occured on merging from develop | Nathan Guse | 2012-10-29 | 1 | -1/+3 |
| * | | | [ticket/11103] Use the full class name as the item_type/method | Nathan Guse | 2012-10-20 | 1 | -7/+23 |
| * | | | [ticket/11103] Spacing consistency | Nathan Guse | 2012-10-14 | 1 | -14/+14 |
| * | | | [ticket/11103] Make $phpbb_notifications a global and use it everywhere | Nathan Guse | 2012-10-04 | 1 | -2/+2 |
| * | | | [ticket/11103] Only notify a user once for a single item | Nathan Guse | 2012-09-27 | 1 | -1/+1 |
| * | | | [ticket/11103] Fixing some bugs with the post/topic notifications | Nathaniel Guse | 2012-09-25 | 1 | -30/+13 |
| * | | | [ticket/11103] Bug fixing | Nathaniel Guse | 2012-09-20 | 1 | -0/+4 |
| * | | | [ticket/11103] Topic/Post in queue notification | Nathan Guse | 2012-09-15 | 1 | -2/+29 |
| * | | | [ticket/11103] Topic and post dis/approval notifications | Nathan Guse | 2012-09-15 | 1 | -0/+2 |
| * | | | [ticket/11103] Use appropriate email templates to send notifications | Nathan Guse | 2012-09-14 | 1 | -0/+2 |
| * | | | [ticket/11103] Normalization of $phpbb_notifications variable name | Nathan Guse | 2012-09-14 | 1 | -5/+5 |
| * | | | [ticket/11103] Add/Update/Mark Read functions accept an array for the type | Nathan Guse | 2012-09-14 | 1 | -12/+4 |
| * | | | [ticket/11103] Allow notification types to override update functionality | Nathan Guse | 2012-09-14 | 1 | -1/+1 |
| * | | | [ticket/11103] Quote notifications | Nathan Guse | 2012-09-12 | 1 | -0/+9 |
| * | | | [ticket/11103] Update notifications on post/topic edit | Nathan Guse | 2012-09-09 | 1 | -3/+16 |
| * | | | [ticket/11103] Post notifications | Nathan Guse | 2012-09-09 | 1 | -233/+19 |
* | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softde... | Joas Schilling | 2012-12-20 | 1 | -2/+3 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2012-12-20 | 1 | -2/+3 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | [ticket/10880] The m_approve permisson no longer implies f_noapprove. | Andreas Fischer | 2012-12-19 | 1 | -2/+3 |
* | | | | Merge remote-tracking branch 'remotes/phpbb/develop' into feature/softdelete-... | Joas Schilling | 2012-11-10 | 1 | -3/+7 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge PR #624 branch 'develop-olympus' into develop | Oleg Pudeyev | 2012-10-16 | 1 | -2/+4 |
| |\ \ \
| | |/ / |
|
| | * | | Merge PR #624 branch 'nickvergessen/ticket/8743' into develop-olympus | Oleg Pudeyev | 2012-10-16 | 1 | -2/+4 |
| | |\ \ |
|
| | | * | | [ticket/8743] Include posterĀ“s name in mail notifications | Joas Schilling | 2012-03-15 | 1 | -2/+4 |