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
17,952 Commits 17 Branches 190 Tags
Commit Graph

17952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Fischer
ea8f584de9 [prep-release-3.0.12] Bumping version number for 3.0.12-RC2. 2013-08-01 17:26:34 +02:00
Joas Schilling
9f60a38539 Merge remote-tracking branch 'brunoais/ticket/11653' into develop 
* brunoais/ticket/11653:
  [ticket/11653] Use $parse_flags
  [ticket/11653] generate_text_for_display on mcp/mcp_topic.php
 2013-08-01 16:50:50 +02:00
Joas Schilling
498f6ccbfc Merge remote-tracking branch 'brunoais/ticket/11655' into develop 
* brunoais/ticket/11655:
  [ticket/11653] Use $parse_flags
  [ticket/11653] Missing ";"
  [ticket/11655] Use $parse_flags
  [ticket/11655] wrong var names for the uid and for the bitfield
  [ticket/11655] generate_text_for_display on ucp_pm_viewmessage.php
 2013-08-01 11:39:17 +02:00
Bruno Ais
2f25197279 [ticket/11641] Use $parse_flags 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11641
 2013-08-01 10:16:33 +01:00
Bruno Ais
3ae33910fc [ticket/11653] Use $parse_flags 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11653
 2013-08-01 10:14:34 +01:00
Bruno Ais
a302a09ffb [ticket/11642] Use $parse_flags 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11642
 2013-08-01 10:12:58 +01:00
Bruno Ais
ea6938d3e5 [ticket/11643] Use $parse_flags 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11643
 2013-08-01 10:11:08 +01:00
Bruno Ais
c806375828 [ticket/11653] Missing ";" 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11653
 2013-08-01 10:09:11 +01:00
Bruno Ais
776773522b [ticket/11653] Use $parse_flags 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11653
 2013-08-01 10:07:58 +01:00
Bruno Ais
c2aff70cf5 [ticket/11655] Use $parse_flags 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11655
 2013-08-01 10:03:04 +01:00
Joas Schilling
ca07be9c57 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10037] Fix table in subsilver2
  [ticket/10037] Apply attached patch with a few changes
 2013-07-31 23:40:35 +02:00
Joas Schilling
4e1e5865d0 Merge remote-tracking branch 'Elsensee/ticket/10037' into develop-olympus 
* Elsensee/ticket/10037:
  [ticket/10037] Fix table in subsilver2
  [ticket/10037] Apply attached patch with a few changes
 2013-07-31 23:39:06 +02:00
Joas Schilling
07bc935efe [ticket/11751] Add mcp modules for softdelete on update 
PHPBB3-11751
 2013-07-31 23:03:32 +02:00
Nathan Guse
d536a69e29 Merge pull request #1563 from cyberalien/ticket/11688 
[ticket/11688] Purge TWIG cache
 2013-07-31 08:10:46 -07:00
Oliver Schramm
6f883b6791 [ticket/10037] Fix table in subsilver2 
Thanks, nickvergessen! ;-)

PHPBB3-10037
 2013-07-31 14:04:50 +02:00
Joas Schilling
60641d7dbe Merge pull request #1632 from Elsensee/ticket/11464 
[ticket/11464] Add missing and remove unnecessary database entry
 2013-07-31 02:54:53 -07:00
Oliver Schramm
715e408ee6 [ticket/11464] Add missing and remove unnecessary database entry 
PHPBB3-11464
 2013-07-31 10:46:14 +02:00
Joas Schilling
bbc04e8607 Merge remote-tracking branch 'Elsensee/ticket/8228' into develop 
* Elsensee/ticket/8228:
  [ticket/8228] Fix still existing problems with code in firefox
  [ticket/8228] Fix whitespaces before code in Firefox
 2013-07-31 02:20:27 +02:00
Dhruv
d96d64baba Merge remote-tracking branch 'Elsensee/ticket/11757' into develop 
# By Oliver Schramm
# Via Oliver Schramm
* Elsensee/ticket/11757:
  [ticket/11757] Fix typo in signature_module_auth migration
 2013-07-31 02:32:52 +05:30
Oliver Schramm
8892205644 [ticket/11757] Fix typo in signature_module_auth migration 
PHPBB3-11757
 2013-07-30 22:41:12 +02:00
Vjacheslav Trushkin
5eb321d311 [ticket/11688] Fix docblock 
PHPBB3-11688
 2013-07-30 21:02:40 +03:00
Oliver Schramm
95c603d545 [ticket/8228] Fix still existing problems with code in firefox 
A user of a board mentioned that there are still some problems
in firefox if php-highlighting is on. So I used a snippet which
they worked on for weeks. Link to the snippet (in german):
http://www.ongray-design.de/forum/viewtopic.php?t=541

PHPBB3-8228
 2013-07-30 18:00:47 +02:00
Joas Schilling
07ba2ed872 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into develop 
# By Bruno Ais
# Via Bruno Ais (1) and Joas Schilling (1)
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/11638] Variable names goof...
 2013-07-30 14:17:46 +02:00
Joas Schilling
21ee4c1854 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11753] Remove ?> from MySQL Upgrader.
  [ticket/11753] Update MySQL upgrader schema data.
 2013-07-30 14:15:09 +02:00
Joas Schilling
63a017ec90 Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [ticket/11753] Remove ?> from MySQL Upgrader.
  [ticket/11753] Update MySQL upgrader schema data.
 2013-07-30 14:14:32 +02:00
Joas Schilling
fc89fa2fec Merge remote-tracking branch 'bantu/ticket/11753' into prep-release-3.0.12 
* bantu/ticket/11753:
  [ticket/11753] Remove ?> from MySQL Upgrader.
  [ticket/11753] Update MySQL upgrader schema data.
 2013-07-30 14:13:31 +02:00
