aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | [feature/oauth] Fall back to DB login if OAuth is enabled but not requestedJoseph Warner2013-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Clean up unneeded complexityJoseph Warner2013-07-181-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Fix a bunch of errors in oauth.phpJoseph Warner2013-07-181-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Temporary workaround for only allowing one auth providerJoseph Warner2013-07-181-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Fix fatal errorJoseph Warner2013-07-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Google supportJoseph Warner2013-07-181-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Facebook supportJoseph Warner2013-07-181-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Remove unused methodJoseph Warner2013-07-181-51/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Finish authenticating user codeJoseph Warner2013-07-181-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Update service files + check for existing linksJoseph Warner2013-07-181-7/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Remove OAuth providers to make PR smallerJoseph Warner2013-07-1815-842/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Create means to associate phpBB account with externalJoseph Warner2013-07-183-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Bitly authentication method, no user_id associationJoseph Warner2013-07-181-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Update interface appropriatelyJoseph Warner2013-07-151-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Define method to perform login actions for a providerJoseph Warner2013-07-153-9/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPB3-11673
| | * | | | | | [feature/oauth] Correct function callJoseph Warner2013-07-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Update oauth to reflect recent changesJoseph Warner2013-07-151-13/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Update auth provider oauth to take in service providersJoseph Warner2013-07-141-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Add constructorsJoseph Warner2013-07-1418-0/+306
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Remove get_service_credentials() from oauth providerJoseph Warner2013-07-141-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Get service credentials on each OAuth serviceJoseph Warner2013-07-1419-12/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Set required scopes on more providersJoseph Warner2013-07-142-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Last five oauth servicesJoseph Warner2013-07-145-0/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Create OAuth service classesJoseph Warner2013-07-1416-31/+442
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Move last file to appropriate locationJoseph Warner2013-07-141-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Update class name based on last commitJoseph Warner2013-07-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Move oauth to auth/provider/oauthJoseph Warner2013-07-142-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Move OAuth to /phpBB/phpbbJoseph Warner2013-07-142-0/+524
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Change name of new method on requestJoseph Warner2013-07-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | | [feature/oauth] Allow getting original global arrays from requestJoseph Warner2013-07-142-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816Nathan Guse2013-09-0614-1477/+529
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By David King (16) and others # Via David King (13) and others * 'develop' of github.com:phpbb/phpbb3: (67 commits) [ticket/11825] Move schema_data.php into includes/ instead of phpbb/ [ticket/11215] Remove unnecessary comment [ticket/11755] MySQL upgrader out of date [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. [ticket/11823] Set up nginx server to match PHP files with characters after .php [ticket/11812] Fix empty define [ticket/11818] Update Symfony dependencies to 2.3.* [ticket/11791] Load adm/ events from styles/adm/event/ [ticket/11215] Fix helper_url_test.php tests [ticket/11215] Add newline back to .htaccess, fix wording [ticket/11215] Update comment in .htaccess [ticket/11215] Uncomment rewrite rules in .htaccess [ticket/11215] Make controller helper url() method use correct format [ticket/11215] Add commented-out URL rewrite capability to .htaccess [ticket/11821] Fix comma usage next to "You are receiving this notification". [ticket/11769] Allow using 0 as poster name [ticket/11769] Allow '0' as username [ticket/11215] Use new URL structure for controllers [ticket/11215] Everything appears to be working... ... Conflicts: phpBB/phpbb/template/twig/lexer.php tests/template/template_test.php
| | * | | | | | [ticket/11825] Move schema_data.php into includes/ instead of phpbb/Dhruv2013-09-031-1194/+0
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | PHPBB3-11825
| | * | | | | Merge remote-tracking branch 'EXreaction/ticket/11755' into developDavid King2013-09-022-241/+1447
| | |\ \ \ \ \
| | | * | | | | [ticket/11755] MySQL upgrader out of dateNathan Guse2013-09-022-241/+1447
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | De-duplicating code from create_schema_files, mysql_upgrader. New file phpbb/db/schema_data which contains all the current schema data. New function in db_tools public static function get_dbms_type_map() to make the type map available everywhere (without requiring $db be setup already) PHPBB3-11755
| | * | | | | Merge pull request #1102 from imkingdavid/ticket/11215Nathan Guse2013-09-021-16/+17
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/11215] Correct paths when path info is used for controller access
| | | * | | | | [ticket/11215] Fix helper_url_test.php testsDavid King2013-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11215
| | | * | | | | [ticket/11215] Make controller helper url() method use correct formatDavid King2013-09-021-16/+17
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-11215
| | * | | | | [ticket/11812] Fix empty defineNathan Guse2013-09-021-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-11812
| | * | | | Merge remote-tracking branch 'EXreaction/ticket/11724' into developJoas Schilling2013-08-301-3/+6
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11724: [ticket/11724] Handle ELSE IF separately [ticket/11724] Replace spaces with tabs [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same way
| | | * | | | [ticket/11724] Handle ELSE IF separatelyNathan Guse2013-08-281-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11724
| | | * | | | [ticket/11724] Replace spaces with tabsNathan Guse2013-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11724
| | | * | | | [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same wayNathan Guse2013-07-271-1/+2
| | | | |/ / | | | |/| | | | | | | | | | | | | | PHPBB3-11724
| | * | | | [ticket/11628] Create base template class with common functionsNathan Guse2013-08-282-179/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E.g. assign_vars PHPBB3-11628
| | * | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628Nathan Guse2013-08-2846-93/+225
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Bruno Ais (42) and others # Via Joas Schilling (39) and others * 'develop' of github.com:phpbb/phpbb3: (157 commits) [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0 [ticket/11799] Send anti abuse headers in "new password" emails. [ticket/11792] Add functional test for var lang_set_ext of core.user_setup [ticket/11804] Remove </li> from overall_header which was not open [ticket/11802] replace $browser with $user->browser [ticket/11801] removed some whitespace and added missing semi colon's in css [ticket/11792] Add performance remark to core.user_setup event PHPDoc [ticket/11792] Add variable 'lang_set_ext' to event core.user_setup [ticket/11789] Remove inline color in memberlist_view [ticket/11800] Fix scripts variable in subsilver simple_footer [ticket/11800] Fix JavaScript in simple_footer.html [ticket/11800] Remove forum_fn from memberlist_search.html [ticket/11796] Replace pagination with pagination.html [ticket/11794] Add missing array element commas to docs/coding-guidelines.html [ticket/11775] Fix doc blocks syntax [ticket/11775] Remove spaces at line ends [ticket/11789] Remove colors from HTML code [ticket/11784] Remove naming redundancy for event listeners [ticket/11775] Split test into multiple steps [ticket/11777] Fix new test for loop variables in extension template listeners ... Conflicts: phpBB/install/index.php phpBB/install/install_update.php
| | * | | | | [ticket/11628] phpbb_template, not phpbb_template_interfaceNathan Guse2013-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11628
| | * | | | | [ticket/11628] Make get_template_vars protectedNathaniel Guse2013-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all references to it and the hacky code in messenger that was using it PHPBB3-11628
| | * | | | | [ticket/11628] Fix a bug I noticed in template->destroyNathaniel Guse2013-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should not be setting $this->context = array()! PHPBB3-11628
| | * | | | | [ticket/11628] Remove the one usage of get_style_path()Nathaniel Guse2013-07-242-17/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes the code easier to follow PHPBB3-11628
| | * | | | | [ticket/11628] Shorten an if to an inline statementNathaniel Guse2013-07-241-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11628
| | * | | | | [ticket/11628] Remove template_path option on set_custom_styleNathaniel Guse2013-07-242-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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