aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developJoas Schilling2013-11-261-0/+1
|\ | | | | | | | | | | | | | | * develop-olympus: [ticket/12037] Fix hard-coded text in acp_inactive.html. Conflicts: phpBB/adm/style/acp_inactive.html
| * [ticket/12037] Fix hard-coded text in acp_inactive.html.Cesar G2013-11-251-0/+1
| | | | | | | | PHPBB3-12037
* | Merge pull request #1854 from Pico88/ticket/12005Nathan Guse2013-11-212-7/+0
|\ \ | | | | | | [ticket/12005] Remove code responsible for PM popup completely
| * | [ticket/12005] Remove language vars used by PM popupLukasz2013-11-082-7/+0
| | | | | | | | | | | | PHPBB3-12005
* | | [ticket/11959] Trim the list of users from post notifications.Cesar G2013-11-211-0/+3
| | | | | | | | | | | | PHPBB3-11959
* | | Merge branch 'develop-olympus' into developJoas Schilling2013-11-191-2/+1
|\ \ \ | | |/ | |/| | | | | | | * develop-olympus: [ticket/11814] Remove redundant text from the topic reply email notification.
| * | [ticket/11814] Remove redundant text from the topic reply email notification.Cesar G2013-11-191-2/+1
| | | | | | | | | | | | PHPBB3-11814
* | | [ticket/11994] Fix more languageJoas Schilling2013-11-081-6/+6
| | | | | | | | | | | | PHPBB3-11994
* | | [ticket/11994] Rename "uninstall" to "delete data"Joas Schilling2013-11-081-6/+6
| | | | | | | | | | | | PHPBB3-11994
* | | [ticket/11994] Make install/enable just one UI thingJoas Schilling2013-11-081-5/+0
| | | | | | | | | | | | PHPBB3-11994
* | | [ticket/11994] Fix some languageJoas Schilling2013-11-081-2/+2
| | | | | | | | | | | | PHPBB3-11994
* | | [ticket/11994] More language fixesJoas Schilling2013-11-081-5/+5
| | | | | | | | | | | | PHPBB3-11994
* | | [ticket/11994] Make extension manager UI less misleadingJoas Schilling2013-11-081-27/+24
| | | | | | | | | | | | | | | | | | | | | Enable and Install were split into two different expressions. Purge was renamed to uninstall to make clearer what is going to happen. PHPBB3-11994
* | | Merge pull request #1788 from VSEphpbb/ticket/11935Nathan Guse2013-11-041-1/+1
|\ \ \ | | | | | | | | [ticket/11935] Fix invalid HTML and Errors
| * | | [ticket/11935] Fix <p> tags not allowed inside <strong> tagsMatt Friedman2013-10-191-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11935
* | | | [ticket/11975] Change shortened ACP/MCP label to Administer/ModerateDavid King2013-11-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Also utilizing the new data-responsive-text attribute PHPBB3-11975
* | | | [ticket/11975] Make link text shorter on smaller resolutionsDavid King2013-11-021-0/+2
| |_|/ |/| | | | | | | | PHPBB3-11975
* | | Merge pull request #1812 from prototech/ticket/11746Nathan Guse2013-11-022-0/+3
|\ \ \ | | | | | | | | [ticket/11746] Add "admin activation required" notification.
| * | | [ticket/11746] Delete the notification after user is approved & fix language.Cesar G2013-10-261-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11746
| * | | [ticket/11746] Add "admin activation required" notification.Cesar G2013-10-242-0/+3
| |/ / | | | | | | | | | PHPBB3-11746
* | | [ticket/11974] Fix timezone names with underscoresJoas Schilling2013-10-271-59/+59
| | | | | | | | | | | | PHPBB3-11974
* | | [ticket/11974] Translate all timezonesJoas Schilling2013-10-271-0/+432
|/ / | | | | | | PHPBB3-11974
* | [ticket/11921] Move any HTML for Notifications to the templatesMatt Friedman2013-10-161-1/+0
| | | | | | | | PHPBB3-11921
* | [ticket/11921] Improve appearance of PM notifications in linklistMatt Friedman2013-10-151-8/+0
| | | | | | | | PHPBB3-11921
* | [ticket/11921] Improve appearance of Notifications in linklistMatt Friedman2013-10-151-5/+1
| | | | | | | | PHPBB3-11921
* | Merge pull request #1772 from bantu/feature/plupload/integrationNils Adermann2013-10-131-0/+65
|\ \ | | | | | | [ticket/10929] Integration of Plupload
| * | [feature/plupload/integration] Integration of PluploadAndreas Fischer2013-10-111-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | This commit is a highly-refactored and up-to-date version of Fyorl's work which was part of his Google Summer of Code 2012 project "Attachment Improvements". PHPBB3-10929
* | | [feature/plupload/cron] Add cronjob for cleaning plupload temporary directory.Andreas Fischer2013-10-111-0/+2
|/ / | | | | | | PHPBB3-10929
* | [ticket/11703] Make jQuery CDN switch more generic.Andreas Fischer2013-10-101-2/+2
| | | | | | | | | | | | | | Config variable: load_jquery_cdn -> allow_cdn Template variable: S_JQUERY_FALLBACK -> S_ALLOW_CDN PHPBB3-11703
* | Merge remote-tracking branch 'prototech/ticket/11739' into developDhruv2013-10-071-1/+1
|\ \ | | | | | | | | | | | | | | | | | | # By Cesar G # Via Cesar G * prototech/ticket/11739: [ticket/11739] Rename “Remember Me” login keys module
| * | [ticket/11739] Rename “Remember Me” login keys moduleCesar G2013-10-051-1/+1
| | | | | | | | | | | | PHPBB3-11739
* | | [ticket/11894] Fix typo in "Delete post" optionCesar G2013-10-051-1/+1
|/ / | | | | | | PHPBB3-11894
* | [ticket/11883] Report completed data step in migration as "Installing Data"Nathan2013-10-021-2/+3
| | | | | | | | PHPBB3-11883
* | [ticket/11844] update acp/authentication language varProsk8er2013-09-141-1/+1
| | | | | | | | | | | | the language var ACP_AUTH_SETTINGS_EXPLAIN in language/en/acp/board.php PHPBB3-11844
* | [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
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-05 15:17:10 +0000