mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-29 06:26:22 +01:00
Code Issues Releases Wiki Activity
18,750 Commits 10 Branches 193 Tags
fbedce8d4abe8af73526ed5f8484feb82edcd41b
Commit Graph

16501 Commits

Author SHA1 Message Date
Andreas Fischer
017d809e74 Merge remote-tracking branch 'nickvergessen/ticket/11733' into develop 
* nickvergessen/ticket/11733:
  [ticket/11733] Fix "Illegal offset type" Warning caused by overall feed
  [ticket/11733] Add browse test for feed.php
 2013-07-23 01:17:13 +02:00
Joas Schilling
10ba1e73da [ticket/11733] Fix "Illegal offset type" Warning caused by overall feed 
PHPBB3-11733
 2013-07-23 00:59:51 +02:00
Andreas Fischer
c2d919f12d Merge remote-tracking branch 'asperous/ticket/11731' into develop 
* asperous/ticket/11731:
  [ticket/11731] Remove static calls to captcha garbage collector
 2013-07-23 00:07:38 +02:00
Andy Chase
80f81dd0d2 [ticket/11731] Remove static calls to captcha garbage collector 
PHPBB3-11731
 2013-07-22 15:04:30 -07:00
Joseph Warner
5578b7a578 [feature/oauth] Initial UI element added, this is non-final 
At this point, all UI changes are purely for testing and should not
be considered final.

PHPBB3-11673
 2013-07-22 17:27:56 -04:00
Joas Schilling
aa77367267 [ticket/11728] Replace topic_approved with topic_visibility 
PHPBB3-11728
 2013-07-22 22:54:55 +02:00
Joseph Warner
0be81468e7 [feature/oauth] Possible way of getting the login data to login_box() 
PHPBB3-11673
 2013-07-22 16:36:42 -04:00
Joseph Warner
cd49cfacfb [feature/oauth] Initial step in creating OAuth login support 
PHPBB3-11673
 2013-07-22 16:23:41 -04:00
Marc Alexander
974da6449c [ticket/11723] Correctly redirect user to agreement page and let him leave 
This patch consists of two changes. The first one will make sure that $agree
is correctly reset to 0 and the user redirected back to the agreement page
after changing the display language. Secondly, by reseting 'change_lang',
the user will be able to agree to the terms on the agreement page again.
The changed language will still be kept, as this is correctly saved in the
'lang' field that is passed to the ucp_register page.
The variable $agree has also been changed to be boolean. It is not used as
an integer anywere in the ucp_register file.

PHPBB3-11723
 2013-07-22 22:20:55 +02:00
Joseph Warner
d804842cef [feature/oauth] Fall back to DB login if OAuth is enabled but not requested 
PHPBB3-11673
 2013-07-22 15:58:32 -04:00
Nathan Guse
127ee62edd Merge pull request #1589 from marc1706/ticket/11717 
[ticket/11717] Use topic_posts_approved instead of topic_replies
 2013-07-22 12:20:17 -07:00
Nathan Guse
b71038486e Merge pull request #1513 from nickvergessen/ticket/11582 
Ticket/11582 Split permission logic from translations
 2013-07-22 11:28:55 -07:00
Joas Schilling
0f70864624 [ticket/11582] Move global declaration to beginning of block 
PHPBB3-11582
 2013-07-22 20:06:30 +02:00
Andreas Fischer
0f18ff6228 Merge remote-tracking branch 'marc1706/ticket/11725' into develop 
* marc1706/ticket/11725:
  [ticket/11725] Use new paths for phpbb_class_loader in file.php
 2013-07-22 18:30:59 +02:00
Marc Alexander
128af41a7c [ticket/11725] Use new paths for phpbb_class_loader in file.php 
In the PR #1559, the paths were changed from "{$phpbb_root_path}includes/" to
"{$phpbb_root_path}phpbb/" for the class loader. However, this was not changed
in all files that use it.

PHPBB3-11725
 2013-07-22 12:47:32 +02:00
Bruno Ais
580131b5c3 [ticket/11640] removed the unset 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11640
 2013-07-22 11:16:47 +01:00
Marc Alexander
effafa4b4d [ticket/11717] Add 'has' to boolean variable and reduce line length 
PHPBB3-11717
 2013-07-22 10:42:46 +02:00
Andreas Fischer
570e21285b [ticket/11722] Remove reference assignment for $captcha in report.php 
PHPBB3-11722
 2013-07-22 03:30:27 +02:00
Andreas Fischer
8efca016fa Merge remote-tracking branch 'EXreaction/ticket/11707' into develop 
* EXreaction/ticket/11707:
  [ticket/11707] Twig DEFINE not working as expected
 2013-07-22 03:07:38 +02:00
Andreas Fischer
fb5c8957ec Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11720] Add functional test for submitting report as user
  [ticket/11720] Do not call $captcha->validate if $captcha is not set
 2013-07-22 00:51:03 +02:00
Andreas Fischer
90e532430c Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [ticket/11720] Add functional test for submitting report as user
  [ticket/11720] Do not call $captcha->validate if $captcha is not set
 2013-07-22 00:50:49 +02:00
