Commit graph

20495 commits

Author SHA1 Message Date
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
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
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
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
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
Joas Schilling
5609d3733a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/7707] Fix undefined variable: perm_from
  [ticket/7707] Add comma to last entry of arrays
  [ticket/7707] Remove unnecessary variables
  [ticket/7707] Add get_username_string() once more
  [ticket/7707] Remove unnecessary variables
  [ticket/7707] Add get_username_string() where possible
2014-04-05 09:54:42 +02:00
Joas Schilling
ced48a51a4 Merge remote-tracking branch 'Elsensee/ticket/7707' into develop-ascraeus
* Elsensee/ticket/7707:
  [ticket/7707] Fix undefined variable: perm_from
  [ticket/7707] Add comma to last entry of arrays
  [ticket/7707] Remove unnecessary variables
  [ticket/7707] Add get_username_string() once more
  [ticket/7707] Remove unnecessary variables
  [ticket/7707] Add get_username_string() where possible
2014-04-05 09:54:14 +02:00
Joas Schilling
887f718022 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12338] Add Template Event overall_footer_page_body_after
2014-04-04 23:57:19 +02:00
Joas Schilling
bd36ca1016 Merge remote-tracking branch 'paybas/ticket/12338' into develop-ascraeus
* paybas/ticket/12338:
  [ticket/12338] Add Template Event overall_footer_page_body_after

Conflicts:
	phpBB/docs/events.md
2014-04-04 23:57:06 +02:00
Joas Schilling
0749d46050 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12333] Change event name
  [ticket/12333] Add Template Event overall_header_body_after
2014-04-04 23:56:00 +02:00
Joas Schilling
b5db7d49a8 Merge remote-tracking branch 'paybas/ticket/12333' into develop-ascraeus
* paybas/ticket/12333:
  [ticket/12333] Change event name
  [ticket/12333] Add Template Event overall_header_body_after
2014-04-04 23:55:36 +02:00
Joas Schilling
8fe41f3127 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12327] Ajax fix
  [ticket/12327] Coding style fixes
  [ticket/12327] Changing poll result-bars width from absolute to relative
2014-04-04 23:52:14 +02:00
Joas Schilling
1a82ce9f48 Merge remote-tracking branch 'paybas/ticket/12327' into develop-ascraeus
* paybas/ticket/12327:
  [ticket/12327] Ajax fix
  [ticket/12327] Coding style fixes
  [ticket/12327] Changing poll result-bars width from absolute to relative
2014-04-04 23:52:04 +02:00
Oliver Schramm
8f525e1ef5 [ticket/7707] Fix undefined variable: perm_from
PHPBB3-7707
2014-04-04 23:48:14 +02:00
Joas Schilling
95a30b41ba Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12339] removed return var
  [ticket/12339] more complete params and updated _since version
  [ticket/12339] Add Event core.page_header_after
2014-04-04 23:22:01 +02:00
Joas Schilling
1a3a296558 Merge remote-tracking branch 'paybas/ticket/12339' into develop-ascraeus
* paybas/ticket/12339:
  [ticket/12339] removed return var
  [ticket/12339] more complete params and updated _since version
  [ticket/12339] Add Event core.page_header_after
2014-04-04 23:21:18 +02:00
Marc Alexander
fdfaba4607 [ticket/10851] Request index instead of logging in and out in tests
PHPBB3-10851
2014-04-04 20:56:39 +02:00
PayBas
20c18d08e9 [ticket/12327] Ajax fix
PHPBB3-12327
2014-04-04 18:53:00 +02:00
PayBas
e850e49a1b [ticket/12327] Coding style fixes
PHPBB3-12327
2014-04-04 18:53:00 +02:00
PayBas
bf37342c86 [ticket/12327] Changing poll result-bars width from absolute to relative
PHPBB3-12327
2014-04-04 18:52:59 +02:00
PayBas
084e6725f7 [ticket/12339] removed return var
need to learn more about events... evidently

PHPBB3-12339
2014-04-04 18:26:20 +02:00
Joas Schilling
f7fa42ea3d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11962] Resize posted images to fit and give them a class
2014-04-04 18:26:15 +02:00
Joas Schilling
82fa935d5d Merge remote-tracking branch 'vsephpbb/ticket/11962' into develop-ascraeus
* vsephpbb/ticket/11962:
  [ticket/11962] Resize posted images to fit and give them a class
2014-04-04 18:25:01 +02:00
Joas Schilling
bc8b384a20 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12342] Remove spinner and fix useage of ajax on memberlist
  [ticket/12342] Fix the Custom Dates function in UCP Prefs Global
  [ticket/12342] Fix Find a member show / hide script
  [ticket/12342] Use prop() instead of attr() for boolean properties
2014-04-04 18:02:18 +02:00
Joas Schilling
e00a4b411d Merge remote-tracking branch 'vsephpbb/ticket/12342' into develop-ascraeus
* vsephpbb/ticket/12342:
  [ticket/12342] Remove spinner and fix useage of ajax on memberlist
  [ticket/12342] Fix the Custom Dates function in UCP Prefs Global
  [ticket/12342] Fix Find a member show / hide script
  [ticket/12342] Use prop() instead of attr() for boolean properties
2014-04-04 18:00:44 +02:00
Joas Schilling
c42b431b0d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12353] Fix displayed attachments in ACP
2014-04-04 17:41:07 +02:00
Joas Schilling
9bfada03f3 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12353] Fix displayed attachments in ACP
2014-04-04 17:40:18 +02:00
Joas Schilling
67e049b7ff Merge remote-tracking branch 'Elsensee/ticket/12353' into develop-olympus
* Elsensee/ticket/12353:
  [ticket/12353] Fix displayed attachments in ACP
2014-04-04 17:39:51 +02:00
Oliver Schramm
744b39e6c4 [ticket/12353] Fix displayed attachments in ACP
PHPBB3-12353
2014-04-04 17:07:54 +02:00
PayBas
c6c5f7c874 [ticket/12339] more complete params and updated _since version
PHPBB3-12339
2014-04-04 13:45:57 +02:00
PayBas
069e515747 [ticket/12338] Add Template Event overall_footer_page_body_after
implement

PHPBB3-12338
2014-04-04 13:12:33 +02:00
Marc Alexander
91c3ad07ec [ticket/10851] Add unit and functional tests for checking attachments
These tests will make sure that fileuploads now work as expected regarding
the check for disallowed content.

PHPBB3-10851
2014-04-04 11:48:41 +02:00
Marc Alexander
e4e3df0b37 Merge branch 'ticket/10851' into ticket/10851-ascraeus 2014-04-04 11:48:17 +02:00
Joas Schilling
38392f971b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12318] Revert "Pin HHVM version to 3.0.0~precise."
2014-04-03 23:08:20 +02:00
Joas Schilling
23455e92d0 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12318] Revert "Pin HHVM version to 3.0.0~precise."
2014-04-03 23:07:58 +02:00