aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | Merge remote-tracking branch 'Dickyf/ticket/10675' into develop-olympusIgor Wiedler2012-03-312-1/+9
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Dickyf/ticket/10675: [Ticket/10675] Correct language string ATTACH_DISK_FULL [ticket/10675] Add disk full language string when posting attachments
| | | * | | | | | | [Ticket/10675] Correct language string ATTACH_DISK_FULLRichard Foote2012-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add period to ATTACH_DISK_FULL language string PHPBB3-10675
| | | * | | | | | | [ticket/10675] Add disk full language string when posting attachmentsRichard Foote2012-03-192-1/+9
| | | | |_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add language string visible by admins only for when the disk does not have enough free space to upload attachments. PHPBB3-10675
| | * | | | | | | Merge pull request #668 from unknownbliss/feature/events-dispatcher-olympusIgor Wiedler2012-03-301-0/+1
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Feature/events dispatcher olympus
| | | * | | | | | | [feature/event-dispatcher] Adding composer.phar to .gitignore for olympusMichael Cullum2012-03-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To keep the .gitignore's the same. PHPBB3-9550
| * | | | | | | | | Merge remote-tracking branch 'github-igorw/feature/class-prefix' into developNils Adermann2012-03-3122-875/+879
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-igorw/feature/class-prefix: [feature/class-prefix] Rename auth => phpbb_auth [feature/class-prefix] Rename user and session to phpbb_*
| | * | | | | | | | | [feature/class-prefix] Rename auth => phpbb_authIgor Wiedler2012-03-3111-15/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10609
| | * | | | | | | | | [feature/class-prefix] Rename user and session to phpbb_*Igor Wiedler2012-03-3114-860/+867
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB-10609
| * | | | | | | | | | Merge pull request #676 from cyberalien/feature/merging-style-componentsIgor Wiedler2012-03-311-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [feature/merging-style-components] Fixing typos in database updater
| | * | | | | | | | | | [feature/merging-style-components] Fixing typos in database updaterVjacheslav Trushkin2012-03-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Yes, I failed... again. Fixing 2 more typos in database_update.php PHPBB3-10632
| * | | | | | | | | | | Merge pull request #675 from cyberalien/feature/merging-style-componentsIgor Wiedler2012-03-311-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | / / / / / / / / / | | |/ / / / / / / / / | |/| | | | | | | | | [feature/merging-style-components] Fixing typo in database updater
| | * | | | | | | | | [feature/merging-style-components] Fixing typo in database updaterVjacheslav Trushkin2012-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing typo in database_update.php PHPBB3-10632
| * | | | | | | | | | Merge remote-tracking branch 'cyberalien/feature/merging-style-components' ↵Igor Wiedler2012-03-3155-3718/+1824
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into develop * cyberalien/feature/merging-style-components: (31 commits) [feature/merging-style-components] Fix back link on install page [feature/merging-style-components] Fix for unit tests [feature/merging-style-components] Moving template initialization out of style [feature/merging-style-components] Renaming "delete" to "uninstall" for styles [feature/merging-style-components] Initializing locator and provider separately [feature/merging-style-components] Fixing few errors in acp_styles [feature/merging-style-components] Fix notices in acp_styles [feature/merging-style-components] Updating styles in coding guidelines [feature/merging-style-components] Changing acp_styles text [feature/merging-style-components] Updating test cases [feature/merging-style-components] Updating style initialization [feature/merging-style-components] Changing style class [feature/merging-style-components] Changing template class [feature/merging-style-components] Changing resource locator [feature/merging-style-components] Changing path provider [feature/merging-style-components] Renaming style locator [feature/merging-style-components] Changing $style to $style_id [feature/merging-style-components] Creating style class [feature/merging-style-components] New acp_styles template [feature/merging-style-components] New acp_styles ...
| | * | | | | | | | | [feature/merging-style-components] Fix back link on install pageIgor Wiedler2012-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When on install page and all styles are installed, fix back link to go to main styles page. PHPBB3-10632
| | * | | | | | | | | [feature/merging-style-components] Fix for unit testsVjacheslav Trushkin2012-03-312-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing typo in template unit tests PHPBB3-10632
| | * | | | | | | | | [feature/merging-style-components] Moving template initialization out of styleVjacheslav Trushkin2012-03-317-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving template initialization out of style constructor PHPBB3-10632
| | * | | | | | | | | [feature/merging-style-components] Renaming "delete" to "uninstall" for stylesVjacheslav Trushkin2012-03-312-34/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing from "delete" to "uninstall" in acp_styles to avoid confusing users PHPBB3-10632
| | * | | | | | | | | [feature/merging-style-components] Initializing locator and provider separatelyVjacheslav Trushkin2012-03-317-17/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving locator and path provider initialization out of style class PHPBB3-10632
| | * | | | | | | | | [feature/merging-style-components] Fixing few errors in acp_stylesVjacheslav Trushkin2012-03-311-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing notices and usability issues PHPBB3-10632
| | * | | | | | | | | [feature/merging-style-components] Fix notices in acp_stylesIgor Wiedler2012-03-311-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10632
| | * | | | | | | | | [feature/merging-style-components] Updating styles in coding guidelinesVjacheslav Trushkin2012-03-311-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updating styles section in coding guidelines PHPBB3-10632
| | * | | | | | | | | Merge branch 'develop' into feature/merging-style-componentsVjacheslav Trushkin2012-03-3181-627/+1716
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (175 commits) [feature/ajax] Remove strange non-breaking spaces from approve button [feature/ajax] Add entirely unrelated but nice newlines [feature/ajax] Unify phpbb_json_response instantiation [feature/ajax] Fix acp_styles activate_deactivate ajax callback name [feature/ajax] Send correct activate/deactivate JSON response in acp_profile [ticket/10270] Alter background colors for posts [feature/ajax] Remove not working module enable/disable ajax code [feature/ajax] Replace static call to phpbb_request with OO [feature/ajax] Remove quick-reply AJAX handling until we have something good [ticket/10270] Changing close button for ajax popups [ticket/10270] Disabling links in disappearing content [ticket/10291] Fixed an AJAX bug on quick reply form submit. [ticket/10273] Fixed accepting / denying posts AJAX. [ticket/10272] Removed code that was prevent event propogation in AJAX. [ticket/10291] Fixed a bug in the quick reply AJAX. [feature/ajax] Handle acp_modules error cases with JSON response [feature/ajax] Fix filter check, quick mod tools data-attribute [feature/ajax] Use the error handler [feature/ajax] Generic error handling with a phpbb.alert box [feature/ajax] Change filter semantics, some minor adjustments ... Conflicts: phpBB/adm/style/acp_styles.html phpBB/includes/acp/acp_styles.php
| | * | | | | | | | | [feature/merging-style-components] Changing acp_styles textVjacheslav Trushkin2012-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing acp styles welcome message a little bit. PHPBB3-10632
| | * | | | | | | | | Merge remote-tracking branch 'upstream/develop' into ↵Vjacheslav Trushkin2012-03-2965-97/+766
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/merging-style-components * upstream/develop: (65 commits) [ticket/10730] Added label tag around "select" text in post splitting UI [ticket/10732] Add config_dev.php and config_test.php to .gitignore [ticket/10586] Added space in if statement [ticket/10586] Tidy up comments [task/php5.3] Updated range of tested PHP versions [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2 [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2 [ticket/10723] Stop Travis running all tests on sqlite [ticket/10703] Added a condition to check if ext directory exists [task/travis] Refactor php version check for dbunit install [task/travis] Exclude functional and slow tests [ticket/10719] Revert "Skip functional tests on PHP 5.2" [task/travis-develop2] Update version from 5.3 to 5.3.2 [task/travis] Dropping support for 5.2 in develop branch [task/travis] Some more small travis fixes [task/travis] Rename travis phpunit config files [task/travis] Fixing some travis issues [ticket/10684] Adjust function and parameter name, minor changes. [task/travis] Add automated testing to readme [task/travis] Removing development information ... Conflicts: phpBB/install/database_update.php
| | * | | | | | | | | | [feature/merging-style-components] Updating test casesVjacheslav Trushkin2012-03-154-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updating code in test cases for new template classes. PHPBB3-10632
| | * | | | | | | | | | [feature/merging-style-components] Updating style initializationVjacheslav Trushkin2012-03-156-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing template initialization to style initialization. PHPBB3-10632
| | * | | | | | | | | | [feature/merging-style-components] Changing style classVjacheslav Trushkin2012-03-151-5/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving functions that deal with styles from template to style class, updating docblocks PHPBB3-10632
| | * | | | | | | | | | [feature/merging-style-components] Changing template classVjacheslav Trushkin2012-03-151-65/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing functions that are now handled by phpbb_style class, allowing to write $context, updating docblocks PHPBB3-10632
| | * | | | | | | | | | [feature/merging-style-components] Changing resource locatorVjacheslav Trushkin2012-03-151-27/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing "template" to "style" in all functions that deal with styles, changing error messages, updating docblocks PHPBB3-10632
| | * | | | | | | | | | [feature/merging-style-components] Changing path providerVjacheslav Trushkin2012-03-153-83/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing set_templates() to set_style() and removing second parameter, changing get_main_template_path() to get_main_style_path(), removing template_root_for_style(), updating docblocks PHPBB3-10632
| | * | | | | | | | | | [feature/merging-style-components] Renaming style locatorVjacheslav Trushkin2012-03-153-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming style locator to style resource locator PHPBB3-10632
| | * | | | | | | | | | [feature/merging-style-components] Changing $style to $style_idVjacheslav Trushkin2012-03-151-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing $style to $style_id in user::setup to avoid conflict with new global style variable PHPBB3-10632
| | * | | | | | | | | | [feature/merging-style-components] Creating style classVjacheslav Trushkin2012-03-157-22/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creating phpbb_style class, changing template initialization to style initialization PHPBB3-10632
| | * | | | | | | | | | [feature/merging-style-components] New acp_styles templateVjacheslav Trushkin2012-03-151-355/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New acp_styles.html, completely rewritten PHPBB3-10632
| | * | | | | | | | | | [feature/merging-style-components] New acp_stylesVjacheslav Trushkin2012-03-142-2246/+949
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New acp_styles, completely rewritten PHPBB3-10632
| | * | | | | | | | | | [feature/merging-style-components] Adding new language variablesVjacheslav Trushkin2012-03-142-38/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding new language variables for acp_styles and removing some unused variables PHPBB3-10632
| | * | | | | | | | | | [feature/merging-style-components] Adjusting unit testsVjacheslav Trushkin2012-03-142-14/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjusting unit tests for new styles table structure PHPBB3-10632
| | * | | | | | | | | | [feature/merging-style-components] Admin.css additions for acp_stylesVjacheslav Trushkin2012-03-141-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding background colors for row iterations and font color for disabled rows to admin control panel css. PHPBB3-10632
| | * | | | | | | | | | [feature/merging-style-components] Adding template information to style.cfgVjacheslav Trushkin2012-03-142-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding template data to style.cfg and removing obsolete comments PHPBB3-10632
| | * | | | | | | | | | [feature/merging-style-components] Removing theme.cfg and template.cfgVjacheslav Trushkin2012-03-144-99/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing theme.cfg and template.cfg PHPBB3-10632
| | * | | | | | | | | | [feature/merging-style-components] Updating coding guidelinesVjacheslav Trushkin2012-03-141-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updating template inheritance section in coding guidelines PHPBB3-10632
| | * | | | | | | | | | [feature/merging-style-components] Updating PHP filesVjacheslav Trushkin2012-03-142-21/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing theme and template entries in all files, except for acp styles section PHPBB3-10632
| | * | | | | | | | | | [feature/merging-style-components] Implementing unlimited parent templatesVjacheslav Trushkin2012-03-141-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implementing possibility of unlimited levels of parent templates. Paths are stored in style_parent_tree, entries are separated by / PHPBB3-10632
| | * | | | | | | | | | [feature/merging-style-components] Updating database and acp modulesVjacheslav Trushkin2012-03-1412-455/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing theme and template tables, adding new columns to styles table, deleting acp modules, deleting code that updates theme in updater PHPBB3-10632
| | * | | | | | | | | | [feature/merging-style-components] Renaming template classesVjacheslav Trushkin2012-03-1419-57/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing template classes prefixes from phpbb_template to phpbb_style (for classes that will work with styles) or phpbb_style_template (for classes that are specific to templates) PHPBB3-10632
| | * | | | | | | | | | [feature/merging-style-components] Moving template classes to styleVjacheslav Trushkin2012-03-1411-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving includes/template/ to includes/style/, adding template_ prefix to classes that deal only with templates PHPBB3-10632
* | | | | | | | | | | | [ticket/10734] Fixed minor bugShibu Lijack2012-04-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed an extra empty line in colors.css PHPBB-10734
* | | | | | | | | | | | [ticket/10734] Removed unwanted color elementsShibu Lijack2012-04-101-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deleted all the color elements from the common.css PHPBB-10734
* | | | | | | | | | | | [ticket/10734] Moved style elements and fixed minor bugsShibu Lijack2012-04-095-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved color related style elements to colours.css and other elements to common.css Also added an empty display for corners span. Removed unwanted space in mcp_topic Removed DS_Store PHPBB-10734
* | | | | | | | | | | | [ticket/10734] Fixed cp cssShibu Lijack2012-04-023-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed border radius and padding of the ucp and mcp. PHPBB-10734
generated by cgit v1.2.1 (git 2.21.0) at 2025-08-19 12:00:26 +0000