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

18570 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Fischer
5ebc36f583 Merge remote-tracking branch 'Elsensee/ticket/11741' into develop 
* Elsensee/ticket/11741:
  [ticket/11741] Fix empty brackets and remove bullet
 2013-07-25 14:20:29 +02:00
Andreas Fischer
8e1801698e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11740] Update FAQ to include Ideas Centre
 2013-07-25 14:08:06 +02:00
Andreas Fischer
76a7d544cf Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [ticket/11740] Update FAQ to include Ideas Centre
 2013-07-25 14:07:53 +02:00
Andreas Fischer
469d9ee171 Merge remote-tracking branch 'unknownbliss/ticket/11740' into prep-release-3.0.12 
* unknownbliss/ticket/11740:
  [ticket/11740] Update FAQ to include Ideas Centre
 2013-07-25 14:07:10 +02:00
MichaelC
c5de4dd51d [ticket/11740] Update FAQ to include Ideas Centre 
PHPBB3-11740
 2013-07-25 13:06:11 +01:00
Oliver Schramm
7304ac9c3c [ticket/11062] If user's language is english there is no further work needed 
PHPBB3-11062
 2013-07-25 13:10:45 +02:00
Oliver Schramm
a9f0577502 [ticket/11062] Load new strings from user's language file if provided 
PHPBB3-11062
 2013-07-25 12:29:25 +02:00
Joas Schilling
593ab9362e Merge remote-tracking branch 'brunoais/ticket/11656' into develop 
* brunoais/ticket/11656:
  [ticket/11656] Made the check for the bitfield just like other PR's
  [ticket/11656] Wrong bitwise OR
  [ticket/11656] Remove line break in function call
  [ticket/11656] generate_text_for_display on memberlist.php
 2013-07-24 22:14:52 +02:00
Joseph Warner
7c065bc9a2 [feature/oauth] Finish fixes from tests and tests for token storage 
PHPBB3-11673
 2013-07-24 16:06:34 -04:00
Joseph Warner
5052b80456 [feature/oauth] Refactor clear token test to get more useful output first 
PHPBB3-11673
 2013-07-24 16:04:24 -04:00
Joseph Warner
f8dbaa148d [feature/oauth] Fixes for problems found by tests 
PHPBB3-11673
 2013-07-24 16:02:59 -04:00
Joseph Warner
c5d2b75022 [feature/oauth] Clear token storage test 
PHPBB3-11673
 2013-07-24 16:00:31 -04:00
Joseph Warner
d1f0ecca45 [feature/oauth] Has Access Token test 
PHPBB3-11673
 2013-07-24 15:57:06 -04:00
Joseph Warner
69d8149a8f [feature/oauth] Clean up oauth_tokens test fixture 
PHPBB3-11673
 2013-07-24 15:53:09 -04:00
Joseph Warner
e2ea641cc4 [feature/oauth] Token storage test set_user_id() 
PHPBB3-11673
 2013-07-24 15:52:24 -04:00
Joseph Warner
229d4f2fd6 [feature/oauth] Replace spaces with tabs 
PHPBB3-11673
 2013-07-24 15:47:06 -04:00
Joseph Warner
a72951b799 [feature/oauth] Token Storage retrieve access token test 
PHPBB3-11673
 2013-07-24 15:46:23 -04:00
Joseph Warner
0055ab7ad0 [feature/oauth] Initial token storage tests 
PHPBB3-11673
 2013-07-24 15:31:54 -04:00
Joseph Warner
9cbf670f51 [feature/oauth] Some work on login_link 
PHPBB3-11673
 2013-07-24 15:31:12 -04:00
Joseph Warner
15a2ad3149 [feature/oauth] Fix error in token_storage::set_user_id() 
PHPBB3-11673
 2013-07-24 15:08:08 -04:00
Joseph Warner
27ea03d3e0 [feature/oauth] Initial login_link ucp class 
PHPBB3-11673
 2013-07-24 14:55:29 -04:00
Nathaniel Guse
ce0a1bb3c5 [ticket/11628] Remove remaining style_path_provider_test 
PHPBB3-11628
 2013-07-24 13:44:39 -05:00
Nathaniel Guse
ffbc144a73 [ticket/11628] Make get_template_vars protected 
Remove all references to it and the hacky code in messenger that was using it

PHPBB3-11628
 2013-07-24 13:38:12 -05:00
Nathaniel Guse
427fa17f7f [ticket/11628] Fix a bug I noticed in template->destroy 
Should not be setting $this->context = array()!

PHPBB3-11628
 2013-07-24 13:34:41 -05:00
Nathaniel Guse
8795a354fe [ticket/11628] Remove the one usage of get_style_path() 
Makes the code easier to follow

PHPBB3-11628
 2013-07-24 13:31:09 -05:00
