aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' ↵Nathan Guse2013-05-201-0/+99
|\ | | | | | | | | | | | | | | | | | | | | into develop # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/feature/editor-code-tabs: [feature/editor-code-tabs] Adjust code style to match guidelines [feature/editor-code-tabs] Correctly calculate end tag location [feature/editor-code-tabs] Allow tabs when typing code
| * [feature/editor-code-tabs] Adjust code style to match guidelinesVjacheslav Trushkin2013-05-201-4/+2
| | | | | | | | PHPBB3-11557
| * [feature/editor-code-tabs] Correctly calculate end tag locationVjacheslav Trushkin2013-05-201-3/+6
| | | | | | | | PHPBB3-11557
| * [feature/editor-code-tabs] Allow tabs when typing codeVjacheslav Trushkin2013-05-191-0/+98
| | | | | | | | | | | | | | Allow tabs when typing code in textarea Keep indentation when typing code in textarea PHPBB3-11557
* | Merge remote-tracking branch 'remotes/cyberalien/ticket/11558' into developNathan Guse2013-05-202-2/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11558: [ticket/11558] Adjustments for notification link [ticket/11558] Fix styling for notifications link
| * | [ticket/11558] Adjustments for notification linkVjacheslav Trushkin2013-05-203-12/+5
| | | | | | | | | | | | PHPBB3-11558
| * | [ticket/11558] Fix styling for notifications linkVjacheslav Trushkin2013-05-193-1/+21
| |/ | | | | | | PHPBB3-11558
* | Merge remote-tracking branch 'remotes/cyberalien/ticket/11489' into developNathan Guse2013-05-2020-283/+395
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11489: [ticket/11489] IE7 adjustments [ticket/11489] Template changes for new topiclist layout [ticket/11489] CSS changes for topiclist lists
| * | [ticket/11489] IE7 adjustmentsVjacheslav Trushkin2013-05-202-5/+18
| | | | | | | | | | | | PHPBB3-11489
| * | [ticket/11489] Template changes for new topiclist layoutVjacheslav Trushkin2013-05-1416-207/+267
| | | | | | | | | | | | PHPBB3-11489
| * | [ticket/11489] CSS changes for topiclist listsVjacheslav Trushkin2013-05-143-75/+114
| |/ | | | | | | PHPBB3-11489
* | Merge remote-tracking branch 'remotes/cyberalien/ticket/11556' into developNathan Guse2013-05-203-42/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11556: [ticket/11556] Load apply_onkeypress_event() correctly [ticket/11556] Remove fallback JS
| * | [ticket/11556] Load apply_onkeypress_event() correctlyVjacheslav Trushkin2013-05-203-11/+2
| | | | | | | | | | | | PHPBB3-11556
| * | [ticket/11556] Remove fallback JSVjacheslav Trushkin2013-05-191-32/+13
| | | | | | | | | | | | PHPBB3-11556
* | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11554' into developNathaniel Guse2013-05-195-11/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11554: [ticket/11554] Move forum_fn.js to footer
| * | [ticket/11554] Move forum_fn.js to footerVjacheslav Trushkin2013-05-195-11/+10
| |/ | | | | | | | | | | Move forum_fn.js to footer, move find_username to forum_fn.js PHPBB3-11554
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-191-9/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11537] Adjust error message on ucp group manage to fit rest of ucp Conflicts: phpBB/styles/prosilver/template/ucp_groups_manage.html
| * | [ticket/11537] Adjust error message on ucp group manage to fit rest of ucpMarc Alexander2013-05-141-9/+8
| | | | | | | | | | | | | | | | | | | | | The current look highly differed from the rest of the UCP. Additionally, this caused the error message to be hardly noticeable at all. PHPBB3-11537
* | | [ticket/11555] Fix page comparisonVjacheslav Trushkin2013-05-191-1/+1
| |/ |/| | | | | | | | | Strict comparison should not be used to compare string and number PHPBB3-11555
* | Merge remote-tracking branch 'remotes/cyberalien/ticket/11533' into developNathan Guse2013-05-122-157/+140
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11533: [ticket/11533] Update unit tests [ticket/11533] Fix colspan and unnecessary tables [ticket/11533] Change list to table for notification settings [ticket/11533] Columns counter for notification settings
| * | [ticket/11533] Fix colspan and unnecessary tablesVjacheslav Trushkin2013-05-111-123/+115
| | | | | | | | | | | | | | | | | | | | | Fix colspan and remove unnecessary tables in notification settings page in subsilver2. PHPBB3-11533
| * | [ticket/11533] Change list to table for notification settingsVjacheslav Trushkin2013-05-111-34/+25
| | | | | | | | | | | | PHPBB3-11533
* | | Merge remote-tracking branch 'remotes/cyberalien/ticket/10741' into developNathaniel Guse2013-05-111-0/+9
|\ \ \ | |/ / |/| |
| * | [ticket/10741] Do not resize textarea.no-auto-resizeVjacheslav Trushkin2013-04-121-1/+1
| | | | | | | | | | | | | | | | | | Do not auto-resize textareas with class .no-auto-resize PHPBB3-10741
| * | [ticket/10741] Automatically resize textareas in prosilver and ACPVjacheslav Trushkin2013-04-121-0/+9
| | | | | | | | | | | | | | | | | | Automatically resize textareas in prosilver and ACP. PHPBB3-10741
* | | [ticket/11442] Do not suggest an option on ajax confirm boxJoas Schilling2013-05-082-2/+2
| | | | | | | | | | | | | | | | | | | | | Reverting commit cb13add269b78e1a9ac84a80c78557bb7695df09 Also fixing in prosilver and subsilver2 PHPBB3-11442
* | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-062-20/+33
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11144] Add missing {FORUM_NAME} variable [ticket/11144] Add missing {FORUM_NAME} variable Conflicts: phpBB/download/file.php phpBB/styles/prosilver/template/login_forum.html
| * | [ticket/11144] Add missing {FORUM_NAME} variableGaëtan Muller2013-05-062-20/+33
| | | | | | | | | | | | | | | | | | | | | The template variable {FORUM_NAME} was missing from the login page of a password protected forum PHPBB3-11144
* | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11275' into developNathaniel Guse2013-04-252-39/+44
|\ \ \
| * | | [ticket/11275] Do not use spacer.gif in color pickerVjacheslav Trushkin2013-04-121-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11275
| * | | [ticket/11275] Do not use document.write() for color paletteVjacheslav Trushkin2013-04-122-39/+44
| | |/ | |/| | | | | | | | | | | | | Replace document.write() for color palette function PHPBB3-11275
* | | Merge remote-tracking branch 'remotes/cyberalien/ticket/4412' into developNathaniel Guse2013-04-252-0/+7
|\ \ \
| * | | [ticket/4412] Shorten long profile fieldsVjacheslav Trushkin2013-04-112-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Shorten long profile fields using CSS PHPBB3-4412
* | | | [ticket/11129] Added headers to empty subscription stateasperous2013-04-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Added a newline to better seperate the two headers. PHPBB3-11129
* | | | [ticket/11129] Added headers to empty subscription stateasperous2013-04-231-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "You are not subscribed to any forums". While correct, could lead to confusion. What's missing is a header right above the message that says "Watched Topics" to match the "Watched Forums" header above. This will assert the idea that there are two separate watchable sections. As is, it looks like that message is talking about the "Watched Forums" section, since it's listed under that header. PHPBB3-11129
* | | | Merge remote-tracking branch 'hjpotter92/ticket/11225' into developAndreas Fischer2013-04-131-19/+0
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | * hjpotter92/ticket/11225: [ticket/11225] Deletion of unused mcp_jumpbox.html file
| * | | [ticket/11225] Deletion of unused mcp_jumpbox.html filehjpotter922013-04-111-19/+0
| |/ / | | | | | | | | | | | | | | | The file/template is no longer used(as mentioned in it). PHPBB3-11225
* | | Merge pull request #1184 from marc1706/ticket/11314Nils Adermann2013-04-126-506/+314
|\ \ \ | |/ / |/| | [ticket/11314] Improve readability and code cleanup in new JavaScript files
| * | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314Marc Alexander2013-03-2635-254/+967
| |\ \ | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/prosilver/template/timezone.js
| * | | [ticket/11314] Modify files to comply with coding standardsMarc Alexander2013-03-264-423/+201
| | | | | | | | | | | | | | | | PHPBB3-11314
| * | | [ticket/11314] Fix issues mentioned in jshint reportMarc Alexander2013-03-265-143/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally, the editor.js files are now the same file in both subsilver2, prosilver, and the acp. PHPBB3-11314
| * | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314Marc Alexander2013-02-2712-86/+119
| |\ \ \
| * | | | [ticket/11314] Add missing radix parametersMarc Alexander2013-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11314
| * | | | [ticket/11314] Fix whitespace issuesMarc Alexander2013-01-121-3/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11314
| * | | | [ticket/11314] Add missing "use strict" to timezone.js filesMarc Alexander2013-01-102-0/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-11314
| * | | | [ticket/11314] Use return variable instead of overusing the return keywordMarc Alexander2013-01-101-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a return variable and modify it to our needs. PHPBB3-11314
* | | | | Merge pull request #1312 from VSEphpbb/ticket/11463Nils Adermann2013-04-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | [ticket/11463] Add title attribute to topics in search results
| * | | | | [ticket/11463] Add title attribute to topics in search resultsMatt Friedman2013-03-201-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use this title attribute in viewforum_body.html, but not in search_results.html. Perhaps we should, as this will maintain consitency between all these topic view pages. PHPBB3-11463
* | | | | [ticket/11461] Add template event in the footer of view topic pagesMatt Friedman2013-03-192-0/+2
|/ / / / | | | | | | | | | | | | PHPBB3-11461
* | | | [ticket/11433] Rename CSS class "jalert" to "phpbb_alert"Marc Alexander2013-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This missing change caused the loading info to appear during ajax requests. With this patch it will be properly hidden as it should. PHPBB3-11433