mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 03:54:10 +01:00
Code Issues Releases Wiki Activity
21,049 Commits 17 Branches 190 Tags
Commit Graph

21049 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cesar G
b0dd532c14 [ticket/11508] Remove unnecessary isset check. 
PHPBB3-11508
 2014-04-22 15:21:02 -07:00
Cesar G
141d386025 [ticket/11508] Fix build_url test. 
PHPBB3-11508
 2014-04-22 15:21:02 -07:00
Cesar G
5e7bcd2fa6 [ticket/11508] Curly brace should be on its own line... 
PHPBB3-11508
 2014-04-22 15:21:02 -07:00
Cesar G
5e0ab146d9 [ticket/11508] The question mark is expected even if there are no parameters. 
PHPBB3-11508
 2014-04-22 15:21:02 -07:00
Cesar G
47f8a6375f [ticket/11508] Add tests. 
PHPBB3-11508
 2014-04-22 15:21:02 -07:00
Cesar G
f05e0ec9eb [ticket/11508] Do not add the '?' unless there are parameters. 
PHPBB3-11508
 2014-04-22 15:21:02 -07:00
Cesar G
8987fc95f9 [ticket/11508] Change separator parameter to a simple true|false $is_amp. 
PHPBB3-11508
 2014-04-22 15:21:02 -07:00
Cesar G
3163388f63 [ticket/11508] Move helper functions to path_helper class. 
PHPBB3-11508
 2014-04-22 15:21:02 -07:00
Cesar G
e1c6b40ee8 [ticket/11508] Move the stripping param code to separate function as well. 
PHPBB3-11508
 2014-04-22 15:21:02 -07:00
Cesar G
ef4202d859 [ticket/11508] Build the jumpbox hidden fields using the _form action_ 
PHPBB3-11508
 2014-04-22 15:21:01 -07:00
Cesar G
c96ade8463 [ticket/11508] Split parts of build_url() into reusable functions. 
PHPBB3-11508
 2014-04-22 15:21:01 -07:00
Crizzo
600ab46a93 [ticket/12404] Changes append/prepend to after/before 
PHPBB3-12404
 2014-04-22 22:06:31 +02:00
Crizzo
94c21684ff [ticket/12404] Adds two new events and changes some places 
PHPBB3-12404
 2014-04-22 21:28:10 +02:00
Joas Schilling
5b6a675399 Merge pull request #2036 from prototech/ticket/12201 
[ticket/12201] Clean up ACP attachment management page

* prototech/ticket/12201:
  [ticket/12201] Decreased pagination font size.
  [ticket/12201] Update select element to follow same design as prosilver.
  [ticket/12201] Increase sort font size just slightly.
  [ticket/12201] Add link to resync file stats after error.
  [ticket/12201] Fix typos in language pack.
  [ticket/12201] Display error and sorting options when there are no attachments
  [ticket/12201] Only the top pagination should be floated to the right.
  [ticket/12201] Rearrange pagination, sorting, and submit elements.
  [ticket/12201] Center the file size and mark columns.
  [ticket/12201] Separate pagination from table.
 2014-04-22 19:58:15 +02:00
Joas Schilling
121bd90873 Merge pull request #2337 from prototech/ticket/12130 
[ticket/12130] Fix issue with li:first-child in <ul> having a bullet in IE8.

* prototech/ticket/12130:
  [ticket/12130] Fix issue with li:first-child in <ul> having a bullet in IE8.
 2014-04-22 19:51:16 +02:00
Joas Schilling
36ef90528b Merge pull request #2335 from Elsensee/ticket/12422 
[ticket/12422] Fix debug warning in log search

* Elsensee/ticket/12422:
  [ticket/12422] Add tests
  [ticket/12422] Fix debug warning in log search
 2014-04-22 19:42:20 +02:00
Andreas Fischer
631182524a Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
 2014-04-22 19:25:14 +02:00