Andreas Fischer
148df3607b Merge remote-tracking branch 'marc1706/ticket/11720-prep-release' into prep-release-3.0.12 
* marc1706/ticket/11720-prep-release:
  [ticket/11720] Add functional test for submitting report as user
  [ticket/11720] Do not call $captcha->validate if $captcha is not set
 2013-07-22 00:32:35 +02:00
Marc Alexander
56df3fd8ca [ticket/11720] Do not call $captcha->validate if $captcha is not set 
PHPBB3-11566 changed big parts of code. Unfortunately, a call to
$captcha->validate was added that is being called even if $captcha hasn't
been initialized. This change will fix this issue.

PHPBB3-11720
 2013-07-21 18:50:06 +02:00
Marc Alexander
603dc1f786 [ticket/11717] Use topic_posts_approved instead of topic_replies 
Due to the move to soft-delete, the topic_replies column no longer exists
in the topics table. Instead, the column topic_posts_approved should be used.

PHPBB3-11717
 2013-07-20 21:21:36 +02:00
Bruno Ais
43b172c8aa [ticket/11655] wrong var names for the uid and for the bitfield 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11655
 2013-07-20 16:44:24 +01:00
Bruno Ais
67ba959d9b [ticket/11654] first parameter fail 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11654
 2013-07-20 16:35:28 +01:00
Bruno Ais
0ef1bcac2b [ticket/11639] Whitespace fixing 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11639
 2013-07-20 16:31:08 +01:00
Bruno Ais
7341482304 [ticket/11638] Fixed not following guidelines for brackets 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
 2013-07-20 16:25:05 +01:00
Bruno Ais
fc64e6997f [ticket/11638] Fixed typo in the variable name. 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
 2013-07-20 16:24:31 +01:00
Bruno Ais
f1bfbde3f5 [ticket/11643] Fixed typo in the variable name. 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11643
 2013-07-20 16:19:27 +01:00
Bruno Ais
b3ad2fc23f [ticket/11642] Fixed typo in the variable name. 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11642
 2013-07-20 16:16:10 +01:00
Nathaniel Guse
375976eb38 [ticket/11707] Twig DEFINE not working as expected 
PHPBB3-11707
 2013-07-19 14:12:28 -05:00
Nathaniel Guse
b92f660ed3 [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF 
PHPBB3-11718
 2013-07-19 13:08:41 -05:00
Bruno Ais
ef7a7cac6d [ticket/11655] generate_text_for_display on ucp_pm_viewmessage.php 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11655
 2013-07-19 18:27:25 +01:00
Joseph Warner
4c48da0597 [feature/oauth] Clean up unneeded complexity 
PHPBB3-11673
 2013-07-18 21:04:10 -04:00
Joseph Warner
f852485513 [feature/oauth] Fix a bunch of errors in oauth.php 
PHPBB3-11673
 2013-07-18 21:02:21 -04:00
Joseph Warner
b67032fb02 [feature/oauth] Temporary workaround for only allowing one auth provider 
PHPBB3-11673
 2013-07-18 20:49:42 -04:00
Joseph Warner
0f292f70c7 [feature/oauth] Fix fatal error 
PHPBB3-11673
 2013-07-18 20:05:26 -04:00
Andreas Fischer
9c223cdd88 [ticket/11345] Don't include scheme, so HTTPS is used where necessary. 
PHPBB3-11345
 2013-07-18 22:50:17 +02:00
Marc Alexander
f421c082f7 [ticket/11713] Do not remove module if it couldn't be deleted 
Up to now, the module or module category was always removed with jQuery,
even if there was an error. With this change, the modules will not be deleted
by jQuery if the return JSON array will have SUCCESS set to false.

PHPBB3-11713
 2013-07-18 22:41:23 +02:00
Joseph Warner
a673eb8cbc [feature/oauth] Google support 
PHPBB3-11673
 2013-07-18 16:04:58 -04:00
Joseph Warner
772a977afc [feature/oauth] Facebook support 
PHPBB3-11673
 2013-07-18 16:03:44 -04:00
Joseph Warner
2eb47d00e0 [feature/oauth] Remove unused method 
PHPBB3-11673
 2013-07-18 15:33:31 -04:00
Joseph Warner
36f7913cc0 [feature/oauth] Finish authenticating user code 
PHPBB3-11673
 2013-07-18 15:31:31 -04:00
Joseph Warner
2faaa7f63c [feature/oauth] Update service files + check for existing links 
PHPBB3-11673
 2013-07-18 12:51:53 -04:00
Joseph Warner
bbbe442c42 [feature/oauth] Finish clean up of removed providers 
PHPBB3-11673
 2013-07-18 12:24:30 -04:00
Joseph Warner
662b8fdcec [feature/oauth] Remove OAuth providers to make PR smaller 
PHPBB3-11673
 2013-07-18 12:21:45 -04:00
Andreas Fischer
29322e85ff Merge remote-tracking branch 'cyberalien/ticket/11712' into develop 
* cyberalien/ticket/11712:
  [ticket/11712] Fixing typo in editor.js
 2013-07-18 18:14:03 +02:00
Joseph Warner
fe9428b725 [feature/oauth] Create means to associate phpBB account with external 
PHPBB3-11673
 2013-07-18 12:12:57 -04:00
Vjacheslav Trushkin
d05c04ae40 [ticket/11712] Fixing typo in editor.js 
PHPBB3-11712
 2013-07-18 19:10:36 +03:00