aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles
Commit message (Collapse)AuthorAgeFilesLines
...
| * | [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
* | | | Merge remote-tracking branch 'remotes/dhruv/ticket/11303' into developNathaniel Guse2013-03-094-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv # Via Dhruv * remotes/dhruv/ticket/11303: [ticket/11303] rename attribute to timezone-preselect [ticket/11303] remove additional brackets [ticket/11303] use S_TZ_PRESELECT in subsilver [ticket/11303] add S_TZ_PRESELECT template var
| * | | | [ticket/11303] rename attribute to timezone-preselectDhruv2013-02-174-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-11303
| * | | | [ticket/11303] use S_TZ_PRESELECT in subsilverDhruv2013-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11303
| * | | | [ticket/11303] add S_TZ_PRESELECT template varDhruv2013-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add a new template variable to check if timezone has already been selected by the user while registeration. PHPBB3-11303
* | | | | Merge remote-tracking branch 'remotes/nickv/ticket/11421' into developNathan Guse2013-03-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/11421: [ticket/11421] Correctly display submit button when needed
| * | | | | [ticket/11421] Correctly display submit button when neededJoas Schilling2013-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11421
* | | | | | Merge remote-tracking branch 'remotes/nickv/ticket/11417' into developNathan Guse2013-03-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/11417: [ticket/11417] FIx submit button description on notifications options page
| * | | | | | [ticket/11417] FIx submit button description on notifications options pageJoas Schilling2013-03-071-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-11417
* | | | | | Merge remote-tracking branch 'remotes/nickv/ticket/11390' into developNathan Guse2013-03-071-7/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/11390: [ticket/11390] Correctly separate list of notifications from header [ticket/11390] Hide pagination when there are no notifications
| * | | | | | [ticket/11390] Correctly separate list of notifications from headerJoas Schilling2013-03-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11390
| * | | | | | [ticket/11390] Hide pagination when there are no notificationsJoas Schilling2013-03-071-7/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-11390
* | | | | | [ticket/11407] Fix <dfn> description of "notification" option.Joas Schilling2013-03-071-1/+1
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-11407
* | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11166Joas Schilling2013-03-0655-368/+1138
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of https://github.com/phpbb/phpbb3: (799 commits) [ticket/11402] Fix undefined index in post/topic_in_queue [ticket/11400] If email is disabled, disable it for notifications [ticket/11398] Correctly call permission_set method in permission tool [ticket/11394] Relax Migration Tools [ticket/11386] Fix missing ; [ticket/10714] Get log from container in install, update and download/file [feature/avatars] Update module_auth of ucp module and fix small issues [ticket/11396] Rename insert_migration to set_migration_state [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files [ticket/11393] Give more information on database updater [ticket/11386] Send list of migrations instead of using load_migrations [feature/avatars] Add migrations data file for avatars [feature/avatars] Reduce module auth of ucp avatar settings [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/ [ticket/10714] Logs are disabled for this page call only [ticket/6723] Show info that message has been deleted before delivery [ticket/11385] Fix issue with migration module tool not getting extension module info [ticket/11386] Fix failing tests from constructor changes [ticket/11386] Fix circular reference error & serialize error [ticket/11386] Remove tests that check if finder cache is working ... Conflicts: phpBB/assets/javascript/core.js
| * \ \ \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-0414-63/+614
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/database_update.php
| | * \ \ \ \ Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathaniel Guse2013-03-022-2/+2
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander (1) and Nathaniel Guse (1) * remotes/upstream/develop-olympus: [ticket/6723] Show info that message has been deleted before delivery
| | | * | | | Merge remote-tracking branch 'remotes/marc/ticket/6723' into develop-olympusNathaniel Guse2013-03-022-2/+2
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * remotes/marc/ticket/6723: [ticket/6723] Show info that message has been deleted before delivery
| | | | * | | | [ticket/6723] Show info that message has been deleted before deliveryMarc Alexander2013-03-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the message has been deleted before the delivery it will still show in the message history, although with an empty message. This patch will change that behavior to showing the info that it has been deleted before it was delivered in red letters. The red letters ensure that users won't mistake the info for the actual message. PHPBB3-6723
| | * | | | | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathaniel Guse2013-03-021-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Nathaniel Guse (1) * remotes/upstream/develop-olympus: [ticket/11368] Fix background color for PM report rows by using accessing var.
| | | * | | | | [ticket/11368] Fix background color for PM report rows by using accessing var.Andreas Fischer2013-02-261-1/+1
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-11368
| | * | | | | [ticket/11103] Revert whitespace changesNathan Guse2013-02-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | * | | | | Merge remote-tracking branch 'remotes/VSE/ticket/11103-VSEphpbb' into ↵Nathan Guse2013-02-286-9/+25
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/11103 # By Matt Friedman # Via Matt Friedman * remotes/VSE/ticket/11103-VSEphpbb: [ticket/11103] Remove padding from notifications for now. [ticket/11103] Add newlines to bottom of css file [ticket/11103] HTML encode double arrow character [ticket/11103] Update styling of UCP Notifications in subsilver2 [ticket/11103] Update styling of UCP Notifications in prosilver [ticket/11103] Update styling of subsilver2 notification modal [ticket/11103] Update styling of prosilver notification modal [ticket/11103] Remove title attribute from notification link
| | | * | | | | [ticket/11103] Remove padding from notifications for now.Matt Friedman2013-02-272-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | | * | | | | [ticket/11103] Add newlines to bottom of css fileMatt Friedman2013-02-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | | * | | | | [ticket/11103] HTML encode double arrow characterMatt Friedman2013-02-154-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103