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

20812 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
ed40846590 [ticket/12371] Do not group "quote" notifications 
Grouping these notification makes no sense, as the user will not find the
posts he is quoted in, when they are spread over multiple pages

PHPBB3-12371
 2014-04-25 11:52:18 +02:00
Joas Schilling
87899b0e14 [ticket/12273] Update existing events 
PHPBB3-12273
 2014-04-25 11:46:44 +02:00
Joas Schilling
01e2d7c26c [ticket/12273] Fix unit tests for multi line arrays 
PHPBB3-12273
 2014-04-25 11:46:24 +02:00
Joas Schilling
142fe1a0e5 [ticket/12273] Use multiline arrays instead of array_merge() 
PHPBB3-12273
 2014-04-25 11:45:54 +02:00
Joas Schilling
d5ea4906ca [ticket/12012] Move property to the top 
PHPBB3-12012
 2014-04-24 22:57:35 +02:00
PayBas
65c8280fb6 [ticket/12389] Change "PM" to "Message" 
PHPBB3-12389
 2014-04-24 22:09:15 +02:00
Joas Schilling
c2dace762e [ticket/12273] Fix long $vars lines for existing events 
PHPBB3-12273
 2014-04-24 17:26:27 +02:00
Joas Schilling
8599554443 [ticket/12273] Fix unit test for multi line $vars 
PHPBB3-12273
 2014-04-24 17:14:45 +02:00
Joas Schilling
b0a9acd8ff [ticket/12273] Use array_merge instead of += 
PHPBB3-12273
 2014-04-24 17:14:12 +02:00
Joas Schilling
d2ab305909 [ticket/12273] Add missing event documentation 
PHPBB3-12273
 2014-04-24 16:51:43 +02:00
Joas Schilling
320a2f7578 [ticket/12273] Fix number of = in events.md 
PHPBB3-12273
 2014-04-24 16:51:42 +02:00
Joas Schilling
8e4b4bc72e [ticket/12273] Fix subsilver2 missing from simple_footer_after docs 
PHPBB3-12273
 2014-04-24 16:51:42 +02:00
Joas Schilling
a2c3b2534a [ticket/12273] Fix method name of test and fix undefined index 
PHPBB3-12273
 2014-04-24 16:51:41 +02:00
Joas Schilling
5889255529 [ticket/12273] Test source files and compare with events.md 
PHPBB3-12273
 2014-04-24 16:51:40 +02:00
Joas Schilling
7dc32a45e5 [ticket/12273] Verify the result of the .md file to the source 
PHPBB3-12273
 2014-04-24 16:51:40 +02:00
Joas Schilling
f676f50c22 [ticket/12273] Only check selected files 
PHPBB3-12273
 2014-04-24 16:51:39 +02:00
Joas Schilling
23dbddc59d [ticket/12273] Fix some locations of existing events 
PHPBB3-12273
 2014-04-24 16:51:38 +02:00
Joas Schilling
c7dcc6d700 [ticket/12273] Verify that the events are still in the named files 
PHPBB3-12273
 2014-04-24 16:51:37 +02:00
Joas Schilling
bbc2e6c7b2 [ticket/12012] Move MS SQL server comparison into a method 
PHPBB3-12012
 2014-04-24 14:53:33 +02:00
Joas Schilling
f86bf3c4d3 Merge pull request #2348 from bantu/ticket/12436 
[ticket/12436] Data passed to sql_multi_insert is expected to be multi-d...

* bantu/ticket/12436:
  [ticket/12436] Data passed to sql_multi_insert is expected to be multi-dim.
 2014-04-24 14:31:07 +02:00
Andreas Fischer
69865852a0 [ticket/12436] Data passed to sql_multi_insert is expected to be multi-dim. 
PHPBB3-12436
 2014-04-24 13:16:50 +02:00
PayBas
d76d061cfa [ticket/12437] Clean up redundant "clear" elements & "corners" 
PHPBB3-12437
 2014-04-24 12:20:23 +02:00
Nils Adermann
6e85b2acc7 Merge remote-tracking branch 'github-nickvergessen/ticket/11917' into develop-ascraeus 
* github-nickvergessen/ticket/11917:
  [ticket/11917] Move OAuth Module to the bottom while installing
  [ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backend

Conflicts:
	phpBB/install/install_install.php
 2014-04-24 11:33:00 +02:00
n-aleha
5a91399dac [ticket/12186] Move PM reports below post reports while installing 
In mcp, move PM reports below post reports while installing.

PHPBB3-12186
 2014-04-23 22:43:20 +03:00
Oliver Schramm
45e39d0990 [ticket/8558] Fix operator 
PHPBB3-8558
 2014-04-23 17:45:09 +02: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 e65a6dd8f4 in olympus

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

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

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

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 e65a6dd8f4 
"Merge remote-tracking branch 'dhruvgoel92/ticket/11271' into develop-olympus"

This reverts commit e65a6dd8f4, reversing
changes made to 214f515e9c.

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