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

20999 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
96394bb044 Merge pull request #2233 from PayBas/ticket/12346 
[ticket/12346] Add Template Event overall_header_navlink_append/prepend

* PayBas/ticket/12346:
  [ticket/12346] Change tabs to spaces
  [ticket/12346] Add Template Event overall_header_navlink_app/pre
 2014-05-04 15:52:26 +02:00
Joas Schilling
329c2d9292 Merge pull request #2219 from PayBas/ticket/12335 
[ticket/12335] Add Events to phpbb\profilefields\manager

* PayBas/ticket/12335:
  [ticket/12335] Remove $ from desc
  [ticket/12335] Added generate_profile_fields _ before
  [ticket/12335] Documentation fix and added use_contact_fields
  [ticket/12335] Fix phpBB version number
  [ticket/12335] Add Events to phpbb\profilefields\manager
 2014-05-04 15:48:05 +02:00
Joas Schilling
a1561fffba Merge pull request #2402 from MGaetan89/ticket/12378 
[ticket/12378] Prosilver common.css duplicate entry

* MGaetan89/ticket/12378:
  [ticket/12378] Prosilver common.css duplicate entry
 2014-05-04 15:44:00 +02:00
Gaëtan Muller
05491b0050 [ticket/12378] Prosilver common.css duplicate entry 
https://tracker.phpbb.com/browse/PHPBB3-12378

PHPBB3-12378
 2014-05-04 15:40:35 +02:00
Joas Schilling
59da8eb46a Merge pull request #2401 from n-aleha/ticket/12455 
[ticket/12455] Remove unused language strings from common.php and app.php

* n-aleha/ticket/12455:
  [ticket/12455] Remove unused language strings from common.php and app.php
 2014-05-04 15:38:02 +02:00
n-aleha
e6b312221c [ticket/12455] Remove unused language strings from common.php and app.php 
Removed the following unused language strings from common.php:
EXTENSION_CONTROLLER_MISSING
EXTENSION_CLASS_WRONG_TYPE

Removed the following unused language strings from app.php:
CONTROLLER_NOT_FOUND
CONTROLLER_SERVICE_NOT_GIVEN
CONTROLLER_RETURN_TYPE_INVALID

PHPBB3-12455
 2014-05-04 13:38:06 +03:00
PayBas
78834e49e4 [ticket/12346] Change tabs to spaces 
PHPBB3-12346
 2014-05-03 21:45:48 +02:00
PayBas
1a39f5f6b9 [ticket/12346] Add Template Event overall_header_navlink_app/pre 
Rebased

PHPBB3-12346
 2014-05-03 18:21:15 +02:00
PayBas
5b5b61c6c9 [ticket/12335] Remove $ from desc 
Come on travis, play nice this time

PHPBB3-12335
 2014-05-03 17:54:38 +02:00
PayBas
42dfd1aa3c [ticket/12335] Added generate_profile_fields _ before 
PHPBB3-12335
 2014-05-03 17:54:38 +02:00
PayBas
2343d9f8d4 [ticket/12335] Documentation fix and added use_contact_fields 
PHPBB3-12335
 2014-05-03 17:54:37 +02:00
PayBas
1fd1803a3b [ticket/12335] Fix phpBB version number 
PHPBB3-12335
 2014-05-03 17:54:37 +02:00
PayBas
b3b0e5ccf2 [ticket/12335] Add Events to phpbb\profilefields\manager 
PHPBB3-12335
 2014-05-03 17:54:36 +02:00
Joas Schilling
b60108dc78 Merge pull request #2267 from prototech/ticket/10737 
[ticket/10737] Add  live member search.

* prototech/ticket/10737:
  [ticket/10737] Remove loading indicator.
  [ticket/10737] Enforce allow_live_searches setting in memberlist.php.
  [ticket/10737] Add config setting to disable live searches.
  [ticket/10737] Add loading indicator and alert box code to simple_footer.html.
  [ticket/10737] Load core.js and ajax.js in simple_footer.html.
  [ticket/10737] Set the username as the input value instead of redirecting.
  [ticket/10737] Drop subsilver2 changes.
  [ticket/10737] Add a more generic live search implementation.
  [ticket/10737] Clean up memberlist.php.
  [ticket/10737] Use dropdown for search results container.
  [ticket/10737] Adding delayed keyup and removing target_blank.
  [ticket/10737] Using UTF-8 aware alternatives in PHP code.
  [ticket/10737] Removing obsolete code.
  [ticket/10737] Avoid hard-coding table row and use case-insensitive search.
  [ticket/10737] Removing unnecessary/obsolete code.
  [ticket/10737] Using JQuery events and JSON response.
  [ticket/10737] Code fixes in AJAX search feature
  [ticket/10737] Improvements over last commit
  [ticket/10737] Adding username suggestions in "Find a member" using AJAX
 2014-05-03 16:39:31 +02:00