Joas Schilling
b4e043ba15 Merge pull request #1630 from brunoais/ticket/11638 
[ticket/11638] Variable names goof...
 2013-07-30 03:27:22 -07:00
Bruno Ais
8295d0fb36 [ticket/11638] Variable names goof... 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
 2013-07-30 11:15:46 +01:00
Vjacheslav Trushkin
212294382d [ticket/11688] Rename purge_dir to remove_dir 
PHPBB3-11688
 2013-07-30 12:32:14 +03:00
Joas Schilling
8fd52c8243 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"
 2013-07-30 11:26:21 +02:00
Joas Schilling
d20979c43c Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"
 2013-07-30 11:25:32 +02:00
Joas Schilling
ddea90c802 Merge remote-tracking branch 'bantu/ticket/11524' into prep-release-3.0.12 
* bantu/ticket/11524:
  [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"
 2013-07-30 11:23:55 +02:00
Vjacheslav Trushkin
c335edc038 [ticket/11754] Remove styleswitcher leftovers 
PHPBB3-11754
 2013-07-30 12:21:34 +03:00
Andreas Fischer
a3de463b30 [ticket/11753] Remove ?> from MySQL Upgrader. 
PHPBB3-11753
 2013-07-30 02:03:20 +02:00
Andreas Fischer
404f288113 [ticket/11753] Update MySQL upgrader schema data. 
PHPBB3-11753
 2013-07-30 02:01:24 +02:00
Andreas Fischer
8a6f3a5800 [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'" 
... on PHP 5.4 or higher.

PHPBB3-11524
 2013-07-30 01:54:11 +02:00
Joas Schilling
af0f5128c6 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11752] HTTP -> HTTPs in email/installed.txt
 2013-07-30 01:47:02 +02:00
Joas Schilling
ef1f3f17ce Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [ticket/11752] HTTP -> HTTPs in email/installed.txt
 2013-07-30 01:46:23 +02:00
Joas Schilling
6ab4c9a702 Merge remote-tracking branch 'bantu/ticket/11752' into prep-release-3.0.12 
* bantu/ticket/11752:
  [ticket/11752] HTTP -> HTTPs in email/installed.txt
 2013-07-30 01:45:39 +02:00
Joas Schilling
32499c8808 [ticket/11574] Remove install/udpate/new/ fallback from database_update.php 
Since we switched the order, everything should be in the normal root by
then.

PHPBB3-11574
 2013-07-30 01:38:06 +02:00
Joas Schilling
0ff2e93c19 [ticket/11574] Do not display incompatible package note after successful update 
PHPBB3-11574
 2013-07-30 01:23:13 +02:00
Joas Schilling
91392c7288 Merge remote-tracking branch 'phpbb/develop' into ticket/11574 
* phpbb/develop: (130 commits)
  [ticket/11638] Changed the layout to match the other similar commits
  [ticket/11640] removed the space that I wonder what it was doing there.
  [ticket/11749] Move event after all template data has been defined
  [ticket/10917] Variable used only once so delete it
  [ticket/10917] Revert use of phpbb wrapper
  [ticket/11749] Template events for topic_list_row_pre/append
  [ticket/11749] PHP Events for viewforum.php
  [ticket/11749] PHP Events for search.php
  [ticket/11740] Update FAQ to include Ideas Centre
  [ticket/11062] If user's language is english there is no further work needed
  [ticket/11062] Load new strings from user's language file if provided
  [ticket/10917] Using phpbb wrapper
  [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
  [ticket/11741] Fix empty brackets and remove bullet
  [ticket/11638] Removed the unneeded reset.
  [ticket/11638] Use the $parse_flags like the other commits
  [ticket/11638] Reverted to use the $parse tags way as the other ones
  [ticket/11638] Updated: bitwise $parse_flags use optionset()
  [ticket/11656] Made the check for the bitfield just like other PR's
  [ticket/11667] Use @inheritdoc
  ...
 2013-07-30 01:06:11 +02:00
Andreas Fischer
18164e63e2 [ticket/11752] HTTP -> HTTPs in email/installed.txt 
PHPBB3-11752
 2013-07-30 01:06:10 +02:00
Joas Schilling
09de06cf15 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10917] Variable used only once so delete it
  [ticket/10917] Revert use of phpbb wrapper
 2013-07-30 00:49:29 +02:00
Joas Schilling
69feffec8b Merge remote-tracking branch 'Elsensee/ticket/10917-2' into develop-olympus 
* Elsensee/ticket/10917-2:
  [ticket/10917] Variable used only once so delete it
  [ticket/10917] Revert use of phpbb wrapper
 2013-07-30 00:46:18 +02:00
Joas Schilling
5f3f41d6d6 [ticket/11574] Remove old "continue step"-message 
PHPBB3-11574
 2013-07-29 23:47:31 +02:00
Joas Schilling
5bb08a1ab9 [ticket/11574] Change order of files and database update 
PHPBB3-11574
 2013-07-29 21:30:01 +02:00
Joas Schilling
db78c11702 Merge pull request #1625 from brunoais/ticket/11640 
[ticket/11640] removed the space that I wonder what it was doing there.
 2013-07-29 09:09:46 -07:00
Joas Schilling
49d908e959 Merge pull request #1624 from brunoais/ticket/11638 
[ticket/11638] Changed the layout to match the other similar commits
 2013-07-29 09:09:07 -07:00
Bruno Ais
ccc5c5f6b8 [ticket/11638] Changed the layout to match the other similar commits 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
 2013-07-29 17:00:51 +01:00