Commit graph

20529 commits

Author SHA1 Message Date
Joas Schilling
a478adf231 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12379] Remove duplicate labels in attachment uploader when responsive.
2014-04-10 11:57:05 +02:00
Joas Schilling
b785fff3ed Merge remote-tracking branch 'prototech/ticket/12379' into develop-ascraeus
* prototech/ticket/12379:
  [ticket/12379] Remove duplicate labels in attachment uploader when responsive.
2014-04-10 11:56:15 +02:00
Cesar G
072094cb8d [ticket/12379] Remove duplicate labels in attachment uploader when responsive.
PHPBB3-12379
2014-04-09 18:10:38 -07:00
Cesar G
9aaa9e994d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/8700] Use L_COLON instead of adding ":" manually
  [ticket/8700] Remove unused language strings
2014-04-09 17:22:31 -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
aef7143b27 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12365] Do not crop image attachments at 350px
2014-04-09 12:03:28 -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
Joas Schilling
1c434fd713 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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:41 +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
ef5eb72e8a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12083] Fix Select All in CODE bbcode with only one char
2014-04-08 07:48:08 +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
cd51c5cc3a Merge branch 'develop-ascraeus' into develop
# By Joas Schilling
# Via Dhruv (1) and Joas Schilling (1)
* develop-ascraeus:
  [ticket/12349] Fix Sniffer for @license tag
  [ticket/12349] Update license header in several new files
2014-04-08 02:29:43 +05:30
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
b2834a5563 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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:54 +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
2269955034 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12364] Add template identifier var to all missing pages
2014-04-07 22:24:30 +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
d72922f1a9 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12360] Fix duplicated creation of session when logging out the user
2014-04-07 22:17:39 +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
Joas Schilling
aba1268dea Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12361] Replace the Google logo.
2014-04-07 22:11:11 +02:00
Joas Schilling
be68ce657e Merge branch 'ticket/mael/12361' into develop-ascraeus
* ticket/mael/12361:
  [ticket/12361] Replace the Google logo.
2014-04-07 22:10:03 +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
Nils Adermann
7ef70b4331 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12358] Correctly check and change the redirect url for ajax requests
2014-04-07 14:20:48 -04:00
Nils Adermann
2efa0c2f8e Merge remote-tracking branch 'github-nickvergessen/ticket/12358' into develop-ascraeus
* github-nickvergessen/ticket/12358:
  [ticket/12358] Correctly check and change the redirect url for ajax requests
2014-04-07 14:20:39 -04:00
PayBas
964a75ba7c [ticket/12369] Removed template vars initial state
PHPBB3-12369
2014-04-07 17:56:27 +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
563deadb15 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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:28:12 +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
Joas Schilling
e3d46786b2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12354] Assert same instead of equal where necessary in passwords tests
2014-04-06 22:18:55 +02:00
Joas Schilling
6f122d6886 Merge remote-tracking branch 'Marc/ticket/12354' into develop-ascraeus
* Marc/ticket/12354:
  [ticket/12354] Assert same instead of equal where necessary in passwords tests
2014-04-06 22:18:34 +02:00
Marc Alexander
44a9bfc071 [ticket/12362] Do not use database test case as it's not needed
PHPBB3-12362
2014-04-06 22:04:00 +02:00
Marc Alexander
f123512280 [ticket/12362] Add tests for schema generator
PHPBB3-12362
2014-04-06 20:33:12 +02:00
Matt Friedman
7aa044a845 [ticket/12365] Do not crop image attachments at 350px
PHPBB3-12365
2014-04-06 09:35:26 -07:00
PayBas
66dad8d2fb [ticket/12364] Add template identifier var to all missing pages
PHPBB3-12364
2014-04-06 17:41:09 +02:00
Marc Alexander
904de5b39a [ticket/12362] Throw exception in schema generator on unresolvable dependency
Make sure we throw an exception in the schema generator if we come across an
unresolvable dependency. Otherwise we'll get stuck in a infinite loop that
needs to be cancelled by the user or the maximum execution time.

PHPBB3-12362
2014-04-06 14:50:22 +02:00
Andreas Fischer
6d0b2943c6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12359] Remove inline width styling on UCP birthday fields
2014-04-06 11:08:29 +02:00
Andreas Fischer
0e88f0db4a Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12359] Remove inline width styling on UCP birthday fields

Conflicts:
	phpBB/styles/prosilver/template/ucp_profile_profile_info.html
2014-04-06 11:08:18 +02:00
Andreas Fischer
8920ca5d43 Merge remote-tracking branch 'VSEphpbb/ticket/12359' into develop-olympus
* VSEphpbb/ticket/12359:
  [ticket/12359] Remove inline width styling on UCP birthday fields
2014-04-06 11:04:38 +02:00
Matt Friedman
399f2f5a1f [ticket/12359] Remove inline width styling on UCP birthday fields
PHPBB3-12359
2014-04-05 21:13:38 -07:00
Matt Friedman
7e6d6a6be6 [ticket/12083] Fix Select All in CODE bbcode with only one char
PHPBB3-12083
2014-04-05 15:05:02 -07:00
Marc Alexander
06aa3d948a [ticket/12354] Assert same instead of equal where necessary in passwords tests
In some tests we try to make sure that we do not get the same output in a
limited timeframe. These tests should use assertSame/NotSame instead of
assertEqual/NotEqual.

PHPBB3-12354
2014-04-05 11:51:38 +02:00
Marc Alexander
e83c6cb61d [ticket/12150] Use correct license URL in prune shadow migrations file
PHPBB3-12150
2014-04-05 11:14:41 +02:00
Joas Schilling
0e56ca42a8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/10851] Request index instead of logging in and out in tests
  [ticket/10851] Add unit and functional tests for checking attachments
  [ticket/10851] Set disallowed content to empty array if checking is disabled
2014-04-05 10:06:29 +02:00
Joas Schilling
d0aa7c6455 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
2014-04-05 10:06:19 +02:00
Joas Schilling
1b16b8cd42 Merge remote-tracking branch 'Marc/ticket/10851-ascraeus' into develop-ascraeus
* Marc/ticket/10851-ascraeus:
  [ticket/10851] Request index instead of logging in and out in tests
  [ticket/10851] Add unit and functional tests for checking attachments
  [ticket/10851] Set disallowed content to empty array if checking is disabled
2014-04-05 10:00:40 +02:00
Joas Schilling
352b523889 Merge remote-tracking branch 'Marc/ticket/10851' into develop-olympus
* Marc/ticket/10851:
  [ticket/10851] Set disallowed content to empty array if checking is disabled
2014-04-05 10:00:17 +02:00