Andreas Fischer
4e529fda03 Merge pull request #2375 from nickvergessen/ticket/12470 
Ticket/12470 Move commands from .travis.yml to separate files to allow reusing

* nickvergessen/ticket/12470:
  [ticket/12470] Correctly set up the php extensions
  [ticket/12470] Fix setup of phpbb
  [ticket/12470] Move setup of phpBB to new .sh
  [ticket/12470] Move setup of database to new .sh
  [ticket/12470] Move phing sniff into new .sh
 2014-05-03 15:53:57 +02:00
Joas Schilling
d2b783338f [ticket/12470] Correctly set up the php extensions 
PHPBB3-12470
 2014-05-03 10:43:40 +02:00
Joas Schilling
994ab684bc [ticket/12470] Fix setup of phpbb 
PHPBB3-12470
 2014-05-03 10:43:40 +02:00
Joas Schilling
a2ac425688 [ticket/12470] Move setup of phpBB to new .sh 
PHPBB3-12470
 2014-05-03 10:43:39 +02:00
Joas Schilling
5cef3254f7 [ticket/12470] Move setup of database to new .sh 
PHPBB3-12470
 2014-05-03 10:43:39 +02:00
Joas Schilling
acf9524710 [ticket/12470] Move phing sniff into new .sh 
PHPBB3-12470
 2014-05-03 10:43:38 +02:00
Joas Schilling
3b823465db Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12485] Broken tests due to absolute exclude

Conflicts:
	.travis.yml
	phpunit.xml.all
	phpunit.xml.dist
	phpunit.xml.functional
 2014-05-03 10:28:15 +02:00
Joas Schilling
436e388b87 Merge pull request #2396 from Nicofuma/ticket/12485 
[ticket/12485] Broken tests due to absolute 'exclude'

* Nicofuma/ticket/12485:
  [ticket/12485] Broken tests due to absolute exclude
 2014-05-03 10:19:52 +02:00
Nicofuma
3dee1db260 [ticket/12485] Broken tests due to absolute exclude 
PHPBB3-12485
 2014-05-03 04:05:25 +02:00
Cesar G
386aac3a85 Merge remote-tracking branch 'VSEphpbb/ticket/10521' into develop-ascraeus 
* VSEphpbb/ticket/10521:
  [ticket/10521] Fix broken tests using set_cookie
 2014-05-02 17:55:57 -07:00
Matt Friedman
b07ea805d4 [ticket/10521] Fix broken tests using set_cookie 
PHPBB3-10521
 2014-05-02 17:33:40 -07:00
Nils Adermann
57927ef8ea Merge remote-tracking branch 'github-vse/ticket/10521' into develop-ascraeus 
* github-vse/ticket/10521:
  [ticket/10521] Update docblock of set_cookie for new HttpOnly param
 2014-05-03 00:59:55 +02:00
Matt Friedman
6d71f7d7ba [ticket/10521] Update docblock of set_cookie for new HttpOnly param 
PHPBB3-10521
 2014-05-02 15:57:39 -07:00
Nils Adermann
5800532264 Merge remote-tracking branch 'github-bantu/ticket/12429-ascraeus' into develop-ascraeus 
* github-bantu/ticket/12429-ascraeus:
  [ticket/12429] Can not insert into more columns than exist.
 2014-05-03 00:51:31 +02:00
Andreas Fischer
6cfee5f2c2 [ticket/12429] Can not insert into more columns than exist. 
PHPBB3-12429
 2014-05-03 00:37:31 +02:00
Nils Adermann
c7baeaa912 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax.
 2014-05-03 00:37:28 +02:00
