1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

1558 Commits

Author SHA1 Message Date
Rahul R
c524236ef6 [ticket/10650] Changed acp option from per forum to global
Changed the display last subject acp toggle option from
per forum to global. Modified associated database entries.
New option is available in ACP General->Board Features.
Also corrected <br /> in forumlist_body.html.

PHPBB3-10650
2012-04-08 10:34:44 +05:30
Rahul
492c27a693 [ticket/10650] Changed language files and forumlist
The entry in languages have been changed from
title to subject. Also the IF condition in forumlist_body.html
has been properly intented.

PHPBB3-10650
2012-04-08 10:32:59 +05:30
Rahul
9b30bd6392 [ticket/10650] Displaying last topic on forum list
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
2012-04-08 10:32:19 +05:30
Oleg Pudeyev
e5ed5e033a Merge PR #718 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10764] FAQ now mentions Area51 instead of SourceForge
  [ticket/10764] FAQ now mentions GitHub instead of SourceForge
2012-04-07 22:24:24 -04:00
Adonais Romero González
04bb44ce33 [ticket/10764] FAQ now mentions Area51 instead of SourceForge
The answer of the question "Why isn't X feature available?" in
the FAQ now mentions Area51 instead of SourceForge and GitHub
as the way to handle feature requests.

PHPBB3-10764
2012-04-05 20:22:00 -05:00
Adonais Romero González
293f66d4ed [ticket/10764] FAQ now mentions GitHub instead of SourceForge
The answer of the question "Why isn't X feature available?" in the
FAQ now mentions GitHub instead of SourceForge as the way to handle
feature requests.

PHPBB3-10764
2012-04-05 19:03:08 -05:00
Oleg Pudeyev
713e7129e2 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10508] Marked as read message now less specific.
2012-04-05 15:35:19 -04:00
Oleg Pudeyev
30093d6e86 Merge remote-tracking branch 'Fyorl/ticket/10508' into develop-olympus
* Fyorl/ticket/10508:
  [ticket/10508] Marked as read message now less specific.
2012-04-05 15:35:12 -04:00
Oleg Pudeyev
98964a913c [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop
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
2012-04-04 19:23:05 -04:00
David King
b1fb34a4d7 Merge remote-tracking branch 'rahulr92/ticket/10650' into develop 2012-04-04 16:41:28 -04:00
Oleg Pudeyev
7d6b289671 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10607] Added 'Powered by' translation string.

Conflicts:
	phpBB/adm/index.php
	phpBB/language/en/common.php
2012-04-04 15:33:51 -04:00
Rahul
01e6254ccc [ticket/10650] Changed language files and forumlist
The entry in languages have been changed from
title to subject. Also the IF condition in forumlist_body.html
has been properly intented.

PHPBB3-10650
2012-04-05 00:45:50 +05:30
Rahul
f32547c215 [ticket/10650] Displaying last topic on forum list
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
2012-04-05 00:45:26 +05:30
Fyorl
0ceb77fb99 [ticket/10607] Added 'Powered by' translation string.
Added POWERED_BY line to common.php and modified the templates
to use it.

PHPBB3-10607
2012-04-04 11:38:15 +08:00
Fyorl
0df3f1c5d0 [ticket/10508] Marked as read message now less specific.
Changed 'The selected forums have been marked read' to 'Forums
have been marked read'

PHPBB3-10508
2012-04-04 02:51:28 +08:00
rxu
bf0a3ddaca Merge pull request #670 from imkingdavid/feature/qrpreview
[feature/qrpreview] Preview from Quick Reply
2012-04-01 11:28:47 -07:00
David King
26a999c83c Merge remote-tracking branch 'brunoais/ticket/10705' into develop 2012-03-31 13:49:49 -04:00
Igor Wiedler
1d4253319c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [Ticket/10675] Correct language string ATTACH_DISK_FULL
  [feature/event-dispatcher] Adding composer.phar to .gitignore for olympus
  [ticket/10675] Add disk full language string when posting attachments
