aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11837] Replace escaped single quote with utf-8 single quoteJoseph Warner2013-09-131-1/+1
| | | | PHPBB3-11837
* [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTEDJoseph Warner2013-09-131-0/+1
| | | | PHPBB3-11837
* Merge remote-tracking branch 'imkingdavid/ticket/11824' into developJoas Schilling2013-09-131-0/+4
|\
| * [ticket/11824] Update language string for board settingsDavid King2013-09-121-1/+1
| | | | | | | | PHPBB3-11824
| * [ticket/11824] Fix logicDavid King2013-09-061-2/+2
| | | | | | | | PHPBB3-11824
| * [ticket/11824] Add option for mod_rewriteDavid King2013-09-031-0/+4
| | | | | | | | PHPBB3-11824
* | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11373Nathan Guse2013-09-129-17/+39
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joseph Warner (188) and others # Via Andreas Fischer (41) and others * 'develop' of github.com:phpbb/phpbb3: (435 commits) [ticket/11745] Correct language, coding guidelines [ticket/11828] Fix greedy operators in lexer [ticket/11835] Fix ucp_auth_link adding in migration [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved. [ticket/develop/11832] Fix path detection [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE [ticket/11833] Fix bad template loop [feature/oauth] Fix tabindex [ticket/11816] !$DOESNT_EXIST test [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php [ticket/11829] Use report_closed to determine status in MCP report_details [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.* [feature/oauth] Fix bug on ucp_auth_link related to error display ...
| * \ Merge pull request #1620 from EXreaction/ticket/11745David King2013-09-122-10/+1
| |\ \ | | | | | | | | Group join approved notification
| | * | [ticket/11745] Correct language, coding guidelinesNathan Guse2013-09-121-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11745
| | * | [ticket/11745] Group request approved notificationNathan Guse2013-07-272-10/+1
| | | | | | | | | | | | | | | | PHPBB3-11745
| * | | Merge pull request #1617 from EXreaction/ticket/11744David King2013-09-122-0/+2
| |\ \ \ | | |/ / | | | | [ticket/11744] Group join request notification
| | * | [ticket/11744] LanguageNathan Guse2013-07-271-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11744
| | * | [ticket/11744] Group join request notificationNathan Guse2013-07-262-0/+2
| | | | | | | | | | | | | | | | PHPBB3-11744
| * | | [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ↵Joseph Warner2013-09-067-193/+161
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/oauth Conflicts: phpBB/composer.json phpBB/composer.lock phpBB/develop/create_schema_files.php phpBB/includes/ucp/ucp_register.php PHPBB3-11673
| | * | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-023-3/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11769] Allow using 0 as poster name [ticket/11769] Allow '0' as username [ticket/11769] Allow '0' as username in notification mails [ticket/11769] Fix language issues in the doc blocks [ticket/11769] Correctly supply the post author's username in posting.php Conflicts: phpBB/includes/functions_posting.php
| | | * \ Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-023-3/+3
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11769] Allow using 0 as poster name [ticket/11769] Allow '0' as username [ticket/11769] Allow '0' as username in notification mails [ticket/11769] Fix language issues in the doc blocks [ticket/11769] Correctly supply the post author's username in posting.php Conflicts: phpBB/language/en/email/forum_notify.txt phpBB/language/en/email/newtopic_notify.txt phpBB/language/en/email/topic_notify.txt
| | | | * | [ticket/11769] Allow '0' as username in notification mailsJoas Schilling2013-08-233-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11769
| | | * | | [ticket/11821] Fix comma usage next to "You are receiving this notification".Andreas Fischer2013-09-023-3/+3
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | This is a partial backport of 31502cdd6c3a5bac5164ec30530e5b4bf63f3196. PHPBB3-11821
| | * | | Merge remote-tracking branch 'nickvergessen/ticket/11574' into developDhruv2013-08-081-3/+5
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling (16) and Igor Wiedler (6) # Via Joas Schilling (5) and Igor Wiedler (2) * nickvergessen/ticket/11574: (22 commits) [ticket/11574] Remove install/udpate/new/ fallback from database_update.php [ticket/11574] Do not display incompatible package note after successful update [ticket/11574] Remove old "continue step"-message [ticket/11574] Change order of files and database update [ticket/11574] Fix more issues in the updater [ticket/11574] Add trailing slash for consistency [ticket/11574] Fix table prefix in database updater [ticket/11574] Fix various path issues in the updater [ticket/11574] Make install language filename less crazy [ticket/11574] Use alternate DI config file for updater [ticket/11574] Include normalizer so it loads form the correct directory [ticket/11574] Only fall back to install/update versions, when IN_INSTALL ;) [ticket/11574] Use log object instead of old function [ticket/11574] Include vendor into update packages [ticket/11574] Create phpbb_log object before using it. [ticket/11574] Add correct language parameter to return links [ticket/11574] Use request object rather then request_var function [ticket/11574] Load new language files whenever possible [ticket/11574] Require new files in install/index.php and add a class loader [ticket/11574] Require new files in database_update.php and add a class loader ...
| | | * | | [ticket/11574] Remove install/udpate/new/ fallback from database_update.phpJoas Schilling2013-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we switched the order, everything should be in the normal root by then. PHPBB3-11574
| | | * | | Merge remote-tracking branch 'phpbb/develop' into ticket/11574Joas Schilling2013-07-302-186/+152
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * phpbb/develop: (130 commits) [ticket/11638] Changed the layout to match the other similar commits [ticket/11640] removed the space that I wonder what it was doing there. [ticket/11749] Move event after all template data has been defined [ticket/10917] Variable used only once so delete it [ticket/10917] Revert use of phpbb wrapper [ticket/11749] Template events for topic_list_row_pre/append [ticket/11749] PHP Events for viewforum.php [ticket/11749] PHP Events for search.php [ticket/11740] Update FAQ to include Ideas Centre [ticket/11062] If user's language is english there is no further work needed [ticket/11062] Load new strings from user's language file if provided [ticket/10917] Using phpbb wrapper [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version [ticket/11741] Fix empty brackets and remove bullet [ticket/11638] Removed the unneeded reset. [ticket/11638] Use the $parse_flags like the other commits [ticket/11638] Reverted to use the $parse tags way as the other ones [ticket/11638] Updated: bitwise $parse_flags use optionset() [ticket/11656] Made the check for the bitfield just like other PR's [ticket/11667] Use @inheritdoc ...
| | | * | | [ticket/11574] Change order of files and database updateJoas Schilling2013-07-291-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| | * | | | Merge branch 'develop-olympus' into developJoas Schilling2013-07-301-1/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/| * develop-olympus: [ticket/11752] HTTP -> HTTPs in email/installed.txt
| | | * | [ticket/11752] HTTP -> HTTPs in email/installed.txtAndreas Fischer2013-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11752
| * | | | [feature/oauth] Changes due to code reviewJoseph Warner2013-08-242-5/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Fix indentation on new language constantsJoseph Warner2013-08-241-7/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Finish cleaning up TODOsJoseph Warner2013-08-241-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Clean up TODOsJoseph Warner2013-08-241-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Update language constants for ucp_auth_linkJoseph Warner2013-08-141-1/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Start building the templateJoseph Warner2013-08-091-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Forgot to have login_link be "in login" in ucpJoseph Warner2013-08-051-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Start general auth linking pageJoseph Warner2013-08-051-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Reword some of the language textJoseph Warner2013-07-301-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Properly check that all data needed is availableJoseph Warner2013-07-291-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Basic checking for data needed in login linkingJoseph Warner2013-07-291-2/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] More work on login linking accountsJoseph Warner2013-07-251-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Template for ucp_login_link startedJoseph Warner2013-07-251-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Move language constants for oauth services to common.phpJoseph Warner2013-07-242-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Update error message with actual errorJoseph Warner2013-07-231-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] OAuth init method to minimally validate entered dataJoseph Warner2013-07-231-7/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Clean up the OAuth ACP templateJoseph Warner2013-07-231-2/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] ACP options for OAuth, needs some workJoseph Warner2013-07-231-0/+9
| | |_|/ | |/| | | | | | | | | | PHPBB3-11673
* | | | [ticket/11373] Prune old read notifications with cronNathan Guse2013-07-271-0/+2
| |/ / |/| | | | | | | | PHPBB3-11373
* | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-251-1/+1
|\ \ \ | | |/ | |/| | | | | | | * develop-olympus: [ticket/11740] Update FAQ to include Ideas Centre
| * | [ticket/11740] Update FAQ to include Ideas CentreMichaelC2013-07-251-1/+1
| | | | | | | | | | | | PHPBB3-11740
* | | [ticket/11734] Readd accidently removed language strings of forum permissionsJoas Schilling2013-07-231-0/+11
| | | | | | | | | | | | PHPBB3-11734
* | | [ticket/11582] Fix documentation for adding permissionsJoas Schilling2013-07-141-27/+7
| | | | | | | | | | | | PHPBB3-11582
* | | [ticket/11582] Split permission language strings from logicJoas Schilling2013-07-141-132/+121
| | | | | | | | | | | | PHPBB3-11582
* | | [ticket/11582] Use new methods and remove duplicated entriesJoas Schilling2013-07-141-8/+0
| | | | | | | | | | | | PHPBB3-11582
* | | [ticket/11582] Use new class for categoriesJoas Schilling2013-07-141-16/+14
| | | | | | | | | | | | PHPBB3-11582
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-28 02:25:40 +0000