1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-04 22:58:10 +02:00

17926 Commits

Author SHA1 Message Date
Nils Adermann
0ad9833668 Merge remote-tracking branch 'github-nickvergessen/ticket/12331' into develop-ascraeus
* github-nickvergessen/ticket/12331:
  [ticket/12331] Add functional test for saving custom profile fields
  [ticket/12331] Fix SQL error when inserting a new entry to profile field data
2014-04-10 14:14:30 -07:00
Nils Adermann
e2654b34c8 Merge remote-tracking branch 'github-nickvergessen/ticket/12286' into develop-ascraeus
* github-nickvergessen/ticket/12286:
  [ticket/12286] Reword section about plurals
  [ticket/12286] Fix spelling of elephant(s) in the sample
  [ticket/12286] Correctly capitalize PHP
  [ticket/12286] Fix nesting of ul inside li element
  [ticket/12286] Add note that goto should not be used
  [ticket/12286] Add section about plurals to the coding guidelines
  [ticket/12286] Classes must use the name space
  [ticket/12286] Remove section about utf8_normalize_nfc()
  [ticket/12286] Use $request->variable() instead of request_var()
  [ticket/12286] Function names should be prefixed with phpbb_
  [ticket/12286] Add "Since" to template event docs
  [ticket/12286] style.php and imagesets dont exist anymore
  [ticket/12286] Styles have a phpbb_version and a style_version in 3.1
  [ticket/12286] Use UTF8 (c) in style.cfg samples
2014-04-10 14:05:56 -07:00
Nils Adermann
7a947b247d Merge remote-tracking branch 'github-nickvergessen/ticket/12282' into develop-ascraeus
* github-nickvergessen/ticket/12282:
  [ticket/12282] Update new references
  [ticket/12282] Update container db mock
  [ticket/12282] Add new line at EOF of the interface
  [ticket/12282] Use interface for type hinting
  [ticket/12282] Use {@inheritDoc} for inherited methods
  [ticket/12282] Add Interface for DBAL drivers
2014-04-10 14:04:43 -07:00
Nils Adermann
79fe781629 Merge remote-tracking branch 'github-nickvergessen/ticket/11352' into develop-ascraeus
* github-nickvergessen/ticket/11352:
  [ticket/11352] Add functional tests for disapproving a post/topic
  [ticket/11352] Redirect the user back to view*.php after disapproving
2014-04-10 13:56:30 -07:00
Matt Friedman
eb6b877330 [ticket/12380] Explicity state the order of sorting for login keys
PHPBB3-12380
2014-04-10 09:10:01 -07:00
Matt Friedman
49885e55e7 [ticket/12380] Sort Remember Me keys by last login time in UCP
PHPBB3-12380
2014-04-10 09:04:35 -07:00
Andreas Fischer
2284e2897f Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12381] Fix broken error message when selecting invalid DB driver
2014-04-10 15:44:47 +02:00
Oliver Schramm
87cfcda638 [ticket/12381] Fix broken error message when selecting invalid DB driver
PHPBB3-12381
2014-04-10 15:05:16 +02:00
PayBas
c8429b8e6a [ticket/12377] Forgot to change the INCLUDEs
PHPBB3-12377
2014-04-10 12:52:18 +02:00
PayBas
9dbc9b0cc2 [ticket/12377] Renamed template files to navbar_xxx
PHPBB3-12377
2014-04-10 12:52:18 +02:00
PayBas
95212746c7 [ticket/12377] Moved notifications to new template
And also reset all starting indentation to 0

PHPBB3-12377
2014-04-10 12:52:17 +02:00
PayBas
16b06c980d [ticket/12377] Forgot empty line at the end
PHPBB3-12377
2014-04-10 12:52:17 +02:00
PayBas
00d87e86ec [ticket/12377] Move navbar(s) to new template file
PHPBB3-12377
2014-04-10 12:52:16 +02:00
Joas Schilling
377fb770fb Merge remote-tracking branch 'vsephpbb/ticket/11098' into develop-ascraeus
* vsephpbb/ticket/11098:
  [ticket/11098] Fix error reporting on the autologin key pages
  [ticket/11098] Update subsilver2 to also include mark/unmark all buttons
  [ticket/11098] HTML Validity fix to Notifications in UCP
  [ticket/11098] Add mark/unmark all options to remember me keys
2014-04-10 12:08:01 +02:00
Joas Schilling
15dfa9bba2 Merge remote-tracking branch 'prototech/ticket/12375' into develop-ascraeus
* prototech/ticket/12375:
  [ticket/12375] Fix broken attachment deletion.