Nathaniel Guse
3b46f77e4e [ticket/11628] Shorten an if to an inline statement 
PHPBB3-11628
 2013-07-24 13:26:55 -05:00
Nathaniel Guse
12c2258506 [ticket/11628] Remove template_path option on set_custom_style 
This was set to default 'template/' to append template/ to all the paths,
but every location was actually just setting it to '' to not append anything.
So removed the option entirely (additional paths can be appended to the paths
being sent to the function already)

PHPBB3-11628
 2013-07-24 13:25:20 -05:00
Nathaniel Guse
863592a8be [ticket/11628] Remove set_style_names function, moved to set_custom_style 
PHPBB3-11628
 2013-07-24 13:19:20 -05:00
Joseph Warner
5843294813 [feature/oauth] Update comment to better reflect the action 
PHPBB3-11673
 2013-07-24 14:05:54 -04:00
Nathaniel Guse
4414278209 [ticket/11628] Set admin namespace in the constructor 
PHPBB3-11628
 2013-07-24 13:05:27 -05:00
Nathaniel Guse
67627f3336 [ticket/11628] Change set_custom_style $template path to default to string 
Rather than default to false and compare === false ? 'template/' : value just
assign this default in the arguments

PHPBB3-11628
 2013-07-24 13:01:30 -05:00
Nathaniel Guse
4b761f6575 [ticket/11628] Remove third parameter ($names) from set_custom_style 
This was basically duplicating functionality. $names would be used if not
empty, else array($name) would be used. Merged functionality into the first
argument

PHPBB3-11628
 2013-07-24 12:56:39 -05:00
Joseph Warner
581cb37b8c [feature/oauth] Start linking/registering OAuth accounts during login 
PHPBB3-11673
 2013-07-24 13:46:33 -04:00
Nathaniel Guse
bfbc7aa742 [ticket/11628] Return $this from set_style, set_custom_style 
PHPBB3-11628
 2013-07-24 12:45:35 -05:00
Nathaniel Guse
ecaed319ab [ticket/11628] Move setting core namespace to set_style() 
PHPBB3-11628
 2013-07-24 12:42:37 -05:00
Nathaniel Guse
85ff05bec6 [ticket/11628] Remove $this->names, $this->style_names from phpbb_template 
These are not used anywhere

PHPBB3-11628
 2013-07-24 12:34:22 -05:00
Nathaniel Guse
5d1afb4532 [ticket/11628] Remove phpbb_style (move methods to phpbb_template) 
PHPBB3-11628
 2013-07-24 12:24:35 -05:00
Oliver Schramm
e805036963 [ticket/10917] Using phpbb wrapper 
PHPBB3-10917
 2013-07-24 19:08:49 +02:00
Nathaniel Guse
44a82dd083 [ticket/11628] Remove style path provider 
No longer used since Twig was implemented.

PHPBB3-11628
 2013-07-24 12:05:04 -05:00
Nathaniel Guse
98b385bc1c [ticket/11628] Remove style resource locator 
No longer used since Twig was implemented.

PHPBB3-11628
 2013-07-24 11:59:21 -05:00
Joseph Warner
669586c134 [feature/oauth] Token must be updated with the user_id 
PHPBB3-11673
 2013-07-24 12:56:27 -04:00
Oliver Schramm
5af63a7860 [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version 
PHPBB3-10917
 2013-07-24 18:15:03 +02:00
Oliver Schramm
27126e065d [ticket/11741] Fix empty brackets and remove bullet 
PHPBB3-11741
 2013-07-24 17:22:10 +02:00
Joseph Warner
58d5820069 [feature/oauth] Basic login functionality now working 
These changes are currently unique to OAuth and need to be made
generic so that any auth provider can modify the login template.

PHPBB3-11673
 2013-07-24 10:40:42 -04:00
Joseph Warner
ffb14a6988 [feature/oauth] Fix OAuth login 
PHPBB3-11673
 2013-07-24 10:36:08 -04:00
Joseph Warner
5401673f96 [feature/oauth] Move language constants for oauth services to common.php 
PHPBB3-11673
 2013-07-24 10:35:36 -04:00
Bruno Ais
4cdccbd42b [ticket/11638] Removed the unneeded reset. 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
 2013-07-24 12:45:23 +01:00
Bruno Ais
6c68348a71 [ticket/11638] Use the $parse_flags like the other commits 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
 2013-07-24 12:31:38 +01:00
Bruno Ais
029015e154 [ticket/11638] Reverted to use the $parse tags way as the other ones 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
 2013-07-24 12:31:14 +01:00
Oliver Schramm
0dcf24acc1 [ticket/8228] Fix whitespaces before code in Firefox 
Based on the "[code] enhancements" modification by TerraFrost

PHPBB3-8228
 2013-07-24 13:31:12 +02:00