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
20741 commits 18 branches 192 tags 207 MiB
Commit graph

20741 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
33e03324d1 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12422] Add tests
  [ticket/12422] Fix debug warning in log search
 2014-04-22 19:48:50 +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
77922dcd1e Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12413] Revert e65a6dd8f4
 2014-04-22 19:25:24 +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
cde0ebccd0 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12193] Fix broken HTML if SQL error occurs during migration
 2014-04-22 18:27:58 +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
7079fefa61 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [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:45 +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
a5a2e05c2b Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [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:27:18 -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
c3164be288 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12405] Valid timezone and dateformat for create_user() in tests
 2014-04-20 22:10:44 +02: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
Cesar G
6c297680b9 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12363] Fix typo
  [ticket/12363] changed _winner_ to _most-votes_
  [ticket/12363] Mark winning (most votes) results bar
 2014-04-20 10:33:05 -07: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
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
95308aa20a Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [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:20:59 +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
PayBas
f251a8b50d [ticket/12347] IE8 compatible CSS selector 
PHPBB3-12347
 2014-04-20 14:32: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
abf72b31e7 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [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:31 -07: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
Matt Friedman
8b61ba238f [ticket/12419] Improve font size in notifications drop-down 
PHPBB3-12419
 2014-04-18 08:48:40 -07:00
Joas Schilling
e77d7638f2 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/11978] Fix width of topic search text field
 2014-04-17 23:32:04 +02:00
Joas Schilling
3608abdf8c Merge pull request #2317 from Elsensee/ticket/11978 
[ticket/11978] Fix width of topic search text field

* Elsensee/ticket/11978:
  [ticket/11978] Fix width of topic search text field
 2014-04-17 23:31:45 +02:00
Joas Schilling
f766692ce5 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12121] Preserve link redirect counts when updating from 3.0.x.
 2014-04-16 23:33:11 +02:00
Joas Schilling
0da5e3bee9 Merge pull request #2318 from prototech/ticket/12121 
[ticket/12121] Preserve link redirect counts when updating from 3.0.x.

* prototech/ticket/12121:
  [ticket/12121] Preserve link redirect counts when updating from 3.0.x.
 2014-04-16 23:33:03 +02:00
Joas Schilling
beab7dd685 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12345] Improve search flood interval message for ascraeus
 2014-04-16 23:26:47 +02:00
Joas Schilling
659c2e14b8 Merge pull request #2243 from n-aleha/ticket/12345 
[ticket/12345] Improve search flood interval message for ascraeus

* n-aleha/ticket/12345:
  [ticket/12345] Improve search flood interval message for ascraeus
 2014-04-16 23:26:09 +02:00
Joas Schilling
67debc790d Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12417] Revert "No longer allow Travis CI HHVM environment to fail."
 2014-04-16 22:48:04 +02:00
Joas Schilling
7f3aebd495 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12417] Revert "No longer allow Travis CI HHVM environment to fail."
 2014-04-16 22:47:27 +02:00
Joas Schilling
d735129d6e Merge pull request #2324 from bantu/ticket/12417 
[ticket/12417] Revert "No longer allow Travis CI HHVM environment to fai...

* bantu/ticket/12417:
  [ticket/12417] Revert "No longer allow Travis CI HHVM environment to fail."
 2014-04-16 22:46:41 +02:00
Andreas Fischer
04893e3f98 [ticket/12417] Revert "No longer allow Travis CI HHVM environment to fail." 
hhvm-nightly 2014.04.16~precise introduced "Attempted to serialize
unserializable builtin class DOMElement" errors when running functional tests.

This reverts commit ff7cc77f9d.

PHPBB3-12417
 2014-04-16 22:16:52 +02:00
Joas Schilling
013cc2c66f [ticket/12390] Move cleaning of vendor into it's own target 
PHPBB3-12390
 2014-04-16 20:16:03 +02:00
Cesar G
3d1a07f8f0 [ticket/12121] Preserve link redirect counts when updating from 3.0.x. 
PHPBB3-12121
 2014-04-15 21:15:54 -07:00
n-aleha
1f44b4da18 [ticket/12345] Improve search flood interval message for ascraeus 
Show to guests and users the remaining seconds until their next allowed
search, if a search flood limit is enabled for them.

PHPBB3-12345
 2014-04-16 02:14:36 +03:00
Joas Schilling
73c3192d61 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12391] Assign variables to core.posting_modify_template_vars
 2014-04-16 00:58:52 +02:00
Joas Schilling
b305364b27 Merge pull request #2305 from n-aleha/ticket/12391 
[ticket/12391] Assign variables to core.posting_modify_template_vars

* n-aleha/ticket/12391:
  [ticket/12391] Assign variables to core.posting_modify_template_vars
 2014-04-16 00:57:07 +02:00
Joas Schilling
f63b2a2569 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12191] Move notification options to bottom while installing
 2014-04-16 00:52:53 +02:00