makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-21 10:48:59 +00:00
Code Issues Projects Releases Packages Wiki Activity
20468 commits 18 branches 192 tags 207 MiB
Commit graph

20468 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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 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
Andreas Fischer
22715db92e Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12350] Instantiate Mock Dispatcher for modules_test
 2014-04-03 22:20:55 +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
K Fisher
a5216e1b04 [ticket/12350] Instantiate Mock Dispatcher for modules_test 
PHPBB3-12350
 2014-04-03 16:17:10 -04:00
Matt Friedman
0c25c60381 [ticket/12342] Remove spinner and fix useage of ajax on memberlist 
PHPBB3-12342
 2014-04-03 08:32:46 -07:00
Joas Schilling
50bd761f3b Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12337] Fix jQuery update migration file
  [ticket/12337] Update jQuery to version 1.11.0
 2014-04-03 16:09:09 +02:00
Marc Alexander
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
Joas Schilling
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
Joas Schilling
4ba56deec1 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12341] Update test with new class name and dependencies
  [ticket/12341] Add tests for get_username_string()
 2014-04-03 15:21:54 +02:00
Joas Schilling
0dbbf7fbbe Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
 2014-04-03 15:21:11 +02:00
Joas Schilling
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
Joas Schilling
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
Joas Schilling
8fa6094ea2 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [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:46 +02:00
Joas Schilling
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
Oliver Schramm
2b6145da0a [ticket/12341] Update test with new class name and dependencies 
PHPBB3-12341
 2014-04-02 21:01:09 +02:00