1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

20675 Commits

Author SHA1 Message Date
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
2721b16cc3 [ticket/12367] Change phpbb_wrapper_gmgetdate_test to use data providers
PHPBB3-12367
2014-04-06 23:36:04 +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
PayBas
b64c5f84ab [ticket/12363] changed _winner_ to _most-votes_
PHPBB3-12363
2014-04-06 22:18:52 +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
PayBas
3384e87b6f [ticket/12363] Mark winning (most votes) results bar
PHPBB3-12363
2014-04-06 16:43:25 +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
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
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
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
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
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
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
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
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
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
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
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
Joas Schilling
296e573b6b Merge remote-tracking branch 'bantu/ticket/12318' into develop-olympus
* bantu/ticket/12318:
  [ticket/12318] Revert "Pin HHVM version to 3.0.0~precise."
2014-04-03 23:07:35 +02:00
Andreas Fischer
1a044711fb [ticket/12318] Revert "Pin HHVM version to 3.0.0~precise."
This reverts commit f6614f2078740675ca0228b348500991888c2140 as the install
command started failing with "Version '3.0.0~precise' for 'hhvm' was not found"
in the meantime.

PHPBB3-12318
2014-04-03 22:33:46 +02:00
Andreas Fischer
4e3117a27f Merge pull request #2239 from k-fish/ticket/12350
[ticket/12350] Instantiate Mock Dispatcher for modules_test

* k-fish/ticket/12350:
  [ticket/12350] Instantiate Mock Dispatcher for modules_test
2014-04-03 22:20:37 +02:00