aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [feature/avatars] Fixup avatars.js rewriteIgor Wiedler2012-06-272-4/+4
| | | | PHPBB3-10018
* [feature/avatars] Add self-invoking closure around avatars.jsIgor Wiedler2012-06-272-0/+12
| | | | PHPBB3-10018
* [feature/avatars] Rewrite avatars event handler to use jQueryIgor Wiedler2012-06-272-24/+8
| | | | PHPBB3-10018
* [feature/avatars] Move avatars JavaScript code to external JS fileIgor Wiedler2012-06-275-64/+40
| | | | PHPBB3-10018
* [feature/avatars] Remove empty script tagIgor Wiedler2012-06-271-3/+0
| | | | PHPBB3-10018
* [feature/avatars] Remove unneeded argument for driver prepare_form()Igor Wiedler2012-06-274-7/+7
| | | | PHPBB3-10018
* [feature/avatars] Fix error in avatar_manager::clean_rowIgor Wiedler2012-06-271-1/+1
| | | | PHPBB3-10018
* Merge remote-tracking branch 'upstream/develop' into feature/avatarsIgor Wiedler2012-06-27215-1355/+2181
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (255 commits) [ticket/10935] Limit number of PM rules per user to 5000 [ticket/10801] Fixed quickmod tools. [ticket/9551] uncomment line and change length to 255 [ticket/10925] Clarify installation requirements for SQLite [ticket/10938] Serve subforum listing on forumlist from template loop [ticket/10640] Change subject length in mcp in subsilver [ticket/10640] Change subject length in MCP [ticket/10640] Do not change default value of truncate_string() [ticket/10640] Change maximum subject length [ticket/10936] remove PCRE and mbstring support check [ticket/10936] fix language key [ticket/10829] Delete T_STYLESHEET_NAME - no longer used. [ticket/10829] $style_name -> $style_path in style class. [ticket/10743] Renaming user->theme [ticket/10743] Changing obtain_cfg_items [ticket/10882] Fix test name - oops. [ticket/10931] Apply strtolower() correctly, i.e. not on false. [ticket/10931] Also test get_bytes() and get_string() with false. [ticket/10931] Make to_numeric function globally available. [ticket/10932] Use included composer.phar in build process ... Conflicts: phpBB/includes/mcp/mcp_warn.php phpBB/install/database_update.php phpBB/styles/prosilver/template/ucp_avatar_options.html
| * Merge branch 'develop-olympus' into developAndreas Fischer2012-06-212-2/+16
| |\ | | | | | | | | | | | | * develop-olympus: [ticket/10935] Limit number of PM rules per user to 5000
| | * Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-06-212-2/+16
| | |\ | | | | | | | | | | | | | | | | * prep-release-3.0.11: [ticket/10935] Limit number of PM rules per user to 5000
| | | * Merge remote-tracking branch 'nickvergessen/ticket/10935' into ↵Andreas Fischer2012-06-212-2/+16
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.11 * nickvergessen/ticket/10935: [ticket/10935] Limit number of PM rules per user to 5000
| | | | * [ticket/10935] Limit number of PM rules per user to 5000Joas Schilling2012-06-202-2/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-10935
| * | | | Merge remote-tracking branch 'callumacrae/ticket/10801' into developAndreas Fischer2012-06-201-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/10801: [ticket/10801] Fixed quickmod tools.
| | * | | | [ticket/10801] Fixed quickmod tools.Callum Macrae2012-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes 10801, 10802, 10807 and 10808. PHPBB3-10801
| * | | | | Merge remote-tracking branch 'imkingdavid/ticket/10938' into developAndreas Fischer2012-06-202-3/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/10938: [ticket/10938] Serve subforum listing on forumlist from template loop
| | * | | | | [ticket/10938] Serve subforum listing on forumlist from template loopDavid King2012-06-182-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subforum listing is available both via implode()-ed PHP loop and via template loop. The latter allows more flexibility for changing the subforum listing per style, so that is the better option. PHPBB3-10938
| * | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-06-201-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10925] Clarify installation requirements for SQLite
| | * | | | | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-06-201-1/+1
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | * prep-release-3.0.11: [ticket/10925] Clarify installation requirements for SQLite
| | | * | | | Merge remote-tracking branch 'Noxwizard/ticket/10925' into prep-release-3.0.11Andreas Fischer2012-06-201-1/+1
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | * Noxwizard/ticket/10925: [ticket/10925] Clarify installation requirements for SQLite
| | | | * | | [ticket/10925] Clarify installation requirements for SQLitePatrick Webster2012-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10925
| * | | | | | Merge PR #844 branch 'dhruvgoel92/ticket/10936' into developOleg Pudeyev2012-06-192-97/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/10936: [ticket/10936] remove PCRE and mbstring support check [ticket/10936] fix language key
| | * | | | | | [ticket/10936] remove PCRE and mbstring support checkDhruv Goel2012-06-132-95/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since PCRE UTF8 support already has a global check no need for mbstring or PCRE check here. PHPBB3-10936
| | * | | | | | [ticket/10936] fix language keyDhruv Goel2012-06-122-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Language key changes from INCOMPATIBLE_VERSION to INCOMPATIBLE_DATABASE to make it more meaningfull. PHPBB3-10936
| * | | | | | | Merge branch 'develop-olympus' into developNils Adermann2012-06-191-1/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9551] uncomment line and change length to 255
| | * | | | | | Merge remote-tracking branch 'github-dhruvgoel92/ticket/9551' into ↵Nils Adermann2012-06-191-1/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-dhruvgoel92/ticket/9551: [ticket/9551] uncomment line and change length to 255
| | | * | | | | | [ticket/9551] uncomment line and change length to 255Dhruv Goel2012-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | incase of partial collation change post_subject field will be changed back to the default collation and length 255. PHPBB3-9551
| * | | | | | | | Merge PR #571 branch 'unknownbliss/ticket/10640' into developOleg Pudeyev2012-06-187-8/+8
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * unknownbliss/ticket/10640: [ticket/10640] Change subject length in mcp in subsilver [ticket/10640] Change subject length in MCP [ticket/10640] Do not change default value of truncate_string() [ticket/10640] Change maximum subject length
| | * | | | | | | [ticket/10640] Change subject length in mcp in subsilverMichael Cullum2012-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10640
| | * | | | | | | [ticket/10640] Change subject length in MCPMichael Cullum2012-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10640
| | * | | | | | | [ticket/10640] Do not change default value of truncate_string()Joas Schilling2012-06-172-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default value should be kept, so we do not change the behaviour for MODs and Extensions that use the function with its default values. PHPBB3-10640
| | * | | | | | | [ticket/10640] Change maximum subject lengthMichael Cullum2012-06-175-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10640
| * | | | | | | | Merge pull request #779 from callumacrae/ticket/10855Nils Adermann2012-06-181-4/+34
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | [ticket/10855] Modified coding guidelines to reflect JS brace changes.
| | * | | | | | | [ticket/10855] Fixed a couple issues in coding guidelines.Callum Macrae2012-05-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10855
| | * | | | | | | [ticket/10855] Added JS camelCaps info to guidelines.Callum Macrae2012-05-031-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10855
| | * | | | | | | [ticket/10855] Added array trailing commas info in js to guidelines.Callum Macrae2012-05-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10855
| | * | | | | | | [ticket/10855] Modified coding guidelines to reflect JS brace changes.Callum Macrae2012-04-291-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Braces always go on the same line in JavaScript. PHPBB3-10855
| * | | | | | | | [ticket/10829] Delete T_STYLESHEET_NAME - no longer used.Oleg Pudeyev2012-06-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10829
| * | | | | | | | [ticket/10829] $style_name -> $style_path in style class.Oleg Pudeyev2012-06-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Here the style path is taken and the variable name should be $style_path. PHPBB3-10829
| * | | | | | | | Merge PR #839 branch 'p/ticket/10743' into developOleg Pudeyev2012-06-115-57/+43
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10743: [ticket/10743] Renaming user->theme [ticket/10743] Changing obtain_cfg_items
| | * | | | | | | | [ticket/10743] Renaming user->themeVjacheslav Trushkin2012-06-114-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming user->theme to user->style PHPBB3-10743
| | * | | | | | | | [ticket/10743] Changing obtain_cfg_itemsVjacheslav Trushkin2012-06-112-36/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing obtain_cfg_items to work only with style because other components no longer exist PHPBB3-10743
| * | | | | | | | | Merge PR #787 branch 'cyberalien/ticket/10799' into developOleg Pudeyev2012-06-112-3/+8
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10799: [ticket/10799] Removing global variable from includejs
| | * | | | | | | | [ticket/10799] Removing global variable from includejsVjacheslav Trushkin2012-05-012-3/+8
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing global $phpbb_root_path from includejs implementation PHPBB3-10799
| * | | | | | | | Merge remote-tracking branch 'github-dhruvgoel92/feature/delete-auto-logins' ↵Nils Adermann2012-06-116-0/+170
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into develop * github-dhruvgoel92/feature/delete-auto-logins: [feature-delete-auto-logins] adds module to database update [feature/delete-auto-logins] fixes style [feature/delete-auto-logins] improves styling [feature/delete-auto-logins] fixes language entry [feature/delete-auto-logins] fix language keys and styling [feature/delete-auto-logins] explain persistent keys in the ucp. [feature/delete-auto-logins] template added for subsilver2 [feature/delete-auto-logins] improved styling and fixes language [feature/delete-auto-logins] using loop for errors [feature/delete-auto-logins] fixes css corners [feature/delete-auto-logins] Fixes language entries [feature/delete-auto-logins] checks form key [feature/delete-auto-logins] Fixes language entries and redirection. [feature/delete-auto-logins] User can view/delete auto logins.
| | * | | | | | | | [feature-delete-auto-logins] adds module to database updateDhruv Goel2012-06-031-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ucp delete auto-login keys module is added to database_update.php under 3.1-dev
| | * | | | | | | | [feature/delete-auto-logins] fixes styleDhruv Goel2012-05-172-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removes reset button and some minor style fixes in subsilver2 and prosilver. PHPBB3-9647
| | * | | | | | | | [feature/delete-auto-logins] improves stylingDhruv Goel2012-05-172-43/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9647
| | * | | | | | | | [feature/delete-auto-logins] fixes language entryDhruv Goel2012-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9647
| | * | | | | | | | [feature/delete-auto-logins] fix language keys and stylingDhruv Goel2012-05-173-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | introduction of language variables instead of hardcoded language. PHPBB3-9647
| | * | | | | | | | [feature/delete-auto-logins] explain persistent keys in the ucp.Dhruv Goel2012-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a short explaination of persistent keys in edit persistent keys section PHPBB3-9647
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-30 20:08:29 +0000