Nils Adermann
af7ec71967 Merge remote-tracking branch 'github-bantu/ticket/11860' into develop-olympus 
* github-bantu/ticket/11860:
  [ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax.
 2014-05-03 00:37:11 +02:00
Joas Schilling
a995f1166c Merge pull request #2391 from naderman/ticket/12382 
[ticket/12382] Allow nested loops in included files.
 2014-05-03 00:21:50 +02:00
Nils Adermann
c5660ed177 [ticket/12382] Event loop nesting inclusion applies to regular includes too 
PHPBB3-12382
 2014-05-03 00:20:37 +02:00
Nils Adermann
1399d60954 Merge remote-tracking branch 'github-vse/ticket/10521' into develop-ascraeus 
* github-vse/ticket/10521:
  [ticket/10521] Allow language switching by URL parameter
 2014-05-03 00:15:28 +02:00
Nils Adermann
d18f19a3bb [ticket/12382] Allow nested loops in included files. 
They have to reference the fully qualified loop name in BEGIN and END.

PHPBB3-12382
 2014-05-03 00:13:06 +02:00
Andreas Fischer
936518d201 Merge pull request #2389 from prototech/ticket/12482 
[ticket/12482] Fixed undefined variable: data.

* prototech/ticket/12482:
  [ticket/12482] Fixed undefined variable: data.
 2014-05-02 23:32:14 +02:00
Matt Friedman
257ff46659 [ticket/10521] Allow language switching by URL parameter 
PHPBB3-10521
 2014-05-02 14:22:59 -07:00
Cesar G
68f4e84e62 [ticket/12482] Fixed undefined variable: data. 
PHPBB3-12482
 2014-05-02 14:22:16 -07:00
Joas Schilling
0d133e483b Merge pull request #2385 from prototech/ticket/12478 
Add contact field before/after events.
 2014-05-02 23:12:10 +02:00
Andreas Fischer
56f881953d Merge pull request #2388 from nickvergessen/ticket/12480 
[ticket/12480] Only load config/routing.yml from extensions route

* nickvergessen/ticket/12480:
  [ticket/12480] Remove unused use statements
  [ticket/12480] Add subfolder/config/routing.yml which should not be found
  [ticket/12480] Only load config/routing.yml from extensions route
 2014-05-02 23:04:33 +02:00
Joas Schilling
ed089f4b5f [ticket/12480] Remove unused use statements 
PHPBB3-12480
 2014-05-02 22:52:20 +02:00
Joas Schilling
a470b6c519 [ticket/12480] Add subfolder/config/routing.yml which should not be found 
PHPBB3-12480
 2014-05-02 22:48:28 +02:00
Joas Schilling
10b23612e3 [ticket/12480] Only load config/routing.yml from extensions route 
PHPBB3-12480
 2014-05-02 22:35:36 +02:00
Andreas Fischer
dbb7552614 Merge pull request #2384 from prototech/ticket/12477 
[ticket/12477] Fix logic to prevent admin-deactivated users from getting PM's.

* prototech/ticket/12477:
  [ticket/12477] Tab instead of spaces.
  [ticket/12477] Fix logic to prevent admin-deactivated users from getting PM's.
 2014-05-02 22:16:06 +02:00
Cesar G
0684d9c689 [ticket/12477] Tab instead of spaces. 
PHPBB3-12477
 2014-05-02 13:05:31 -07:00
Cesar G
a4a7fcb93d [ticket/12477] Fix logic to prevent admin-deactivated users from getting PM's. 
PHPBB3-12477
 2014-05-02 13:05:25 -07:00
Cesar G
9431a018cb [ticket/12478] Add contact field events to viewtopic_body.html. 
PHPBB3-12478
 2014-05-02 12:50:59 -07:00
Cesar G
f34af2669d [ticket/12478] Re-add contact field events in ucp_pm_viewmessage.html. 
PHPBB3-12478
 2014-05-02 12:50:16 -07:00
Nils Adermann
603c3b4629 Merge remote-tracking branch 'github-bantu/ticket/12429-ascraeus' into develop-ascraeus 
* github-bantu/ticket/12429-ascraeus:
  [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3.
 2014-05-02 21:43:33 +02:00
Nils Adermann
7b94368d52 Merge remote-tracking branch 'github-bantu/ticket/12429' into develop-olympus 
* github-bantu/ticket/12429:
  [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3.
 2014-05-02 21:42:54 +02:00