2014-04-10 12:03:41 +02:00
Joas Schilling
20c6139ad1 Merge remote-tracking branch 'prototech/ticket/12356' into develop-ascraeus
* prototech/ticket/12356:
  [ticket/12356] Assign vars preventing Plupload from loading in PM editor.
2014-04-10 11:59:32 +02:00
Matt Friedman
80bc30214f [ticket/11098] Fix error reporting on the autologin key pages
PHPBB3-11098
2014-04-09 23:17:30 -07:00
Matt Friedman
150a45b943 [ticket/11098] Update subsilver2 to also include mark/unmark all buttons
PHPBB3-11098
2014-04-09 19:16:45 -07:00
Cesar G
072094cb8d [ticket/12379] Remove duplicate labels in attachment uploader when responsive.
PHPBB3-12379
2014-04-09 18:10:38 -07:00
Matt Friedman
9eeb9ed259 [ticket/11098] HTML Validity fix to Notifications in UCP
PHPBB3-11098
2014-04-09 17:36:46 -07:00
Matt Friedman
51b152c8ab [ticket/11098] Add mark/unmark all options to remember me keys
PHPBB3-11098
2014-04-09 17:35:55 -07:00
Cesar G
55a674adcf Merge remote-tracking branch 'nickvergessen/ticket/8700' into develop-ascraeus
* nickvergessen/ticket/8700:
  [ticket/8700] Use L_COLON instead of adding ":" manually
  [ticket/8700] Remove unused language strings
2014-04-09 17:22:00 -07:00
Cesar G
b7d7f73693 Merge remote-tracking branch 'VSEphpbb/ticket/12365' into develop-ascraeus
* VSEphpbb/ticket/12365:
  [ticket/12365] Do not crop image attachments at 350px
2014-04-09 12:02:54 -07:00
Cesar G
a8ec1905e1 [ticket/12356] Assign vars preventing Plupload from loading in PM editor.
PHPBB3-12356
2014-04-09 11:38:14 -07:00
Marc Alexander
5c34b9c371 [ticket/10687] Improve error message if unable to get image dimensions
The error message that is presented if getimagesize() was unable to determine
an image's dimensions now additionally states that this might be caused by an
incorrect URL.

PHPBB3-10687
2014-04-09 14:55:49 +02:00
Cesar G
934696766a [ticket/12375] Fix broken attachment deletion.
The response is already parsed and when running it through parseJSON returned
null prior to 1.9. Now there's an actual error thrown, so the function is
returning and thus leaving the attachment row intact.

PHPBB3-12375
2014-04-08 21:51:56 -07:00
Matt Friedman
401a13b1a8 [ticket/12283] Remove obsolete online class from posting review page
PHPBB3-12283
2014-04-08 20:53:48 -07:00
Joas Schilling
88c47c251d [ticket/12373] Add to and from forum_id to LOG_MOVE log entries
PHPBB3-12373
2014-04-08 22:29:05 +02:00
Joas Schilling
0e3e715a48 Merge remote-tracking branch 'paybas/ticket/12369' into develop-ascraeus
* paybas/ticket/12369:
  [ticket/12369] White-space cleanup
  [ticket/12369] Removed template vars initial state
  [ticket/12369] Added ACP vars
  [ticket/12369] Add template var {BODY_CLASS} to HTML body
2014-04-08 20:57:06 +02:00
Joas Schilling
e11d833dcd Merge remote-tracking branch 'vsephpbb/ticket/12083' into develop-ascraeus
* vsephpbb/ticket/12083:
  [ticket/12083] Fix Select All in CODE bbcode with only one char
2014-04-08 07:47:27 +02:00
Dhruv
634e5cae0f Merge remote-tracking branch 'nickvergessen/ticket/12349' into develop-ascraeus
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/12349:
  [ticket/12349] Fix Sniffer for @license tag
  [ticket/12349] Update license header in several new files
2014-04-08 02:27:32 +05:30
PayBas
4cd6317d41 [ticket/12369] White-space cleanup
PHPBB3-12369
2014-04-07 22:46:22 +02:00
Joas Schilling
6c6916dc7d Merge remote-tracking branch 'Marc/ticket/12362' into develop-ascraeus
* Marc/ticket/12362:
  [ticket/12362] Do not use database test case as it's not needed
  [ticket/12362] Add tests for schema generator
  [ticket/12362] Throw exception in schema generator on unresolvable dependency
2014-04-07 22:42:42 +02:00
Joas Schilling
b2d73922c6 Merge remote-tracking branch 'paybas/ticket/12364' into develop-ascraeus
* paybas/ticket/12364:
  [ticket/12364] Add template identifier var to all missing pages
