| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| | |
feature/new-tz-handling
|
| |
| |
| |
| | |
PHPBB3-10829
|
| |
| |
| |
| |
| |
| | |
Renaming user->theme to user->style
PHPBB3-10743
|
| |
| |
| |
| | |
PHPBB3-10931
|
| |
| |
| |
| |
| |
| | |
Marked the old one as deprecated and made it using the new function.
PHPBB3-9558
|
| |
| |
| |
| | |
PHPBB3-9558
|
| |
| |
| |
| | |
PHPBB3-9558
|
| |
| |
| |
| | |
PHPBB3-9558
|
| |
| |
| |
| | |
PHPBB3-9558
|
| |
| |
| |
| | |
PHPBB3-9558
|
| |
| |
| |
| | |
PHPBB3-9558
|
| |
| |
| |
| | |
PHPBB3-9558
|
| |
| |
| |
| | |
PHPBB3-9558
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| | |
feature/new-tz-handling
Conflicts:
phpBB/includes/functions_profile_fields.php
phpBB/includes/session.php
phpBB/install/database_update.php
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Since the list of timezones is very long, and users are likely
to know their current offset but not necessarily which city
that is nearby is in the timezone database, sort the list of
timezones by offset.
UTC is specially handled to show up before other GMT+0 timezones.
PHPBB3-9558
|
| |
| |
| |
| | |
PHPBB3-9558
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
tz_select() now uses the PHP timezone database to generate the timezone
selection box, it tries to use a translated language string otherwise falls
back to a label produced from the timezone identifier. I've done this so
new timezones are available immediately without a new language pack.
PHPBB3-9558
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
[ticket/10162] Increase maximum length of email address TLD from 6 to 63.
[ticket/10162] Add test cases for top level domain names longer than 6 chars.
|
| | |
| | |
| | |
| | |
| | |
| | | |
Increase maximum length of email address top level domains from 6 to 63.
PHPBB3-10162
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | | |
* develop-olympus:
[ticket/10565] Add line breaks to query in order to follow coding guidelines.
[ticket/10565] update_forum_tracking_info(): Remove unnecessary GROUP BY clause
|
| | |
| | |
| | |
| | | |
PHPBB3-10565
|
| | |
| | |
| | |
| | | |
PHPBB3-10565
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* shibulijack/ticket/10688:
[ticket/10688] Update install.html for 3.1 and current practices.
[ticket/10688] Update readme for 3.1 and current practices.
[ticket/10688] Changed version 3.0 to 3.1
[ticket/10688] Updated version to 3.1
[ticket/10688] Changed 3.0 to 3.1 in docs
Conflicts:
phpBB/docs/INSTALL.html
phpBB/docs/README.html
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Replace phpBB 3.0.x to phpBB 3.1.x
PHPBB-10688
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10783
|
|\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* develop-olympus:
[ticket/10607] Added 'Powered by' translation string.
Conflicts:
phpBB/adm/index.php
phpBB/language/en/common.php
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Added POWERED_BY line to common.php and modified the templates
to use it.
PHPBB3-10607
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Temporary solution for T_SUPER_TEMPLATE_PATH pointing to wrong directory, variable will be completely removed later because it will be obsolete
PHPBB3-10665
|
| | | |
| | | |
| | | |
| | | | |
PHPBB-10609
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* develop: (175 commits)
[feature/ajax] Remove strange non-breaking spaces from approve button
[feature/ajax] Add entirely unrelated but nice newlines
[feature/ajax] Unify phpbb_json_response instantiation
[feature/ajax] Fix acp_styles activate_deactivate ajax callback name
[feature/ajax] Send correct activate/deactivate JSON response in acp_profile
[ticket/10270] Alter background colors for posts
[feature/ajax] Remove not working module enable/disable ajax code
[feature/ajax] Replace static call to phpbb_request with OO
[feature/ajax] Remove quick-reply AJAX handling until we have something good
[ticket/10270] Changing close button for ajax popups
[ticket/10270] Disabling links in disappearing content
[ticket/10291] Fixed an AJAX bug on quick reply form submit.
[ticket/10273] Fixed accepting / denying posts AJAX.
[ticket/10272] Removed code that was prevent event propogation in AJAX.
[ticket/10291] Fixed a bug in the quick reply AJAX.
[feature/ajax] Handle acp_modules error cases with JSON response
[feature/ajax] Fix filter check, quick mod tools data-attribute
[feature/ajax] Use the error handler
[feature/ajax] Generic error handling with a phpbb.alert box
[feature/ajax] Change filter semantics, some minor adjustments
...
Conflicts:
phpBB/adm/style/acp_styles.html
phpBB/includes/acp/acp_styles.php
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
It is no longer static, and uses autoloading. It has also been renamed
from JSON to phpbb_json_response.
PHPBB3-10328
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The JSON class adds a consistent way to send JSON to the client, making
it perfect for AJAX (jQuery automatically parses it).
PHPBB3-10328
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-10271
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This commit adds the phpbb object (JavaScript), and alert and confirm box
methods. It also adds the first basic AJAX functionality, to deleting posts
in viewtopic.
PHPBB3-10270
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Update it to the new correct format.
PHPBB3-9550
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-9550
|
| |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* develop: (95 commits)
[ticket/9084] Explain the logic.
[ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count
[ticket/9813] Only get posts table row count if we detected a fulltext index.
[feature/append_var] Adding test case
[ticket/7432] Delete redundant reference to "appropriate menu item".
[ticket/10618] Change phpBB 3 to phpBB 3.1.
[ticket/10685] Refactor template test defaults for php 5.4 compatibility.
[feature/append_var] Adding append_var template class function
[ticket/9813] Also use estimated row count of posts table for fulltext mysql.
[ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1.
[ticket/10653] Unit tests for get_row_count() and get_estimated_row_count().
[ticket/10653] Add ability to count table rows to database abstraction layer.
[ticket/9813] Use table status row count only if greater than 100000 or exact.
[ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
[ticket/8652] Comment for also updating forum watch table in user_notification.
[ticket/8652] Sending 2 emails on 2 replies
[ticket/10680] Add /phpBB/ext/* to .gitignore
[ticket/10672] Fix total post count language string in statistics and feed
[ticket/9220] Remove margin on table.table1 so it's centered in the blue box.
[ticket/10453] Fixing spacing
...
Conflicts:
tests/bootstrap.php
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-9550
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-9550
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-9550
|
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | | |
Removing theme and template entries in all files, except for acp styles section
PHPBB3-10632
|
|\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | | |
* 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
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | | |
* develop-olympus:
[ticket/10616] Add template inheritance to exported template
[ticket/10616] Ignore template inheritance that points to self
[ticket/10616] Add template inheritance to default styles
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Ignore template inheritance if it points to self
PHPBB3-10616
|
|\ \ \ \
| |/ / /
| | / /
| |/ /
|/| |
| | | |
* develop-olympus:
[ticket/9079] Always log backtrace to error log when logging errors.
[ticket/9079] Display backtrace on all E_USER_ERROR errors, not only SQL errors
|
| | |
| | |
| | |
| | | |
PHPBB3-9079
|
| | |
| | |
| | |
| | | |
PHPBB3-9079
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | | |
* cyberalien/ticket/10399:
[ticket/10399] Correctly encoding template component urls (3.0)
[ticket/10399] Correctly encoding template component urls (3.0)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Correctly encoding template component urls
PHPBB3-10399
|