2012-03-31 19:29:56 +02:00
Igor Wiedler
3477b5e5a8 Merge remote-tracking branch 'Dickyf/ticket/10675' into develop-olympus
* Dickyf/ticket/10675:
  [Ticket/10675] Correct language string ATTACH_DISK_FULL
  [ticket/10675] Add disk full language string when posting attachments
2012-03-31 19:27:19 +02:00
Richard Foote
b8b342be2d [Ticket/10675] Correct language string ATTACH_DISK_FULL
Add period to ATTACH_DISK_FULL language string

PHPBB3-10675
2012-03-31 12:46:44 -04:00
Vjacheslav Trushkin
0540509f14 [feature/merging-style-components] Renaming "delete" to "uninstall" for styles
Changing from "delete" to "uninstall" in acp_styles to avoid confusing users

PHPBB3-10632
2012-03-31 17:58:17 +03:00
Vjacheslav Trushkin
398a6c8045 Merge branch 'develop' into feature/merging-style-components
* 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
2012-03-31 10:43:06 +03:00
David King
a7045e6572 [feature/qrpreview] Preview from Quick Reply
PHPBB3-10726
2012-03-30 21:43:00 -04:00
Igor Wiedler
27199bb509 [feature/ajax] Generic error handling with a phpbb.alert box
PHPBB3-10270
2012-03-31 02:09:26 +02:00
Callum Macrae
f9ddeacd8e [ticket/10272] Renamed l-err-processing-req to l-timeout-processing-req.
PHPBB3-10272
2012-03-31 02:09:22 +02:00
Callum Macrae
0e55b2393d [ticket/10270] Removed all the inline language and HTML from the JS.
PHPBB3-10270
2012-03-31 02:09:17 +02:00
Callum Macrae
4ae74cd4b4 [ticket/10271] AJAXified buttons on acp_main.
PHPBB3-10271
2012-03-31 02:09:15 +02:00
Callum Macrae
1cb3b595ec [ticket/10271] AJAXified the styles tab in the ACP.
PHPBB3-10271
2012-03-31 02:09:15 +02:00
Callum Macrae
11112314f7 [ticket/10271] AJAXified various deletions in the ACP.
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
2012-03-31 02:09:15 +02:00
Callum Macrae
420de9c9a0 [ticket/10270] Moved some HTML from the JavaScript to overall_footer.
PHPBB3-10270
2012-03-31 02:09:14 +02:00
Callum Macrae
8a28456f75 [ticket/10273] AJAXified approve / disapprove posts (in viewtopic).
This commit AJAXifies the moderator approval functionality, and adds it to
viewtopic instead of the MCP. This commit has involved some language changes,
which may affect fallbacks.

PHPBB3-10273
2012-03-31 02:00:22 +02:00
Vjacheslav Trushkin
f15167bcfa Merge remote-tracking branch 'imkingdavid/ticket/10727' into develop
* imkingdavid/ticket/10727:
  [ticket/10727] Do not hide Quick Reply with javascript on prosilver
2012-03-31 00:22:04 +03:00
Vjacheslav Trushkin
506951e8af [feature/merging-style-components] Changing acp_styles text
Changing acp styles welcome message a little bit.

PHPBB3-10632
2012-03-30 16:13:16 +03:00
David King
29a904ce45 Merge branch 'develop-olympus' into develop
Conflicts:
	phpBB/language/en/acp/common.php
2012-03-29 20:43:03 -04:00
Vjacheslav Trushkin
ba431def5d Merge remote-tracking branch 'upstream/develop' into 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
2012-03-29 22:38:07 +03:00
Bruno Ais
28fac32742 [ticket/10705] Change WARNINGS_ZERO_TOTAL in en language
Located the WARNINGS_ZERO_TOTAL in the language and replaced it with
NO_WARNINGS

