1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

1702 Commits

Author SHA1 Message Date
Nathan Guse
94ffbb4050 [ticket/11103] Add is_disabled column to notifications table
EXTENSION AUTHORS TAKE NOTE! This is to prevent errors with notifications
from extensions!

Set is_disabled to 1 for all your notifications when your extension is
disabled so they are ignored and do not cause errors.

When your extension is enabled again, set is_disabled to 0 and your
notifications will be working again.

PHPBB3-11103
2012-10-13 23:24:30 -05:00
Nathan Guse
cb93784126 [ticket/11103] UCP Notification List
PHPBB3-11103
2012-10-13 20:02:38 -05:00
Nathan Guse
94a3dc5ff7 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 2012-10-12 17:09:12 -05:00
Oleg Pudeyev
cc5923ea43 Merge PR #993 branch 'bantu/ticket/8713' into develop
* bantu/ticket/8713:
  [ticket/8713] Update untrimmed_variable() doc block.
  [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.
  [ticket/8713] Trim password in auth_db to keep compatibility.
  [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.
  [ticket/8713] Rename untrimed_variable() to untrimmed_variable().
  [ticket/8713] DRY: variable() and untrimed_variable() into a protected method.
  [ticket/8713] Fix type_cast_helper.php doc blocks: Add punctuation etc.
  [ticket/8713] Always trim array keys.
  [ticket/8713] Add simple (non-nested) test case for untrimmed set_var().
  [ticket/8713] Use \t in double quotes instead of tabs.
  [ticket/8713] Use correct parameter for nested data.
  [ticket/8713] Adjust test method name to other recursive_set_var() tests.
  [ticket/8713] Do not trim login inputs
2012-10-10 00:03:13 -04:00
Nathaniel Guse
98a7ce2360 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 2012-10-09 09:38:08 -05:00
Andreas Fischer
a38de9a232 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11135] Full replacement of credit link to https

Conflicts:
	phpBB/install/convertors/convert_phpbb20.php
2012-10-06 06:15:01 +02:00
Vinny
95d02d74ac [ticket/11135] Full replacement of credit link to https
PHPBB3-11135
2012-10-05 21:18:59 -03:00
Nathan Guse
948bd69495 [ticket/11103] Move UCP Notification Options to Board Preferences tab
Also rename to "Edit notification options" for consistency

PHPBB3-11103
2012-10-05 13:54:27 -05:00
Nathan Guse
0bab8ff777 [ticket/11103] ACP option to enable/disable notifications output in header
PHPBB3-11103
2012-10-05 13:43:03 -05:00
Nathan Guse
fa605402f7 [ticket/11103] Create schema files with notification tables
PHPBB3-11103
2012-10-04 20:48:19 -05:00
Nathan Guse
dfb17f444a [ticket/11103] Fix module setup, add explanation to template
PHPBB3-11103
2012-09-27 19:04:47 -05:00
Nathan Guse
d07cb7b2af [ticket/11103] UCP Notifications module added to db updater
PHPBB3-11103
2012-09-27 18:56:15 -05:00
Nathan Guse
fc6457140c Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 2012-09-15 12:00:21 -05:00
Andreas Fischer
5dc7aba18f Merge remote-tracking branch 'EXreaction/ticket/11021' into develop
* EXreaction/ticket/11021:
  [ticket/11021] Remove unnecessary line spacing in functions.php
  [ticket/11021] Use L_SITE_HOME instead of L_HOME
  [ticket/11021] Better language strings for site home url/text
  [ticket/11021] subsilver2 support
  [ticket/11021] Add the option to specify a Site home URL and text
2012-09-15 17:48:51 +02:00
Nathan Guse
7589a3093d [ticket/11103] Display all unread notifications by default
Add unread count to the page title

PHPBB3-11103
2012-09-14 18:30:12 -05:00
Nathan Guse
0d7f49892a Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
	phpBB/config/services.yml
2012-09-14 16:01:37 -05:00
Nathan Guse
fb0ed78c8f [ticket/11103] Store the item's parent id for marking things read
Mark topics/posts read from the markread() function.

Identify unread items by a grey background in the header (for now)

PHPBB3-11103
2012-09-14 15:59:13 -05:00
David King
298fa894e7 [ticket/11086] Move DI processing below $request definition
As per PR #991 (ticket/11101).

PHPBB3-11086
2012-09-13 16:56:09 -04:00
David King
503989979a [ticket/11086] Fix database_update.php to use Dependency Injection Container
PHPBB3-11086
2012-09-13 16:44:26 -04:00
Nathan Guse
1e53f7df9d [ticket/11103] Fixing some db columns that were of the incorrect type
PHPBB3-11103
2012-09-08 16:02:32 -05:00
Nathan Guse
b594635526 [ticket/11103] Add tables to the database updater and installer
PHPBB3-11103
2012-09-08 13:09:34 -05:00
Andreas Fischer
cc0c378caf [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.
PHPBB3-8713
2012-09-08 14:42:38 +02:00
Andreas Fischer
f2607fc9e8 [ticket/8713] Rename untrimed_variable() to untrimmed_variable().
PHPBB3-8713
2012-09-08 14:15:56 +02:00
Nathaniel Guse
b3cd5a649b [ticket/8713] Do not trim login inputs
Create a function to request variables which are not trimmed.

All requests for passwords (except forum passwords) now use the
untrimmed request function.

PHPBB3-8713
2012-09-03 13:32:33 -05:00
Unknown Bliss
79da1ea592 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10631
Conflicts:
	phpBB/common.php
	phpBB/download/file.php
2012-09-01 21:15:39 +01:00
Nathan Guse
8bbab088dd [ticket/10631] Validation for extensions
PHPBB3-10631
2012-09-01 15:05:23 +01:00
Michael Cullum
5e6b4c7192 [ticket/10631] Adding an extensions admin
PHPBB3-10631
2012-09-01 15:04:33 +01:00
Igor Wiedler
ae85d43757 Merge remote-tracking branch 'upstream/develop' into feature/dic
* upstream/develop: (259 commits)
  [prep-release-3.0.11] Bumping version number for 3.0.11 final.
  [feature/php-events] Fix doc of core.viewonline_overwrite_location
  [feature/php-events] Fix doc of core.user_set_default_group
  [feature/php-events] Fix doc of core.generate_smilies_after
  [feature/php-events] Fix doc of core.delete_user_after
  [feature/php-events] Fix doc of core.delete_user_before
  [feature/php-events] Fix doc of core.update_username
  [feature/php-events] Fix doc of core.memberlist_prepare_profile_data
  [feature/php-events] Fix doc and position of viewonline_overwrite_location
  [feature/php-events] Fix doc of core.viewtopic_get_post_data
  [feature/php-events] Fix doc of core.viewtopic_cache_guest_data
  [ticket/11061] Add the --dev flag to the composer instructions in README
  [ticket/11060] Make sure pyrus can install everything on travis
  [ticket/11059] Use https for the README logo
  [feature/php-events] Fix acp_manage_forums_update_data_before and is_new_forum
  [feature/php-events] Fix core.acp_manage_forums_update_data_after vars
  [ticket/11032] fix language of error displayed
  [ticket/11052] update search backend constructor everywhere
  [ticket/11052] pass parametes to search construct while posting
  [ticket/11054] Fixed $config var description
  ...

Conflicts:
	phpBB/includes/cron/task/core/tidy_cache.php
	phpBB/includes/cron/task/core/tidy_search.php
2012-08-25 17:00:40 +02:00
Andreas Fischer
bfdba90a34 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [prep-release-3.0.11] Bumping version number for 3.0.11 final.

Conflicts:
	phpBB/install/database_update.php
2012-08-20 16:42:41 +02:00
Andreas Fischer
446607ef53 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [prep-release-3.0.11] Bumping version number for 3.0.11 final.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2012-08-20 16:40:50 +02:00
Andreas Fischer
6da03913bf [prep-release-3.0.11] Bumping version number for 3.0.11 final. 2012-08-20 16:32:34 +02:00
Dhruv
484c0bec11 [ticket/11052] constructor updated in installer and convertor
PHPBB3-11052
2012-08-15 15:44:01 +05:30
Nathan Guse
01bc818d46 [ticket/10875] Fix SQL Caching
The sql_save function cannot take arguments by reference since it is called
by call_user_func_array()

Replace use of isset($cache->sql_rowset[$query_id]) with $cache->sql_exists

Replace $cache->cache_dir with $cache->get_driver()->cache_dir

PHPBB3-10875
2012-07-30 18:44:40 -05:00
Oleg Pudeyev
7fd1a166da Merge PR #865 branch 'dhruvgoel92/feature/sphinx-fulltext-search' into develop
* dhruvgoel92/feature/sphinx-fulltext-search: (57 commits)
  [feature/sphinx-fulltext-search] add sphinx to Authors file
  [feature/sphinx-fulltext-search] add sphinxapi.php file
  [feature/sphinx-fulltext-search] fix auth bug
  [feature/sphinx-fulltext-search] remove unused property
  [feature/sphinx-fulltext-search] use 9312 as default port
  [feature/sphinx-fulltext-search] fix language of host config
  [feature/sphinx-fulltext-search] fix sphinx for arbitary host
  [feature/sphinx-fulltext-search] coding changes acc to phbb conventions
  [feature/sphinx-fulltext-search] fixing comments
  [feature/sphinx-fulltext-search] add trailing slash in language
  [feature/sphinx-fulltext-search] improve port option
  [feature/sphinx-fulltext-search] remove stopwords and config path
  [feature/sphinx-fulltext-search] makes sql host configurable
  [feature/sphinx-fulltext-search] use readonly instead of disabled
  [feature/sphinx-fulltext-search] fix language keys' typo
  [feature/sphinx-fulltext-search] remove note from db_tools
  [feature/sphinx-fulltext-search] add support for postgres
  [feature/sphinx-fulltext-search] add pgsql functionality
  [feature/sphinx-fulltext-search] use Update in sphinx query
  [feature/sphinx-fulltext-search] use CASE instead of IF
  ...
2012-07-27 22:27:26 -04:00
Igor Wiedler
ed34451d5b [feature/dic] Adjust installer script to work with partially configured container
PHPBB3-10739
2012-07-26 17:02:07 +02:00
Igor Wiedler
cec4c94f2e Merge remote-tracking branch 'upstream/develop' into feature/dic
* upstream/develop: (39 commits)
  [ticket/11025] Add underline for hover to classes
  [ticket/11025] Replace <b> with <strong> and/or class for semantic styling in subsilver2
  [ticket/11025] Replace <b> with <strong> and/or class for semantic styling
  [ticket/11025] Make last topic titles in forum list Bold
  [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release.
  [prep-release-3.0.11] Bumping version number for 3.0.11-RC2.
  [ticket/10965] Profile data is only grabbed when show_novalue is enabled
  [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
  [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
  [ticket/10965] Introduce a new profile field option to display no value
  [ticket/10990] Changes for develop
  [ticket/10990] Do not use comma separator when storing it as a log.
  [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate
  [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
  [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
  [ticket/11012] Fix php_ext change in mock_extension_manager
  [ticket/11012] Normalize $phpEx member vars to $php_ext
  [ticket/11002] Use translating option to rename the Etc/GMT options
  [ticket/11009] Backport build.xml from develop to fix Bamboo Unit Testing.
  [ticket/11008] Change onunload_functions to not use eval()
  ...
2012-07-26 16:12:21 +02:00
Andreas Fischer
efbc02acf3 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release.
  [prep-release-3.0.11] Bumping version number for 3.0.11-RC2.

Conflicts:
	phpBB/install/database_update.php
2012-07-23 23:57:08 +02:00
Andreas Fischer
49a53755e6 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release.
  [prep-release-3.0.11] Bumping version number for 3.0.11-RC2.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2012-07-23 23:45:17 +02:00
Andreas Fischer
9f073e4c75 [prep-release-3.0.11] Bumping version number for 3.0.11-RC2. 2012-07-23 23:41:47 +02:00
Andreas Fischer
9480a5e512 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
  [ticket/10965] Introduce a new profile field option to display no value

Conflicts:
	phpBB/includes/acp/acp_profile.php
2012-07-23 15:50:54 +02:00
Andreas Fischer
7b98e75ec3 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
  [ticket/10965] Introduce a new profile field option to display no value
2012-07-23 15:48:53 +02:00
Nils Adermann
19237f5613 [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
PHPBB3-10965
2012-07-23 15:46:04 +02:00
Nils Adermann
10172887fd [ticket/10965] Introduce a new profile field option to display no value
By default the 3.0.10 behaviour is kept, profile fields will not show up
if they have either not yet been selected or in case of an optional
dropdown field if the novalue option was selected.

PHPBB3-10965
2012-07-23 15:45:57 +02:00
Nathan Guse
a5dd64195a [ticket/11021] Add the option to specify a Site home URL and text
PHPBB3-11021
2012-07-22 22:26:38 -05:00
Nathan
67665f5957 [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate
PHPBB3-10990
2012-07-22 14:32:03 -05:00
Igor Wiedler
50bc453aa6 [feature/dic] Load services from extensions
PHPBB3-10739
2012-07-21 21:02:55 +02:00
Igor Wiedler
967cc550ed [feature/dic] Introduce DI processors instead of abusing compiler passes
PHPBB3-10739
2012-07-21 20:42:07 +02:00
Igor Wiedler
32d2ee61f7 [feature/dic] Configure container via config.php, use compiler pass
PHPBB3-10739
2012-07-21 16:14:40 +02:00
Igor Wiedler
5d57caee58 Merge branch 'develop' into feature/dic
* develop: (441 commits)
  [feature/new-tz-handling] Don't use global user but make it a parameter
  [feature/new-tz-handling] Fix size of suggestion button in chrome
  [feature/new-tz-handling] Fall back to UTC, if the timezone is invalid
  [feature/new-tz-handling] Add previous selected value to validation if valid
  [feature/new-tz-handling] Display suggestion when a different value is selected
  [ticket/10998] Add border-radius to forum rules block - prosilver
  [feature/new-tz-handling] Remove additional marking of selected items
  [feature/new-tz-handling] Move update helper function to new class
  [feature/new-tz-handling] Fix unit test
  [feature/new-tz-handling] Delete old variable which is not used anymore
  [feature/new-tz-handling] Rename $user->tz back to $user->timezone
  [feature/pagination-as-list] New parameter for name of start var
  [feature/pagination-as-list] Updates for nils comments
  [feature/pagination-as-list] Rename and deprecate functions
  [feature/pagination-as-list] Various fixes and improvements
  [ticket/10968] Render pagination within the template
  [feature/new-tz-handling] Remove "timezone might be numeric"
  [feature/new-tz-handling] Add function to update the timezone
  [feature/new-tz-handling] Correctly update user and board timezones on update
  [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
  ...

Conflicts:
	phpBB/common.php
	phpBB/composer.json
	phpBB/composer.lock
	tests/cron/task_provider_test.php
2012-07-21 15:36:25 +02:00
Dhruv Goel
9711da2763 [feature/sphinx-fulltext-search] adds default config values
Default config values are added to config table in new install as well
as database_update.

PHPBB3-10946
2012-07-19 23:01:28 +05:30