| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| | |
* develop-olympus:
[ticket/10846] fixing SQL query bug in acp_main.php
|
| |
| |
| |
| | |
PHPBB3-10846
|
|\ \
| | |
| | |
| | |
| | | |
* VSEphpbb/ticket/10779:
[ticket/10779] Move jQuery CDN option to Load Settings
|
| | |
| | |
| | |
| | |
| | |
| | | |
http://tracker.phpbb.com/browse/PHPBB3-10779
PHPBB3-10779
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The pull request (#654) was merged a little too quickly.
In particular, display_last_subject per-forum option needs consensus.
This reverts commit b1fb34a4d7e446768b9f66ba6dd359173cd2a5fb, reversing
changes made to 7d6b289671c51694f17dd5f9849abf2534b55e59.
PHPBB3-10650
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Inserted a space before 'true' as per coding
guidelines.
PHPBB3-10650
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The most recent topic title of the forum can now
be displayed on the board index. An option is provided
in the ACP under the 'General Forum Setting' which
allows the admin to enable or disable this feature.
PHPBB3-10650
|
|/ /
| |
| |
| |
| |
| | |
Check if phpbb_version exists when installing style. Do not warn users about installing outdated styles yet, that part of acp_styles will be changed in different branch.
PHPBB3-10762
|
| |
| |
| |
| |
| |
| | |
Adding form token, changing functions to public/protected, fixing few more errors
PHPBB3-10752
|
| |
| |
| |
| |
| |
| | |
Changing private to protected variables in acp_styles
PHPBB3-10752
|
| |
| |
| |
| |
| |
| | |
Fixing return doc blocks, spacing, incorrect sorting function and other minor fixes
PHPBB3-10752
|
| |
| |
| |
| |
| |
| | |
Fixing pass-by-reference bug in acp_styles
PHPBB3-10752
|
| |
| |
| |
| |
| |
| | |
Removing global variables from functions in acp_styles
PHPBB3-10752
|
| |
| |
| |
| | |
PHPBB3-10609
|
| |
| |
| |
| |
| |
| |
| | |
When on install page and all styles are installed, fix back link to go to main
styles page.
PHPBB3-10632
|
| |
| |
| |
| |
| |
| | |
Changing from "delete" to "uninstall" in acp_styles to avoid confusing users
PHPBB3-10632
|
| |
| |
| |
| |
| |
| | |
Fixing notices and usability issues
PHPBB3-10632
|
| |
| |
| |
| | |
PHPBB3-10632
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 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
|
| | |
| | |
| | |
| | | |
PHPBB3-10270
|
| | |
| | |
| | |
| | | |
PHPBB3-10270
|
| | |
| | |
| | |
| | | |
PHPBB3-10270
|
| | |
| | |
| | |
| | | |
PHPBB3-10270
|
| | |
| | |
| | |
| | | |
PHPBB3-10270
|
| | |
| | |
| | |
| | | |
PHPBB3-10272
|
| | |
| | |
| | |
| | | |
PHPBB3-10271
|
| | |
| | |
| | |
| | | |
PHPBB3-10271
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The following places have had deletion AJAXified:
* Smilies and icons
* Word censors
* BBCodes
* Attachment groups
* Groups
* Admin / User / Moderator / Forum roles
* Report / denial reasons
* Module management
* Custom profile fields
PHPBB3-10271
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | | |
PHPBB3-10281
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Allow all administrators to purge cache
PHPBB3-10659
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
feature/merging-style-components
* upstream/develop: (65 commits)
[ticket/10730] Added label tag around "select" text in post splitting UI
[ticket/10732] Add config_dev.php and config_test.php to .gitignore
[ticket/10586] Added space in if statement
[ticket/10586] Tidy up comments
[task/php5.3] Updated range of tested PHP versions
[task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2
[task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2
[ticket/10723] Stop Travis running all tests on sqlite
[ticket/10703] Added a condition to check if ext directory exists
[task/travis] Refactor php version check for dbunit install
[task/travis] Exclude functional and slow tests
[ticket/10719] Revert "Skip functional tests on PHP 5.2"
[task/travis-develop2] Update version from 5.3 to 5.3.2
[task/travis] Dropping support for 5.2 in develop branch
[task/travis] Some more small travis fixes
[task/travis] Rename travis phpunit config files
[task/travis] Fixing some travis issues
[ticket/10684] Adjust function and parameter name, minor changes.
[task/travis] Add automated testing to readme
[task/travis] Removing development information
...
Conflicts:
phpBB/install/database_update.php
|
| |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | | |
* develop-olympus:
[ticket/10694] Adjusting details link to 5.3 announcement
[ticket/10694] Update PHP warning to 5.3.2
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10694
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10694
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Split module_auth into a static and a non-static version.
Call the static version statically and the non-static version non-statically.
PHPBB3-10615
|
|/ / /
| | |
| | |
| | |
| | |
| | | |
New acp_styles, completely rewritten
PHPBB3-10632
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | | |
* develop-olympus:
[ticket/9831] Fix saving unchecked checkbox field value
[ticket/9831] Correctly store checkbox default value for boolean CPF.
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | | |
* rxu/ticket/9831:
[ticket/9831] Fix saving unchecked checkbox field value
[ticket/9831] Correctly store checkbox default value for boolean CPF.
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-9831
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-9831
|
|\ \ \ \
| |/ / /
| | | /
| |_|/
|/| | |
* develop-olympus:
[ticket/10639] Do not allow negative post count as rank's minimum posts
|
| | |
| | |
| | |
| | | |
PHPBB3-10639
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
* 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
|
| |/
| |
| |
| |
| |
| | |
Add template inheritance when exporting template.cfg
PHPBB3-10616
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* imkingdavid/ticket/10535:
[ticket/10535] Delete no longer needed email confirm language entries.
[ticket/10535] Delete email confirm from installer
[ticket/10535] Removed email confirm field from acp_users module
[ticket/10535] Forgot a subsilver2 change. *doh*
[ticket/10535] Removed email confirm from UCP, removed unused language entries
[ticket/10535] Remove email confirm check on registration form
|
| | |
| | |
| | |
| | | |
PHPBB3-10535
|