PHPBB3-10705
2012-03-29 15:51:06 +01:00
Igor Wiedler
7258794be3 Merge remote-tracking branch 'imkingdavid/ticket/10586' into develop
* imkingdavid/ticket/10586:
  [ticket/10586] Added space in if statement
  [ticket/10586] Tidy up comments
  [ticket/10586] Tests finally work (thanks naderman)
  [ticket/10586] Correctly purge board cache and don't rename install directory
  [ticket/10586] trying to get tests to work
  [ticket/10586] more work on getting tests to pass
  [ticket/10586] Tests are coming along, just a little more to go
  [ticket/10586] Rename install directory back to install/ after tests
  [ticket/10586] browse tests now work, but mine dont. at least we are making progress
  [ticket/10586] initial work on copying fixtures. Note that this depends on 10706
  [ticket/10586] Adding the extensions used by the tests
  [ticket/10586] Now tests run, but fail. But here is what I have.
  [ticket/10586] some bootstrap additions and test changes to try and make it work
  [ticket/10586] test stuff. does not work yet, still need to put phpBB objects in bootstrap.php
  [ticket/10586] Copy/paste fail fixed
  [ticket/10586] Sanitize periods from class names, use manager to get path.
  [ticket/10586] Removed file_exists() check because class_exists() covers that.
  [ticket/10586] Extension front controller
2012-03-28 21:36:07 +02:00
David King
75e731e14b [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2
PHPBB3-10693
2012-03-25 21:20:52 -04:00
David King
cfb8f01040 [ticket/10727] Do not hide Quick Reply with javascript on prosilver
PHPBB3-10727
2012-03-24 22:03:03 -04:00
HTF
2768db44f5 [ticket/10129] Remove apostrophes and plurals in ACP user management -> permissions language file as per ticket.
PHPBB3-10129
2012-03-24 15:13:04 +00:00
Richard Foote
97d4f168f5 [ticket/10675] Add disk full language string when posting attachments
Add language string visible by admins only for when the disk does not have
enough free space to upload attachments.

PHPBB3-10675
2012-03-19 15:08:28 -04:00
David King
a0131b45f5 [ticket/10586] Extension front controller
Handle extension front pages

PHPBB3-10586
2012-03-19 09:12:31 -04:00
Oleg Pudeyev
e8e5d2b2c0 [feature/new-tz-handling] Removed DST and numeric timezone-related language.
PHPBB3-9558
2012-03-14 22:57:31 -04:00
Oleg Pudeyev
da8009603d [feature/new-tz-handling] Preselect a timezone in registration.
Use Javascript to obtain client's timezone offset and select the
first timezone in our list with that offset.

Changes for prosilver only. The javascript file should be shared
between styles.

PHPBB3-9558
2012-03-14 22:57:31 -04:00
Vjacheslav Trushkin
0c6955e73c [feature/merging-style-components] Adding new language variables
Adding new language variables for acp_styles and removing some unused variables

PHPBB3-10632
2012-03-14 23:45:54 +02:00
Joas Schilling
33dce916e2 [ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue
PHPBB3-10690
2012-03-14 22:22:22 +01:00
Andreas Fischer
3850b05fbb Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/7432] Delete redundant reference to "appropriate menu item".
  [ticket/7432] Explain what users are inactive in more detail.
2012-03-09 23:43:11 +01:00
Andreas Fischer
aee79c6cdb Merge remote-tracking branch 'p/ticket/7432' into develop-olympus
* p/ticket/7432:
  [ticket/7432] Delete redundant reference to "appropriate menu item".
  [ticket/7432] Explain what users are inactive in more detail.
2012-03-09 23:41:43 +01:00
Oleg Pudeyev
89a0cbc57e [ticket/7432] Delete redundant reference to "appropriate menu item".
PHPBB3-7432
2012-03-07 18:00:57 -05:00
Andreas Fischer
74dfea22a1 Merge remote-tracking branch 'p/ticket/10618' into develop
* p/ticket/10618:
  [ticket/10618] Change phpBB 3 to phpBB 3.1.
  [ticket/10618] Replace phpBB 3.0 with phpBB 3 for 3.1.
2012-03-07 12:56:32 +01:00