| Commit message (Collapse) | Author | Age | Files | Lines |
| |\
| |
| |
| |
| | |
* develop-olympus:
[ticket/8636] Add resync option to topic_view moderation page
|
| | |\
| | |
| | |
| | |
| | | |
* nickvergessen/ticket/8636:
[ticket/8636] Add resync option to topic_view moderation page
|
| | | |
| | |
| | |
| | | |
PHPBB3-8636
|
| | | |
| | |
| | |
| | | |
PHPBB3-10690
|
| |\ \ \
| |/ /
| | |
| | |
| | | |
* develop-olympus:
[ticket/10456] Add tabindex to subsilver2 captcha
|
| | |/
| |
| |
| |
| |
| | |
Did not set tabindex on registration page, as the hole page does not have any.
PHPBB3-10456
|
| | |
| |
| |
| |
| |
| | |
Updates the MCP template according to PHPBB3-10345
PHPBB3-10641
|
| |\ \
| |/
| |
| |
| |
| | |
* develop-olympus:
[ticket/10569] Invalid string comparison in prosilver
[ticket/10569] Invalid string comparison in subsilver2
|
| | |\
| | |
| | |
| | |
| | |
| | | |
* cyberalien/ticket/10569:
[ticket/10569] Invalid string comparison in prosilver
[ticket/10569] Invalid string comparison in subsilver2
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Fixing invalid string comparison in ucp_main_front.html in subsilver2
PHPBB3-10569
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
* 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
|
| | |/
| |
| |
| |
| |
| | |
Adding template inheritance field to prosilver and subsilver2
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
|
| | | |
| | |
| | |
| | | |
PHPBB3-10535
|
| | | |
| | |
| | |
| | | |
PHPBB3-9916
|
| |\ \ \
| | |/
| |/|
| | |
| | | |
* develop-olympus:
[ticket/10542] Remove class="postlink" in subsilver2 faq_body.html
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
class="postlink" is not defined in stylesheet.css so remove it from
styles/subsilver2/template/faq_body.html
PHPBB3-10542
|
| |\ \ \
| |/ /
| | /
| |/
|/|
| | |
* develop-olympus:
[ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2
[ticket/8996] Revert initial fix to keep old behaviour on empty selection
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Revert "[ticket/8996] Also fix the BBCode bug in subsilver2 and acp"
This reverts commit eb1f15bc8b7b7a284b25b2c9b9942714b6848ebc.
PHPBB3-8996
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | | |
* nickvergessen/ticket/10344:
[ticket/10344] Add attachment icons to list of reported and queued posts/topics
|
| | | |
| | |
| | |
| | | |
PHPBB3-10344
|
| |\ \ \
| | |/
| |/|
| | |
| | |
| | | |
* develop-olympus:
[ticket/8996] Also fix the BBCode bug in subsilver2 and acp
[ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskey
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | | |
* nickvergessen/ticket/8996:
[ticket/8996] Also fix the BBCode bug in subsilver2 and acp
[ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskey
|
| | | | | |
|
| |\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* develop-olympus:
[ticket/10452] Fix xHTML errors when print-viewing PMs
Conflicts:
phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
Also changed the layout of prosilvers PM print-view, so it looks like the post
print-view and not like the subsilver2 print-view.
PHPBB3-10452
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add an option to the ACP so admins can choose to host jQuery
from the local version shipped with phpBB, or via a popular CDN.
PHPBB3-10390
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into develop
* github-cyberalien/feature/remove-imagesets:
[feature/remove-imagesets] Script for converting imageset to css
[feature/remove-imagesets] Changing subsilver
[feature/remove-imagesets] Changing prosilver
[feature/remove-imagesets] Adjustments to php files
[feature/remove-imagesets] Changing admin control panel styles module
[feature/remove-imagesets] Changing database structure
[feature/remove-imagesets] Removing imageset files
[feature/remove-imagesets] Moving images
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Removing imagesets. Changing subsilver
PHPBB3-10336
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* igorw/ticket/10155:
[ticket/10155] Briefly explain assets in coding-guidelines
[ticket/10155] Move jQuery inclusion to footer
[ticket/10155] Update to jQuery 1.6.2
[ticket/10155] Add jQuery to AUTHORS
[ticket/10155] Add jQuery, introduce global assets path
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-10155
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Add the jQuery JavaScript library to all pages, giving modifications
instant access and allowing for any future core JavaScript to take
advantage of it.
Also introduce a global /assets directory for assets that are shared
between styles.
PHPBB3-10155
|
| |\ \ \ \ \
| |_|/ / /
|/| | | |
| | | | |
| | | | | |
* bantu/ticket/9474:
[ticket/9474] Remove unused/unreferenced mcp_viewlogs.html files.
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-9474
|
| |\ \ \ \ \
| | |_|/ /
| |/| | |
| | | | |
| | | | | |
* develop-olympus:
[ticket/10341] Also show forum/topic name of "0" as most active forum/topic.
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
ticket/bantu/10341
* remotes/bantu/ticket/10341:
[ticket/10341] Also show forum/topic name of "0" as most active forum/topic.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-10341
|
| |\ \ \ \ \ \
| |/ / / / /
| | | / / /
| |_|/ / /
|/| | | | |
* develop-olympus:
[ticket/10253] Fix IE9 handling in javascript, to correctly quote text.
|
| | |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | | |
* nickvergessen/ticket/10253:
[ticket/10253] Fix IE9 handling in javascript, to correctly quote text.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Since IE9 IE supports textarea.selectionStart and window.getSelection.
The only problem is, that the values are still incorrect.
Therefore we need to ensure that it is still treated the old way,
until IE fixes this completely.
PHPBB3-10253
|
| |\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* develop-olympus:
[ticket/8571] Show age as 0 in birthday list when birthday is in the future.
[ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future.
[ticket/8571] Also display age on memberlist/viewprofile when age is 0.
Conflicts:
phpBB/index.php
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* github-bantu/ticket/8571:
[ticket/8571] Show age as 0 in birthday list when birthday is in the future.
[ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future.
[ticket/8571] Also display age on memberlist/viewprofile when age is 0.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-8571
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* erikfrerejean/ticket/10312:
[ticket/10312] Un-check the shadow option while moving.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Don't create a shadow topic by default when moving a topic
the user should have the option to do this but it shouldn't
be done by default.
PHPBB3-10312
|
| |/ / / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
When moving a topic you can straight away lock it, when using proSilver
this checkbox is unchecked by default. subSilver2 however has this
checked.
Change subSilver2 to not check the box by default and behave as
proSilver does.
PHPBB3-10316
|
| |\ \ \ \ \ \
| |/ / / / /
| | | | | |
| | | | | |
| | | | | | |
* develop-olympus:
[ticket/10298] Properly close embed tag for QuickTime in subsilver2.
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* bantu/ticket/10298:
[ticket/10298] Properly close embed tag for QuickTime in subsilver2.
|