1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 16:35:35 +02:00
Commit Graph

404 Commits

Author SHA1 Message Date
5fa25880e2 [ticket/11586] Move $filedata['thumbnail'] to where it might be returned.
PHPBB3-11586
2013-06-03 16:24:12 +02:00
50e3173e8c [ticket/11586] Combine $filedata['post_attach'] assign into a single statement.
PHPBB3-11586
2013-06-03 16:24:12 +02:00
11c80c0402 [ticket/11586] Use a variable for $cat_id == ATTACHMENT_CATEGORY_IMAGE.
PHPBB3-11586
2013-06-03 16:14:22 +02:00
cb54f56c3d [ticket/11586] Combine administrator/moderator checks together.
PHPBB3-11586
2013-06-03 16:07:19 +02:00
99d089ce9f Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11145] Wrong error thrown when uploading a bigger image.
2013-06-03 15:58:32 +02:00
8191755cca [ticket/11145] Wrong error thrown when uploading a bigger image.
When attaching an image to a post with a size larger than maximum defined in
php.ini, 'ATTACHED_IMAGE_NOT_IMAGE' error is thrown. $file->is_image() is
returning false value when image size is too large. Therefore, moved
not image test down after image size test.

PHPBB3-11145
2013-05-25 10:50:43 +05:30
51e0f002ee Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103
# By Oleg Pudeyev (37) and others
# Via Oleg Pudeyev (24) and others
* 'develop' of github.com:phpbb/phpbb3: (179 commits)
  [ticket/11323] Add tests for inclusion of defined variables
  [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.
  [ticket/11321] Recreate schema files with develop/create_schema_files.php
  [ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31
  [ticket/11313] Use correct object el instead of eel in alt_text callback
  [ticket/11301] Guidelines: Add spaces in front and after the / operator.
  [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.
  [ticket/11311] Include asset core.js in subsilver2 overall_footer.html
  [ticket/10949] Remove not needed comma
  [ticket/11309] phpbb_extension_interface::disable_step correct docblock.
  [ticket/10949] Converted missing code to new JS coding guidelines
  [ticket/11302] Correctly select first timezone or selected timezone
  [ticket/11305] Mock container for cache driver in functional create_user()
  [ticket/11305] Check for $cache being null before using it in db drivers.
  [ticket/10805] Compare phpbbAlertTimer against null
  [ticket/11305] Define hook finder as a service on the container.
  [ticket/11305] Adjust comment.
  [ticket/11305] Use phpbb_create_default_container.
  [ticket/11305] Create a normal container during final installation step.
  [ticket/11305] Retrieve cache driver from container rather than cache service.
  ...

Conflicts:
	phpBB/install/schemas/firebird_schema.sql
	phpBB/install/schemas/mssql_schema.sql
	phpBB/install/schemas/mysql_40_schema.sql
	phpBB/install/schemas/mysql_41_schema.sql
	phpBB/install/schemas/oracle_schema.sql
	phpBB/install/schemas/postgres_schema.sql
	phpBB/install/schemas/sqlite_schema.sql
	phpBB/styles/subsilver2/template/overall_footer.html
2013-01-15 11:31:39 -06:00
3fefa5bb13 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10880] The m_approve permisson no longer implies f_noapprove.

Conflicts:
	phpBB/posting.php
2012-12-20 14:28:01 +01:00
917a2fa9a6 [ticket/10880] The m_approve permisson no longer implies f_noapprove.
PHPBB3-10880
2012-12-19 22:02:39 -05:00
249f3c8885 [ticket/11103] Instantiate $phpbb_notifications as needed
https://github.com/phpbb/phpbb3/pull/992#discussion_r2413976

PHPBB3-11103
2012-12-13 19:19:40 -06:00
2afb8b9df8 [ticket/11103] Create user loader class, update for DIC
Create a very basic user loader class to handle querying/storing
user data in a centralized location.

Use DIC collection service for notification types/methods.

Cleanup unused dependencies.

Fix some other issues.

PHPBB3-11103
2012-11-20 22:54:16 -06:00
a811e65147 [ticket/11103] Revert an overwrite that occured on merging from develop
PHPBB3-11103
2012-10-29 18:18:33 -05:00
94d682f774 [ticket/11103] Use the full class name as the item_type/method
This is going to require you recreate the db tables.

PHPBB3-11103
2012-10-20 20:58:53 -05:00
d5325e6934 Merge PR #624 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8743] Include poster´s name in mail notifications
2012-10-16 21:21:03 -04:00
f0544c884f Merge PR #624 branch 'nickvergessen/ticket/8743' into develop-olympus
* nickvergessen/ticket/8743:
  [ticket/8743] Include poster´s name in mail notifications
2012-10-16 21:20:58 -04:00
ad2feb917f Merge PR #917 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10967] adding $root_path to posting_get_topic_icons
2012-10-16 20:31:03 -04:00
0d5d328c81 [ticket/11103] Spacing consistency
PHPBB3-11103
2012-10-14 12:42:18 -05:00
d434672dde [ticket/10967] adding $root_path to posting_get_topic_icons
PHPBB3-10967
2012-10-11 20:38:24 +02:00
b9bc65eed8 [ticket/11103] Make $phpbb_notifications a global and use it everywhere
Do not use phpbb_container everywhere (makes testing difficult)

PHPBB3-11103
2012-10-04 14:47:13 -05:00
2a5baad61b [ticket/11103] Only notify a user once for a single item
Note: The user may be notified multiple times IF they use different
notification options. e.g They are subscribed to topics they have
bookmarked by a notification and subscribed to the topic by
an email notification. In this case, they would receive two notifications.
This occurs because we do not want to omit any more direct types of
notifications (if they want an email, they should _always_ get at least one
email).

PHPBB3-11103
2012-09-27 20:05:06 -05:00
aa3f6f4002 [ticket/11103] Fixing some bugs with the post/topic notifications
PHPBB3-11103
2012-09-25 10:10:10 -05:00
3897a442f7 [ticket/11103] Bug fixing
PHPBB3-11103
2012-09-20 10:40:18 -05:00
7454d5c2d5 [ticket/11103] Topic/Post in queue notification
Also, bug fixes and cleanup

PHPBB3-11103
2012-09-15 14:33:15 -05:00
05b573ebf7 [ticket/11103] Topic and post dis/approval notifications
Remove the formatted title function, plaintext is not needed since
email templates are used

Fix a number of bugs.

PHPBB3-11103
2012-09-15 13:51:02 -05:00
959c81d00e [ticket/11103] Use appropriate email templates to send notifications
Fixing a number of bugs

PHPBB3-11103
2012-09-14 18:05:13 -05:00
8e977544fb [ticket/11103] Normalization of $phpbb_notifications variable name
Use $phpbb_notifications instead of $notifications everywhere for
consistency and conflict prevention.

PHPBB3-11103
2012-09-14 17:01:08 -05:00
ed1ec8e720 [ticket/11103] Add/Update/Mark Read functions accept an array for the type
This saves a lot of code in some areas (where the same data is sent, just
for different types)

Notifications for bookmarks

PHPBB3-11103
2012-09-14 16:54:20 -05:00
44aa773ce0 [ticket/11103] Allow notification types to override update functionality
This is needed for quote editing because we need to check if the users
are still all quoted or notify new quotes appropriately.

PHPBB3-11103
2012-09-14 14:55:14 -05:00
207bbdf48c [ticket/11103] Quote notifications
PHPBB3-11103
2012-09-12 23:55:29 -05:00
e09f25d597 [ticket/11103] Update notifications on post/topic edit
PHPBB3-11103
2012-09-09 14:55:40 -05:00
74e2a8f893 [ticket/11103] Post notifications
PHPBB3-11103
2012-09-09 13:29:47 -05:00
310c906932 Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into develop 2012-08-20 09:09:53 -04:00
01db8144d4 [feature/php-events] Fix doc of core.generate_smilies_after
PHPBB3-9550
2012-08-20 10:10:52 +02:00
938805106c [ticket/11052] pass parametes to search construct while posting
Proper parameters are passed in search backend constructor in
functions_posting.php

PHPBB3-11052
2012-08-15 21:09:42 +05:30
0d182d9e93 [feature/php-events] Fix naming and doc of core.generate_smilies_after
PHPBB3-9550
2012-08-04 17:07:35 +02:00
3f1b4e83ae [feature/events] Removing the third trigger_event parameter
PHPBB3-9550
2012-08-01 10:18:44 +02:00
8af7d225ef [feature/events] Change to use the new method of adding events
PHPBB3-9550
2012-08-01 10:18:44 +02:00
ddcd189006 [feature/events] Adding ledge generate_smilies_footer
Used by phpBB Gallery

PHPBB3-9550
2012-08-01 10:18:41 +02:00
922147f05a [ticket/10968] Render pagination within the template
Since phpBB 2 pagination has been rendered mostly within the source. This
limits just what designers can do with pagination. The current form is also
questionable in terms of "best practice". The aim is to move rendering
completely to the template via the use of a block element. Enabling S_
template vars also allows for control over specific aspects of the
pagination output such as next, previous, active and ellipsis.

Related to this - merging the capabilities of the topic_generate_pagination
with generate_pagination removes an element of duplication.

PHPBB3-10968
2012-07-18 14:30:20 +01:00
a259db7105 [ticket/10640] Do not change default value of truncate_string()
The default value should be kept, so we do not change the behaviour for MODs
and Extensions that use the function with its default values.

PHPBB3-10640
2012-06-17 19:07:17 +01:00
1d4253319c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [Ticket/10675] Correct language string ATTACH_DISK_FULL
  [feature/event-dispatcher] Adding composer.phar to .gitignore for olympus
  [ticket/10675] Add disk full language string when posting attachments
2012-03-31 19:29:56 +02:00
3477b5e5a8 Merge remote-tracking branch 'Dickyf/ticket/10675' into develop-olympus
* Dickyf/ticket/10675:
  [Ticket/10675] Correct language string ATTACH_DISK_FULL
  [ticket/10675] Add disk full language string when posting attachments
2012-03-31 19:27:19 +02:00
cc13bac412 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10684] Adjust function and parameter name, minor changes.
  [ticket/10684] Rename function phpbb_get_banned_users_ids() parameter
  [ticket/10684] Remove intval mapping for array keys
  [ticket/10684] Adjust pm_notifications() to handle stale bans
  [ticket/10684] Cast user_id to integer
  [ticket/10684] Refactor $sql_ignore_users array update
  [ticket/10684] Remove isset() for $sql_ignore_users update
  [ticket/10684] Fix 2 typos in comment lines.
  [ticket/10684] Send notifications for users with stale bans

Conflicts:
	phpBB/includes/functions_user.php
2012-03-22 18:15:10 +01:00
rxu
5a9dd1994f [ticket/10684] Adjust function and parameter name, minor changes.
PHPBB3-10684
2012-03-22 21:19:01 +08:00
97d4f168f5 [ticket/10675] Add disk full language string when posting attachments
Add language string visible by admins only for when the disk does not have
enough free space to upload attachments.

PHPBB3-10675
2012-03-19 15:08:28 -04:00
9915ed5255 [ticket/8743] Include poster´s name in mail notifications
PHPBB3-8743
2012-03-15 16:07:14 +01:00
rxu
a79b3490c2 [ticket/10684] Cast user_id to integer
PHPBB3-10684
2012-03-11 00:56:07 +08:00
rxu
89a6cb2886 [ticket/10684] Refactor $sql_ignore_users array update
PHPBB3-10684
2012-03-10 00:17:39 +08:00
rxu
f563647e4b [ticket/10684] Remove isset() for $sql_ignore_users update
PHPBB3-10684
2012-03-09 22:35:13 +08:00
rxu
ee6783109a [ticket/10684] Fix 2 typos in comment lines.
PHPBB3-10684
2012-03-09 16:41:49 +08:00