1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-18 08:01:10 +02:00
Commit Graph

20430 Commits

Author SHA1 Message Date
708db0f05c [ticket/12370] Fix functional notification test and remove unneeded requests
PHPBB3-12370
2014-04-07 19:42:18 +02:00
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
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
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
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
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
399f2f5a1f [ticket/12359] Remove inline width styling on UCP birthday fields
PHPBB3-12359
2014-04-05 21:13:38 -07:00
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
e83c6cb61d [ticket/12150] Use correct license URL in prune shadow migrations file
PHPBB3-12150
2014-04-05 11:14:41 +02:00
d0aa7c6455 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
2014-04-05 10:06:19 +02:00
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
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
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
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
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
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
8f525e1ef5 [ticket/7707] Fix undefined variable: perm_from
PHPBB3-7707
2014-04-04 23:48:14 +02:00
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
fdfaba4607 [ticket/10851] Request index instead of logging in and out in tests
PHPBB3-10851
2014-04-04 20:56:39 +02:00
20c18d08e9 [ticket/12327] Ajax fix
PHPBB3-12327
2014-04-04 18:53:00 +02:00
e850e49a1b [ticket/12327] Coding style fixes
PHPBB3-12327
2014-04-04 18:53:00 +02:00
bf37342c86 [ticket/12327] Changing poll result-bars width from absolute to relative
PHPBB3-12327
2014-04-04 18:52:59 +02:00
084e6725f7 [ticket/12339] removed return var
need to learn more about events... evidently

PHPBB3-12339
2014-04-04 18:26:20 +02:00
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
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
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
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
744b39e6c4 [ticket/12353] Fix displayed attachments in ACP
PHPBB3-12353
2014-04-04 17:07:54 +02:00
c6c5f7c874 [ticket/12339] more complete params and updated _since version
PHPBB3-12339
2014-04-04 13:45:57 +02:00
069e515747 [ticket/12338] Add Template Event overall_footer_page_body_after
implement

PHPBB3-12338
2014-04-04 13:12:33 +02:00
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
e4e3df0b37 Merge branch 'ticket/10851' into ticket/10851-ascraeus 2014-04-04 11:48:17 +02:00
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
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
1a044711fb [ticket/12318] Revert "Pin HHVM version to 3.0.0~precise."
This reverts commit f6614f2078 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
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
a5216e1b04 [ticket/12350] Instantiate Mock Dispatcher for modules_test
PHPBB3-12350
2014-04-03 16:17:10 -04:00
0c25c60381 [ticket/12342] Remove spinner and fix useage of ajax on memberlist
PHPBB3-12342
2014-04-03 08:32:46 -07:00
519adb5060 [ticket/10851] Set disallowed content to empty array if checking is disabled
The disallowed content defaults to a standard set of mimetype triggers by
default. If one doesn't want to check the attachments mimetype triggers then
we need to set the disallowed content to an empty array.

PHPBB3-10851
2014-04-03 16:06:46 +02:00
d88929210a Merge remote-tracking branch 'vsephpbb/ticket/12337' into develop-ascraeus
* vsephpbb/ticket/12337:
  [ticket/12337] Fix jQuery update migration file
  [ticket/12337] Update jQuery to version 1.11.0
2014-04-03 16:02:57 +02:00
0dbbf7fbbe Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
2014-04-03 15:21:11 +02:00
8a277e6e59 Merge remote-tracking branch 'Elsensee/ticket/12341-ascraeus' into develop-ascraeus
* Elsensee/ticket/12341-ascraeus:
  [ticket/12341] Update test with new class name and dependencies
  [ticket/12341] Add tests for get_username_string()
2014-04-03 15:21:02 +02:00
801a1f9ab9 Merge remote-tracking branch 'Elsensee/ticket/12341' into develop-olympus
* Elsensee/ticket/12341:
  [ticket/12341] Add tests for get_username_string()
2014-04-03 15:20:30 +02:00
b567c0a9e2 Merge remote-tracking branch 'vsephpbb/ticket/12043' into develop-ascraeus
* vsephpbb/ticket/12043:
  [ticket/12043] Fix order of disabled extensions in unit tests
  [ticket/12043] Correct try/catch exceptions for invalid extensions
  [ticket/12043] Sort Extensions by Display Name in ACP Extension mananger
2014-04-03 15:06:28 +02:00
808c5277a9 [ticket/12150] Remove 'after' for columns from migrations file
PHPBB3-12150
2014-04-03 11:07:58 +02:00
2b6145da0a [ticket/12341] Update test with new class name and dependencies
PHPBB3-12341
2014-04-02 21:01:09 +02:00
b64fcf4e53 Merge branch 'ticket/12341' into ticket/12341-ascraeus 2014-04-02 20:15:17 +02:00
6de0350836 [ticket/12342] Fix the Custom Dates function in UCP Prefs Global
Function was being called before dE() function exists,
causing it to fail. Should be called when the page/window
is ready.

PHPBB3-12342
2014-04-01 18:02:27 -07:00
18645aa069 [ticket/12342] Fix Find a member show / hide script
PHPBB3-12342
2014-04-01 18:00:17 -07:00
0f3e6ca676 [ticket/12342] Use prop() instead of attr() for boolean properties
PHPBB3-12342
2014-04-01 17:58:56 -07:00