| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 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
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* 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()
...
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* 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
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-10739
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-10739
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-10739
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-9567
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-9567
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Only disapproving in queue is missing.
PHPBB3-9567
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-9567
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-9567
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-9567
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-9657
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If the user can see all visibilities, we can simply leave out the query part,
instead of adding a bunch of ANDs.
PHPBB3-9657
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Rename the class to more accurately reflect what it does.
PHPBB3-9657
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The soft delete feature seems to work. Tests are pending. A real icon is pending. Add the permissions and the interface to soft-delete posts. Also able to restore posts via the MCP queue
PHPBB3-9657
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Rename topic_visibility class to phpbb_visibility. Also a bit of work to the class itself, mostly cleanup and adding the comments that I'd previously written.
PHPBB3-9657
|
| |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | | |
So far, I've added no new functionality. The biggest change here is adjusting the DB column names to "visibility" rather than "approved". Some things here are pretty likely to change, for example the name and location of the topic_visibility class. Happy birthday phpBB :)
PHPBB3-9657
|
|\ \ \ \
| |_|_|/
|/| | | |
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-9550
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-9550
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-9550
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-9550
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-9550
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-9550
|
| | |/
| |/|
| | |
| | | |
PHPBB3-9550
|
|/ /
| |
| |
| | |
PHPBB3-10990
|
| |
| |
| |
| |
| |
| |
| | |
Add a new parameter to hold the name of the start variable. This
fulfills ticket PHPBB3-8535.
PHPBB3-10968
|
| |
| |
| |
| |
| |
| |
| | |
Re-remove deprecated functions, change on_page to phpbb_on_page,
add null returns, remove globals and pass as params.
PHPBB3-10968
|
| |
| |
| |
| |
| |
| |
| | |
Returned and marked deprecated topic_generate_pagination. Rename
new function in line with coding guidelines.
PHPBB3-10968
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Extracted common template code for prosilver as per subsilver2.
Various other fixups and oversight corrections, changed name
of the "new" template function and re-introduced existing
version. Altered on_page to compensate for removal of some
templating vars from pagination routine.
PHPBB3-10968
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
PHPBB3-10811
|
|/
|
|
| |
PHPBB3-10811
|
|\
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic).
[ticket/10606] Fix incorrect hidden fields array name in page_header().
|
| |
| |
| |
| |
| |
| | |
Regression from dfb7cc625a37c6345fa647ee3a21f890ba5c9649.
PHPBB3-10606
|
| |
| |
| |
| | |
PHPBB3-9916
|
|\ \
| |/
| |
| |
| | |
* develop-olympus:
[ticket/10319] Missing hidden fields in search form
|
| |
| |
| |
| |
| |
| | |
Missing hidden fields in search form (bug added in 3.0.9)
PHPBB3-10319
|
| |
| |
| |
| | |
PHPBB3-10345
|
| |
| |
| |
| |
| |
| | |
It's easier for mods/extensions to extend the arrays.
PHPBB3-10484
|
|\ \
| |/
| |
| |
| | |
* develop-olympus:
[ticket/10437] Do not display announcements that are waiting for approval
|
| |\
| | |
| | |
| | |
| | | |
* nickvergessen/ticket/10437:
[ticket/10437] Do not display announcements that are waiting for approval
|
| | |
| | |
| | |
| | | |
PHPBB3-10437
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* nickvergessen/ticket/develop/10435:
[ticket/10435] Remove global announcement from forums total topic count
Conflicts:
phpBB/viewforum.php
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We need to remove the global announcements from the forums total topic count,
otherwise the number is different from the one on the forum list.
PHPBB3-10435
|
|\ \ \ \
| | |/ /
| |/| |
| | | |
| | | | |
* develop-olympus:
[ticket/10435] Readd local announcements to total topic count in viewforum
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
* nickvergessen/ticket/10435:
[ticket/10435] Readd local announcements to total topic count in viewforum
|
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | | |
We need to readd the local announcements to the forums total topic count,
otherwise the number is different from the one in the forum list.
PHPBB3-10435
|
|\ \ \ \
| |/ / /
| | | /
| |_|/
|/| |
| | |
| | |
| | | |
* develop-olympus:
[ticket/10237] Display login-box for guests, when (un)subscribing
Conflicts:
phpBB/includes/functions_display.php
|