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
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
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
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
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
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
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
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
Bruno Ais
16b4116165
[ticket/11654] generate_text_for_display on mcp/mcp_warn.php
...
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11654
2013-07-18 16:15:36 +01:00
Bruno Ais
d183431894
[ticket/11653] generate_text_for_display on mcp/mcp_topic.php
...
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11653
2013-07-16 21:28:06 +01:00
Bruno Ais
596e9bb69d
[ticket/11643] generate_text_for_display on mcp/mcp_queue.php
...
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11643
2013-07-16 21:20:22 +01:00
Bruno Ais
e7bf3abd1a
[ticket/11642] generate_text_for_display on mcp/mcp_post.php
...
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11642
2013-07-16 21:15:59 +01:00
Bruno Ais
e1e8d4ed34
[ticket/11641] generate_text_for_display on mcp/mcp_pm_reports.php
...
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11641
2013-07-16 21:01:47 +01:00
Bruno Ais
fc6bed2856
[ticket/11640] generate_text_for_display on functions_privmsgs.php
...
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11640
2013-07-16 20:32:57 +01:00
Bruno Ais
5f19ca6a6f
[ticket/11639] Whitespace fixing
...
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11639
2013-07-15 20:09:59 +01:00
Bruno Ais
dde9a1fb27
[ticket/11639] Added an useful comment.
...
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11639
2013-07-15 20:08:17 +01:00
Bruno Ais
f96f2a9e23
[ticket/11639] generate_text_for_display on functions_posting.php
...
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11639
2013-07-15 20:06:54 +01:00
Nils Adermann
b3e8734a49
[ticket/11700] Load the dbms with namespaces
...
PHPBB3-11700
2013-07-14 16:35:04 -04:00
Igor Wiedler
8928240dc3
[ticket/11574] Fix more issues in the updater
...
* Stupid mistake in phpbb_create_update_container
* Do not bootstrap extensions in installer/updater
* Fix template lookup in installer/updater
* Do not attempt to delete posts from bots
The latter is a really fun problem. Since deleting posts now depends
on a new db column that does not exist yet, we cannot call delete_post
from a migration, ever. By using retain, we can hack around the issue
for now.
PHPBB3-11574
2013-07-14 15:40:19 -04:00
Joseph Warner
00d0e10200
[feature/oauth] Move last file to appropriate location
...
PHPBB3-11673
2013-07-14 14:22:43 -04:00
Joseph Warner
1a3880806a
[feature/oauth] Move OAuth to /phpBB/phpbb
...
PHPBB3-11673
2013-07-14 14:22:43 -04:00
Joseph Warner
4b1390ca31
[feature/oauth] Pathing information for some services
...
PHPBB3-11673
2013-07-14 14:22:43 -04:00
Joseph Warner
e600596602
[feature/oauth] Scopes/path part one
...
PHPBB3-11673
2013-07-14 14:22:43 -04:00
Joseph Warner
a7bfe5eeeb
[feature/oauth] Changes to oauth
...
PHPBB3-11673
2013-07-14 14:22:43 -04:00
Joseph Warner
6e73ccd00f
[feature/oauth] Function to update user_id of a token
...
PHPBB3-9734
2013-07-14 14:22:43 -04:00
Joseph Warner
9619a9a16f
[feature/oauth] Anonymous user does not depend on user_id in token
...
PHPBB3-11673
2013-07-14 14:22:43 -04:00
Joseph Warner
3c8187c277
[feature/oauth] Have array of services not just one in oauth
...
PHPBB3-11673
2013-07-14 14:22:43 -04:00
Joseph Warner
68a80f8ea8
[feature/oauth] Fix typo
...
PHPBB3-11673
2013-07-14 14:22:43 -04:00
Joseph Warner
5942eac5da
[feature/oauth] Pass table in constructor
...
PHPBB3-11673
2013-07-14 14:22:43 -04:00
Joseph Warner
69e1588655
[feature/oauth] Store anonymous user by session id
...
PHPBB3-9734
2013-07-14 14:22:43 -04:00
Joseph Warner
b22b076a99
[feature/oauth] Update invocation of method in OAuth
...
PHPBB3-11673
2013-07-14 14:22:43 -04:00
Joseph Warner
02921f4b23
[feature/oauth] Have token storage use DB
...
PHPBB3-11673
2013-07-14 14:22:42 -04:00
Joseph Warner
24bf333e16
[feature/oauth] Use DB for OAuth token storage
...
PHPBB3-11673
2013-07-14 14:22:42 -04:00
Joseph Warner
37f099b014
[feature/oauth] Document and rearrange methods
...
PHPBB3-11673
2013-07-14 14:22:42 -04:00
Joseph Warner
aa12f6afc5
[feature/oauth] More work on login
...
PHPBB3-11673
2013-07-14 14:22:42 -04:00
Joseph Warner
93f7ed4fb5
[feature/oauth] Continue work on OAuth login
...
PHPBB3-11673
2013-07-14 14:22:42 -04:00
Joseph Warner
6479a989c5
[feature/oauth] Token Storage Skeleton
...
PHPBB3-11673
2013-07-14 14:22:42 -04:00
Joseph Warner
d63f920250
[feature/oauth] Check that the service actually has settings
...
PHPBB3-11673
2013-07-14 14:22:42 -04:00
Joseph Warner
1e38be3fa9
[feature/oauth] Additional work on implementing login
...
PHPBB3-11673
2013-07-14 14:22:42 -04:00
Joseph Warner
65485253c9
[feature/oauth] Start implementing login
...
PHPBB3-11673
2013-07-14 14:22:42 -04:00