Andreas Fischer
d50d8a1512 Merge pull request #2342 from nickvergessen/ticket/12413-ascraeus 
[ticket/12413-ascraeus] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0 in olympus

* nickvergessen/ticket/12413-ascraeus:
  [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0
 2014-04-22 19:25:10 +02:00
Andreas Fischer
c0f3011b53 Merge pull request #2341 from nickvergessen/ticket/12413 
[ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0 in olympus

* nickvergessen/ticket/12413:
  [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0
 2014-04-22 19:24:43 +02:00
Joas Schilling
3425eeaf7d [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0 in olympus 
Merge branch 'ticket/12413' into ticket/12413-ascraeus

* ticket/12413:
  [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0

Conflicts:
	phpBB/feed.php

The reverting is not done for develop-ascraeus and above.
We want to fix it properly there instead.

PHPBB3-12413
 2014-04-22 19:04:32 +02:00
Joas Schilling
f9cdec90fc [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0 
"Merge remote-tracking branch 'dhruvgoel92/ticket/11271' into develop-olympus"

This reverts commit e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0, reversing
changes made to 214f515e9ccc71e368882384fb38bd7135b0e40f.

PHPBB3-12413
 2014-04-22 18:55:17 +02:00
Joas Schilling
ed07f1b85e Merge pull request #2248 from Elsensee/ticket/12193 
[ticket/12193] Fix broken HTML if SQL error occurs during migration

* Elsensee/ticket/12193:
  [ticket/12193] Fix broken HTML if SQL error occurs during migration
 2014-04-22 18:25:33 +02:00
Joas Schilling
e360f911f8 Merge pull request #2334 from bantu/ticket/12423 
Stable Composer Minimum Stability + Some Composer Dependency Updates

* bantu/ticket/12423:
  [ticket/12424] Update Symfony component from v2.3.4 to v2.3.12.
  [ticket/12423] Move PHP CodeSniffer from non-stable 1.5.0RC4 to latest 1.5.2.
  [ticket/12423] Increase Composer minimum-stability to stable.
 2014-04-22 13:42:04 +02:00
Oliver Schramm
bf3425b0f8 [ticket/12422] Add tests 
PHPBB3-12422
 2014-04-22 03:20:41 +02:00
Cesar G
227949d10b [ticket/12130] Fix issue with li:first-child in <ul> having a bullet in IE8. 
PHPBB3-12130
 2014-04-20 19:32:35 -07:00
Cesar G
52ebeb5f82 Merge remote-tracking branch 'PayBas/ticket/12347' into develop-ascraeus 
* PayBas/ticket/12347:
  [ticket/12347] Remove unknown/unnecessary hack
  [ticket/12347] IE8 compatible CSS selector
  [ticket/12347] Changed from :after to :before
  [ticket/12347] Changed to the new navbar templates
 2014-04-20 19:26:08 -07:00
Joas Schilling
c4bd2d682f Merge pull request #2332 from VSEphpbb/ticket/12405 
[ticket/12405] Valid timezone and dateformat for create_user() in tests

* VSEphpbb/ticket/12405:
  [ticket/12405] Valid timezone and dateformat for create_user() in tests
 2014-04-20 22:10:21 +02:00
PayBas
1abd031ad6 [ticket/12347] Remove unknown/unnecessary hack 
PHPBB3-12347
 2014-04-20 20:53:29 +02:00
PayBas
4e1a86d848 [ticket/12389] Moved PM tools to UCP template 
PHPBB3-12389
 2014-04-20 20:33:34 +02:00
Cesar G
889f6673b2 Merge remote-tracking branch 'PayBas/ticket/12363' into develop-ascraeus 
* PayBas/ticket/12363:
  [ticket/12363] Fix typo
  [ticket/12363] changed _winner_ to _most-votes_
  [ticket/12363] Mark winning (most votes) results bar
 2014-04-20 10:17:08 -07:00
Oliver Schramm
1905a2a7b2 [ticket/12422] Fix debug warning in log search 
PHPBB3-12422
 2014-04-20 18:36:39 +02:00
PayBas
f13689887e Merge pull request #3 from prototech/ticket/12389 
[ticket/12389] Replace email and print icons.
 2014-04-20 18:15:50 +02:00
Cesar G
f890b7098f [ticket/12389] Replace email and print icons. 
PHPBB3-12389
 2014-04-20 08:57:35 -07:00
Andreas Fischer
92d82e80cb [ticket/12424] Update Symfony component from v2.3.4 to v2.3.12. 
PHPBB3-12424
 2014-04-20 16:48:26 +02:00
Andreas Fischer
22210d3dc4 [ticket/12423] Move PHP CodeSniffer from non-stable 1.5.0RC4 to latest 1.5.2. 
PHPBB3-12423
 2014-04-20 16:46:37 +02:00
Andreas Fischer
ca5438d8fe [ticket/12423] Increase Composer minimum-stability to stable. 
PHPBB3-12423
 2014-04-20 16:45:34 +02:00
Andreas Fischer
c31ea7af66 Merge pull request #2299 from nickvergessen/ticket/12390 
[ticket/12390] Remove documentation, tests and other files from vendor/

* nickvergessen/ticket/12390:
  [ticket/12390] Add comment to composer.json to update the build target
  [ticket/12390] Move cleaning of vendor into it's own target
  [ticket/12390] Remove documentation, tests and other files from vendor/
 2014-04-20 16:16:42 +02:00
Joas Schilling
bc1ab3dc79 [ticket/12273] Fix missing space in some Exceptions 
PHPBB3-12273
 2014-04-20 15:11:23 +02:00
Joas Schilling
08cce5fba5 [ticket/12273] Remove duplicated code 
PHPBB3-12273
 2014-04-20 14:58:24 +02:00
Joas Schilling
6849e8b36f [ticket/12273] Add file line to exception message 
PHPBB3-12273
 2014-04-20 14:57:18 +02:00
PayBas
f251a8b50d [ticket/12347] IE8 compatible CSS selector 
PHPBB3-12347
 2014-04-20 14:32:19 +02:00
Joas Schilling
b83a555da5 [ticket/12273] Move phpBB test to new file and use a data provider 
PHPBB3-12273
 2014-04-20 14:28:09 +02:00
Joas Schilling
8ddc9ff185 [ticket/12273] Allow multiple $vars lines 
PHPBB3-12273
 2014-04-20 14:15:54 +02:00
Joas Schilling
4775ad59b0 [ticket/12012] Fix docs in connection manager 
PHPBB3-12012
 2014-04-20 12:58:46 +02:00
Joas Schilling
0a953ddb15 [ticket/12012] Remove duplicated code (only the $sql are different) 
PHPBB3-12012
 2014-04-20 12:54:19 +02:00
Joas Schilling
1757fdd4b7 [ticket/12390] Add comment to composer.json to update the build target 
PHPBB3-12390
 2014-04-20 12:41:19 +02:00
Matt Friedman
067ab9e800 [ticket/12405] Valid timezone and dateformat for create_user() in tests 
PHPBB3-12405
 2014-04-19 09:42:45 -07:00
Oliver Schramm
7cccd59cdc [ticket/12193] Fix broken HTML if SQL error occurs during migration 
PHPBB3-12193
 2014-04-19 16:58:38 +02:00
Cesar G
6f41e7a98b Merge remote-tracking branch 'VSEphpbb/ticket/12419' into develop-ascraeus 
* VSEphpbb/ticket/12419:
  [ticket/12419] Also shrink the size of "See All" in footer a little bit
  [ticket/12419] Improve font size in notifications drop-down
 2014-04-18 09:23:02 -07:00
Matt Friedman
34533a86da [ticket/12419] Also shrink the size of "See All" in footer a little bit 
PHPBB3-12419
 2014-04-18 09:17:36 -07:00