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

19718 commits

This branch
This branch
All branches
Author SHA1 Message Date
rechosen
a10ab3e7d9 [ticket/9550] Add template event memberlist_view_user_statistics_after 
Adds the append counterpart of a template event required for the karma
extension. It allows adding entries to the user statistics part of any user
profile.

Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Per suggestion of nickvergessen, add a counterpart for every append or prepend
event.

PHPBB3-9550
 2013-08-02 11:16:02 +02:00
rechosen
d7e048da10 [ticket/9550] Add template event memberlist_view_user_statistics_before 
Adds a template event required for the karma extension. It allows adding
entries to the user statistics part of any user profile.

Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Used by the karma extension to add a karma score indication that allows other
users to see how respected this user is. Prepend because karma score is often
a more meaningful statistic than the bottom statistics (like "Most active
topic"), and should therefore be more prominent.

PHPBB3-9550
 2013-08-02 11:16:02 +02:00
Joseph Warner
381e7c347b [feature/oauth] Forgot new line character 
PHPBB3-11673
 2013-08-01 21:45:25 -04:00
Joseph Warner
abe9f27723 [feature/oauth] Clean up OAuth services 
PHPBB3-11673
 2013-08-01 21:35:05 -04:00
Joseph Warner
abee776018 [feature/oauth] Clean up oauth.php 
PHPBB3-11673
 2013-08-01 21:30:51 -04:00
Oliver Schramm
e667481c6c [ticket/11760] Use phpbb_version_compare() wrapper 
PHPBB3-11760
 2013-08-02 03:28:32 +02:00
Andreas Fischer
22ba1a0c7e Merge remote-tracking branch 'Elsensee/ticket/11759' into develop 
* Elsensee/ticket/11759:
  [ticket/11759] Change lowercase to uppercase
 2013-08-02 03:10:19 +02:00
Oliver Schramm
7d90f0a8a0 [ticket/11759] Change lowercase to uppercase 
PHPBB3-11759
 2013-08-02 02:49:28 +02:00
Andreas Fischer
0121de56d4 Merge branch 'develop-olympus' into develop 
* develop-olympus:
 2013-08-01 17:40:14 +02:00
Andreas Fischer
b7f97cae79 Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
 2013-08-01 17:40:05 +02:00
Andreas Fischer
acc7cb5e23 Merge branch 'prep-release-3.0.12' of git://github.com/phpbb/phpbb3 into prep-release-3.0.12 
* 'prep-release-3.0.12' of git://github.com/phpbb/phpbb3:
  [ticket/11753] Remove ?> from MySQL Upgrader.
  [ticket/11753] Update MySQL upgrader schema data.
  [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"
  [ticket/11752] HTTP -> HTTPs in email/installed.txt
 2013-08-01 17:39:52 +02:00
Andreas Fischer
d01c07c887 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC2.

Conflicts:
	build/build.xml
	phpBB/install/database_update.php
 2013-08-01 17:32:32 +02:00
Andreas Fischer
02b4f1c874 Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC2.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
 2013-08-01 17:30:21 +02:00
Andreas Fischer
0a73d64b97 [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release. 2013-08-01 17:28:21 +02:00
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
Joseph Warner
c33f970386 [feature/oauth] Forgot to update schema files 
PHPBB3-11673
 2013-07-31 16:50:32 -04:00
Joseph Warner
3264a7ece5 [feature/oauth] Attempt to fix postgres issue 
PHPBB3-11673
 2013-07-31 16:34:07 -04:00
Joseph Warner
aa80ac44a4 [feature/oauth] Login_link works with ucp_register now 
PHPBB3-11673
 2013-07-31 14:54:28 -04:00
Joseph Warner
3b19d5c198 [feature/oauth] Fix errors on ucp_login_link 
PHPBB3-11673
 2013-07-31 14:46:45 -04:00
Joseph Warner
b6d93d21ba [feature/oauth] Login_link in registration 
PHPBB3-11673
 2013-07-31 13:46:57 -04: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
Joseph Warner
0cbfa8ffd4 [feature/oauth] Start working on login_link registration support 
PHPBB3-11673
 2013-07-30 14:45:23 -04:00
Joseph Warner
6a45cd7bca [feature/oauth] Login_link register form 
PHPBB3-11673
 2013-07-30 14:31:09 -04:00
Joseph Warner
c5515eaf54 [feature/oauth] Reword some of the language text 
PHPBB3-11673
 2013-07-30 14:16:44 -04:00
Joseph Warner
b74e65801a [feature/oauth] Clean up documentation 
PHPBB3-11673
 2013-07-30 14:15:00 -04:00
Joseph Warner
bf9d4e0cdf [feature/oauth] Consolidate repeated query into one function 
PHPBB3-11673
 2013-07-30 14:08:33 -04: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