2014-04-07 22:24:18 +02:00
Joas Schilling
094a746715 Merge remote-tracking branch 'Elsensee/ticket/12360' into develop-ascraeus
* Elsensee/ticket/12360:
  [ticket/12360] Fix duplicated creation of session when logging out the user
2014-04-07 22:17:29 +02:00
Maël Soucaze
02f739e0e7 [ticket/12361] Replace the Google logo.
Currently, a link to Google and its logo are displayed in the
language/en/help_bbcode.php file to explain how to correctly format tags
and to add an image to a post. However, the Google logo is outdated and
Google does not allow the use of its logo on third-party websites. Plus,
that overload their servers. I used the blue phpBB logo to replace it
because the grey one with transparent background is hardly visible.

Originally, I just refreshed the old Google logo with the new one
(https://www.google.com/images/srpr/logo5w.png) but Joas proposed to use
the phpBB logo, and I agree with him.

PHPBB3-12361
2014-04-07 22:09:33 +02:00
Marc Alexander
91a1c3af90 [ticket/12372] Rename JS function dE() to phpbb.toggleDisplay()
PHPBB3-12372
2014-04-07 21:42:30 +02:00
Marc Alexander
966a2b4892 [ticket/12372] Move dE() function core.js
PHPBB3-12372
2014-04-07 21:27:48 +02:00
Marc Alexander
ad98a070c3 [ticket/12372] Unify definition of function dE() across all files
PHPBB3-12372
2014-04-07 20:43:32 +02:00
Marc Alexander
385420c8f5 [ticket/12372] Use jQuery in javascript dE() function
PHPBB3-12372
2014-04-07 20:40:21 +02:00
Joas Schilling
3315702b5f [ticket/12370] Do not delete topic notifications when the topic is visible
We should only delete the topic notifications, when the topic is not approved
anymore. This happens, when the post was the last approved but is now
unapproved because the user is on queue, or when it has been softdeleted while
editing.

PHPBB3-12370
2014-04-07 19:13:32 +02:00
rxu
4b26292df2 [ticket/12336] Add functions_module.php core event
Add functions_module.php core event to allow adjusting parameters
for custom ACP, MCP, UCP modules (location: function list_modules()).

PHPBB3-12336
2014-04-07 23:59:38 +08:00
PayBas
964a75ba7c [ticket/12369] Removed template vars initial state
PHPBB3-12369
2014-04-07 17:56:27 +02:00
Joas Schilling
bcdd3d5bec [ticket/11352] Redirect the user back to view*.php after disapproving
The user should be redirected back to:
- the topic, if he came from viewtopic and the topic still exists
- the forum, if he came from viewtopic, but the topic does not exist anymore

PHPBB3-11352
2014-04-07 14:43:51 +02:00
PayBas
4e2e8f8621 [ticket/12369] Added ACP vars
PHPBB3-12369
2014-04-07 08:39:03 +02:00
PayBas
5bb0c65c24 [ticket/12369] Add template var {BODY_CLASS} to HTML body
http://tracker.phpbb.com/browse/PHPBB3-12369

PHPBB3-12369
2014-04-07 08:16:39 +02:00
Joas Schilling
60be4c70a7 [ticket/12358] Correctly check and change the redirect url for ajax requests
PHPBB3-12358
2014-04-07 00:06:55 +02:00
Oliver Schramm
1a56400a45 [ticket/12360] Fix duplicated creation of session when logging out the user
In 7d8b578 this line was introduced to fix a bug with style.php.

Later since 1d42d1b a new session is always created after
killing the old one.

This causes a duplicated creation of the session everytime
the user logs itself out.

PHPBB3-12360
2014-04-06 23:49:20 +02:00
Joas Schilling
f0176b5393 Merge remote-tracking branch 'Marc/ticket/12150' into develop-ascraeus
* Marc/ticket/12150:
  [ticket/12150] Use correct license URL in prune shadow migrations file
  [ticket/12150] Remove 'after' for columns from migrations file
  [ticket/12150] Update schema files for prune shadow topics
  [ticket/12150] Use log service instead of add_log() function
  [ticket/12150] Use shorter column names for prune settings
  [ticket/12150] Add functional tests for pruning shadow topics
  [ticket/12150] Add missing space to query for shadow topics
  [ticket/12150] Add missing prune settings variables in acp_forums
  [ticket/12150] Add file and caller for pruning shadow topics
  [ticket/12150] Add prune columns to schema files and migration file
  [ticket/12150] Add options to acp
2014-04-06 22:26:27 +02:00
Matt Friedman
7aa044a845 [ticket/12365] Do not crop image attachments at 350px
PHPBB3-12365
2014-04-06 09:35:26 -07:00