aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | [ticket/12356] Assign vars preventing Plupload from loading in PM editor.Cesar G2014-04-093-6/+10
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12356
* | | | | | | | | | | | Merge remote-tracking branch 'prototech/ticket/12379' into develop-ascraeusJoas Schilling2014-04-101-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prototech/ticket/12379: [ticket/12379] Remove duplicate labels in attachment uploader when responsive.
| * | | | | | | | | | | | [ticket/12379] Remove duplicate labels in attachment uploader when responsive.Cesar G2014-04-091-4/+0
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12379
* | | | | | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/8700' into develop-ascraeusCesar G2014-04-092-288/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/8700: [ticket/8700] Use L_COLON instead of adding ":" manually [ticket/8700] Remove unused language strings
| * | | | | | | | | | | [ticket/8700] Use L_COLON instead of adding ":" manuallyJoas Schilling2014-04-022-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8700
| * | | | | | | | | | | [ticket/8700] Remove unused language stringsJoas Schilling2014-04-021-284/+0
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the strings were obsoleted by the removal of: * Imagesets * Themes * Templates * Editor * Exporter PHPBB3-8700
* | | | | | | | | | | Merge remote-tracking branch 'VSEphpbb/ticket/12365' into develop-ascraeusCesar G2014-04-091-2/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * VSEphpbb/ticket/12365: [ticket/12365] Do not crop image attachments at 350px
| * | | | | | | | | | [ticket/12365] Do not crop image attachments at 350pxMatt Friedman2014-04-061-2/+0
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12365
* | | | | | | | | | Merge remote-tracking branch 'paybas/ticket/12369' into develop-ascraeusJoas Schilling2014-04-086-6/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * paybas/ticket/12369: [ticket/12369] White-space cleanup [ticket/12369] Removed template vars initial state [ticket/12369] Added ACP vars [ticket/12369] Add template var {BODY_CLASS} to HTML body
| * | | | | | | | | | [ticket/12369] White-space cleanupPayBas2014-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12369
| * | | | | | | | | | [ticket/12369] Removed template vars initial statePayBas2014-04-072-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12369
| * | | | | | | | | | [ticket/12369] Added ACP varsPayBas2014-04-073-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12369
| * | | | | | | | | | [ticket/12369] Add template var {BODY_CLASS} to HTML bodyPayBas2014-04-075-5/+6
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://tracker.phpbb.com/browse/PHPBB3-12369 PHPBB3-12369
* | | | | | | | | | Merge remote-tracking branch 'vsephpbb/ticket/12083' into develop-ascraeusJoas Schilling2014-04-081-2/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/12083: [ticket/12083] Fix Select All in CODE bbcode with only one char
| * | | | | | | | | | [ticket/12083] Fix Select All in CODE bbcode with only one charMatt Friedman2014-04-051-2/+3
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12083
* | | | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/12349' into develop-ascraeusDhruv2014-04-0899-99/+99
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/12349: [ticket/12349] Fix Sniffer for @license tag [ticket/12349] Update license header in several new files
| * | | | | | | | | | [ticket/12349] Fix Sniffer for @license tagJoas Schilling2014-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12349
| * | | | | | | | | | [ticket/12349] Update license header in several new filesJoas Schilling2014-04-0398-98/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12349
* | | | | | | | | | | Merge remote-tracking branch 'Marc/ticket/12362' into develop-ascraeusJoas Schilling2014-04-072-0/+85
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/12362: [ticket/12362] Do not use database test case as it's not needed [ticket/12362] Add tests for schema generator [ticket/12362] Throw exception in schema generator on unresolvable dependency
| * | | | | | | | | | | [ticket/12362] Do not use database test case as it's not neededMarc Alexander2014-04-061-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12362
| * | | | | | | | | | | [ticket/12362] Add tests for schema generatorMarc Alexander2014-04-061-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12362
| * | | | | | | | | | | [ticket/12362] Throw exception in schema generator on unresolvable dependencyMarc Alexander2014-04-061-0/+36
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we throw an exception in the schema generator if we come across an unresolvable dependency. Otherwise we'll get stuck in a infinite loop that needs to be cancelled by the user or the maximum execution time. PHPBB3-12362
* | | | | | | | | | | Merge remote-tracking branch 'paybas/ticket/12364' into develop-ascraeusJoas Schilling2014-04-076-4/+12
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * paybas/ticket/12364: [ticket/12364] Add template identifier var to all missing pages
| * | | | | | | | | | | [ticket/12364] Add template identifier var to all missing pagesPayBas2014-04-066-4/+12
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12364
* | | | | | | | | | | Merge remote-tracking branch 'Elsensee/ticket/12360' into develop-ascraeusJoas Schilling2014-04-071-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/12360: [ticket/12360] Fix duplicated creation of session when logging out the user
| * | | | | | | | | | | [ticket/12360] Fix duplicated creation of session when logging out the userOliver Schramm2014-04-061-1/+0
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 7d8b578 this line was introduced to fix a bug with style.php. Later since 1d42d1b a new session is always created after killing the old one. This causes a duplicated creation of the session everytime the user logs itself out. PHPBB3-12360
* | | | | | | | | | | Merge branch 'ticket/mael/12361' into develop-ascraeusJoas Schilling2014-04-071-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/mael/12361: [ticket/12361] Replace the Google logo.
| * | | | | | | | | | | [ticket/12361] Replace the Google logo.Maël Soucaze2014-04-071-2/+2
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, a link to Google and its logo are displayed in the language/en/help_bbcode.php file to explain how to correctly format tags and to add an image to a post. However, the Google logo is outdated and Google does not allow the use of its logo on third-party websites. Plus, that overload their servers. I used the blue phpBB logo to replace it because the grey one with transparent background is hardly visible. Originally, I just refreshed the old Google logo with the new one (https://www.google.com/images/srpr/logo5w.png) but Joas proposed to use the phpBB logo, and I agree with him. PHPBB3-12361
* | | | | | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12358' into ↵Nils Adermann2014-04-071-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12358: [ticket/12358] Correctly check and change the redirect url for ajax requests
| * | | | | | | | | | [ticket/12358] Correctly check and change the redirect url for ajax requestsJoas Schilling2014-04-071-3/+3
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12358
* | | | | | | | | | Merge remote-tracking branch 'Marc/ticket/12150' into develop-ascraeusJoas Schilling2014-04-0611-0/+515
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/12150: [ticket/12150] Use correct license URL in prune shadow migrations file [ticket/12150] Remove 'after' for columns from migrations file [ticket/12150] Update schema files for prune shadow topics [ticket/12150] Use log service instead of add_log() function [ticket/12150] Use shorter column names for prune settings [ticket/12150] Add functional tests for pruning shadow topics [ticket/12150] Add missing space to query for shadow topics [ticket/12150] Add missing prune settings variables in acp_forums [ticket/12150] Add file and caller for pruning shadow topics [ticket/12150] Add prune columns to schema files and migration file [ticket/12150] Add options to acp
| * | | | | | | | | | [ticket/12150] Use correct license URL in prune shadow migrations fileMarc Alexander2014-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12150
| * | | | | | | | | | [ticket/12150] Remove 'after' for columns from migrations fileMarc Alexander2014-04-032-24/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12150
| * | | | | | | | | | [ticket/12150] Update schema files for prune shadow topicsMarc Alexander2014-03-301-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12150
| * | | | | | | | | | Merge branch 'develop-ascraeus' of https://github.com/phpbb/phpbb into ↵Marc Alexander2014-03-301-0/+5
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/12150
| * | | | | | | | | | | [ticket/12150] Use log service instead of add_log() functionMarc Alexander2014-03-292-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12150
| * | | | | | | | | | | [ticket/12150] Use shorter column names for prune settingsMarc Alexander2014-03-297-35/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All columns were renamed from having prune_shadow_topics as namebase to just prune_shadow. A missing column was also added to the migration file's remove_schema() method. PHPBB3-12150
| * | | | | | | | | | | [ticket/12150] Add functional tests for pruning shadow topicsMarc Alexander2014-03-291-0/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12150
| * | | | | | | | | | | [ticket/12150] Add missing space to query for shadow topicsMarc Alexander2014-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12150
| * | | | | | | | | | | [ticket/12150] Add missing prune settings variables in acp_forumsMarc Alexander2014-03-293-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12150
| * | | | | | | | | | | [ticket/12150] Add file and caller for pruning shadow topicsMarc Alexander2014-03-295-0/+218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12150
| * | | | | | | | | | | [ticket/12150] Add prune columns to schema files and migration fileMarc Alexander2014-03-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12150
| * | | | | | | | | | | [ticket/12150] Add options to acpMarc Alexander2014-03-294-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12150
* | | | | | | | | | | | Merge remote-tracking branch 'Marc/ticket/12354' into develop-ascraeusJoas Schilling2014-04-062-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/12354: [ticket/12354] Assert same instead of equal where necessary in passwords tests
| * | | | | | | | | | | [ticket/12354] Assert same instead of equal where necessary in passwords testsMarc Alexander2014-04-052-4/+4
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some tests we try to make sure that we do not get the same output in a limited timeframe. These tests should use assertSame/NotSame instead of assertEqual/NotEqual. PHPBB3-12354
* | | | | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-04-061-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | / / / / / | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12359] Remove inline width styling on UCP birthday fields Conflicts: phpBB/styles/prosilver/template/ucp_profile_profile_info.html
| * | | | | | | | | Merge remote-tracking branch 'VSEphpbb/ticket/12359' into develop-olympusAndreas Fischer2014-04-061-3/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * VSEphpbb/ticket/12359: [ticket/12359] Remove inline width styling on UCP birthday fields
| | * | | | | | | | | [ticket/12359] Remove inline width styling on UCP birthday fieldsMatt Friedman2014-04-051-3/+3
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12359
* | | | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-04-050-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | * develop-olympus:
| * | | | | | | | | Merge remote-tracking branch 'Marc/ticket/10851' into develop-olympusJoas Schilling2014-04-051-0/+4
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/10851: [ticket/10851] Set disallowed content to empty array if checking is disabled