aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12526] Fix undefined index: filesize when editing PM with attachments.Cesar G2014-05-111-1/+1
| | | | PHPBB3-12526
* [ticket/12493] Fix sql query for selection of users that have disabled PMn-aleha2014-05-071-8/+7
| | | | | | | | This fixes a bug where a user A could not send a PM to user B when both users allowed other users to send them a PM. More precisely, it fixes the selection of users that either are inactive or have disabled private messages. PHPBB3-12493
* Merge remote-tracking branch 'github-vse/ticket/12254' into develop-ascraeusNils Adermann2014-05-021-9/+14
|\ | | | | | | | | | | | | | | | | | | | | | | | | * github-vse/ticket/12254: [ticket/12254] Add subsilver2 support for cookie storage instead of SID [ticket/12254] Use a cookie instead of SID to store language selection [ticket/12254] No longer need to add change_lang to the URL params [ticket/12254] Use 'language' instead of 'set_lang' as the variable name [ticket/12254] Persist set_lang after reg only if changed from default [ticket/12254] Add set_lang var changes to subsilver2 files [ticket/12254] Use new set_lang var to avoid conflict with change_lang [ticket/12254] Stop using deprecated request_var in user class [ticket/12254] Better language switching on registration page
| * [ticket/12254] Use a cookie instead of SID to store language selectionMatt Friedman2014-05-021-2/+9
| | | | | | | | PHPBB3-12254
| * [ticket/12254] No longer need to add change_lang to the URL paramsMatt Friedman2014-04-111-5/+4
| | | | | | | | PHPBB3-12254
| * [ticket/12254] Use 'language' instead of 'set_lang' as the variable nameMatt Friedman2014-04-111-2/+2
| | | | | | | | PHPBB3-12254
| * [ticket/12254] Persist set_lang after reg only if changed from defaultMatt Friedman2014-04-071-2/+2
| | | | | | | | PHPBB3-12254
| * [ticket/12254] Use new set_lang var to avoid conflict with change_langMatt Friedman2014-04-071-3/+3
| | | | | | | | PHPBB3-12254
| * [ticket/12254] Better language switching on registration pageMatt Friedman2014-04-061-1/+0
| | | | | | | | PHPBB3-12254
* | Merge remote-tracking branch 'github-prototech/ticket/12265' into ↵Nils Adermann2014-05-021-2/+49
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-prototech/ticket/12265: [ticket/12265] Actually use $u_pm. [ticket/12265] Ensure that dropdown is always at the very left of the container [ticket/12265] Define a loop for contact icons. [ticket/12265] Break the icons that aren't in loop in case extensions add more [ticket/12265] Fix modulo logic. [ticket/12265] Adjust alignment of AIM and Jabber icons. [ticket/12265] Ensure that there's only 4 icons per row in IE & Opera. [ticket/12265] Add contact icon and remove border from last row & cells. [ticket/12265] Fix issue with dropdown being restricted by the width of parent [ticket/12265] Remove ugly logic. [ticket/12265] Simplify contact icon design and move to dropdown. Conflicts: phpBB/viewtopic.php
| * | [ticket/12265] Actually use $u_pm.Cesar G2014-04-151-1/+1
| | | | | | | | | | | | PHPBB3-12265
| * | [ticket/12265] Define a loop for contact icons.Cesar G2014-04-151-2/+49
| | | | | | | | | | | | PHPBB3-12265
* | | Merge remote-tracking branch 'github-exreaction/ticket/8323' into ↵Nils Adermann2014-05-021-16/+68
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-exreaction/ticket/8323: [ticket/8323] Cache auth request [ticket/8323] Combine into a single query [ticket/8323] Comments on phpbb_get_banned_user_ids input for test [ticket/8323] More readability in test case [ticket/8323] Comments [ticket/8323] dataProvider for the test; better test data [ticket/8323] Comments [ticket/8323] Unit test for phpbb_get_banned_user_ids [ticket/8323] Comments for inactive reasons in constants.php [ticket/8323] Only disable administrative deactivated accounts from receiving PMs [ticket/8323] Allow temporarily banned users to receive PMs, but not a notification [ticket/8323] Correct PM notification settings (only notify those who can receive them) [ticket/8323] Cleanup viewtopic code (not sure how this mess happened) [ticket/8323] Allow sending PMs to temporarily banned users [ticket/8323] Do not allow sending PMs to Inactive users [ticket/8323] Hide the Send PM link if users cannot receive the PM [ticket/8323] Correcting the comment [ticket/8323] Do not allow sending of Private Messages to users who are banned [ticket/8323] Remove code used for testing [ticket/8323] Do not allow sending of Private Messages to users who do not have permission to read private messages Conflicts: phpBB/language/en/ucp.php
| * | | [ticket/8323] Cache auth requestNathan Guse2013-09-051-2/+3
| | | | | | | | | | | | | | | | PHPBB3-8323
| * | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323Nathan Guse2013-09-0513-215/+583
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling (613) and others # Via Andreas Fischer (214) and others * 'develop' of github.com:phpbb/phpbb3: (2494 commits) [ticket/11825] Move schema_data.php into includes/ instead of phpbb/ [ticket/11215] Remove unnecessary comment [ticket/11755] MySQL upgrader out of date [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. [ticket/11823] Set up nginx server to match PHP files with characters after .php [ticket/11812] Fix empty define [ticket/11818] Update Symfony dependencies to 2.3.* [ticket/11791] Load adm/ events from styles/adm/event/ [ticket/11215] Fix helper_url_test.php tests [ticket/11215] Add newline back to .htaccess, fix wording [ticket/11215] Update comment in .htaccess [ticket/11215] Uncomment rewrite rules in .htaccess [ticket/11215] Make controller helper url() method use correct format [ticket/11215] Add commented-out URL rewrite capability to .htaccess [ticket/11821] Fix comma usage next to "You are receiving this notification". [ticket/11769] Allow using 0 as poster name [ticket/11769] Allow '0' as username [ticket/11215] Use new URL structure for controllers [ticket/11215] Everything appears to be working... ... Conflicts: phpBB/includes/functions_privmsgs.php
| * | | | [ticket/8323] Combine into a single queryNathaniel Guse2013-05-011-30/+28
| | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | [ticket/8323] CommentsNathan Guse2012-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/8323Nathan Guse2012-12-0711-53/+155
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/viewtopic.php
| * | | | | [ticket/8323] Only disable administrative deactivated accounts from ↵Nathan2012-07-101-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | receiving PMs Allow other types of inactive accounts to receive PMs. Remove the banned PM error message and use the string saying they do not have permission (less translation) PHPBB3-8323
| * | | | | [ticket/8323] Correct PM notification settings (only notify those who can ↵Nathan2012-07-101-25/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | receive them) Also correcting the way it was setup for users to be able to receive PMs (do not allow administrators/moderators to send to banned, inactive, or non-standard users, that just doesn't make sense) PHPBB3-8323
| * | | | | [ticket/8323] Allow sending PMs to temporarily banned usersNathan2012-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added an argument to the phpbb_get_banned_user_ids() function to allow specifying a banned end time (default true for current functionality, false for only permanent bans, timestamp to find banned until a specified time) PHPBB3-8323
| * | | | | [ticket/8323] Do not allow sending PMs to Inactive usersNathan2012-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | | [ticket/8323] Correcting the commentNathan2012-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | | [ticket/8323] Do not allow sending of Private Messages to users who are bannedNathan2012-07-101-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | | [ticket/8323] Remove code used for testingNathan2012-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | | [ticket/8323] Do not allow sending of Private Messages to users who do not ↵Nathan2012-07-101-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | have permission to read private messages PHPBB3-8323
* | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12273' into ↵Nils Adermann2014-05-023-10/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12273: (55 commits) [ticket/12273] Move $extension to constructor so the path is always set [ticket/12273] Find events.md relative from the path not the phpbb root [ticket/12273] Do not look in extensions docs/ and tests/ directory [ticket/12273] Also check file for adm "Location:" events [ticket/12273] Do not allow template events in non-html files [ticket/12273] Fix return description [ticket/12273] Update exporter to allow specifying an extension [ticket/12273] Allow to filter events for extensions [ticket/12273] Remove old parameter from function call [ticket/12273] Fix table header for adm events [ticket/12273] Add root path to recursive_event_filter_iterator [ticket/12273] Fix missing classes in export_events_for_wiki.php [ticket/12273] Use RecursiveDirectoryIterator with filter in php_exporter [ticket/12273] Use RecursiveDirectoryIterator in md_exporter [ticket/12273] Fix doc blocks [ticket/12273] Do not allow 3.1-A1 for template events [ticket/12273] Sort arguments alphabetically before exporting [ticket/12273] Do not allow 3.1-A1 version [ticket/12273] Update since version to 3.1.0-a* style [ticket/12273] Update existing events ...
| * | | | | | [ticket/12273] Update since version to 3.1.0-a* styleJoas Schilling2014-04-253-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Update existing eventsJoas Schilling2014-04-251-1/+10
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | PHPBB3-12273
* | | | | | [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.Andreas Fischer2014-04-297-22/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * There MUST NOT be trailing whitespace at the end of lines. * There MUST NOT be whitespace before the first content of a file. * There MUST NOT be whitespace after the last content of a file. * Functions MUST NOT contain multiple empty lines in a row. PHPBB3-12458
* | | | | | [ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backendJoas Schilling2014-04-121-1/+1
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-11917
* | | | | [ticket/12380] Explicity state the order of sorting for login keysMatt Friedman2014-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12380
* | | | | [ticket/12380] Sort Remember Me keys by last login time in UCPMatt Friedman2014-04-101-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12380
* | | | | Merge remote-tracking branch 'vsephpbb/ticket/11098' into develop-ascraeusJoas Schilling2014-04-101-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/11098: [ticket/11098] Fix error reporting on the autologin key pages [ticket/11098] Update subsilver2 to also include mark/unmark all buttons [ticket/11098] HTML Validity fix to Notifications in UCP [ticket/11098] Add mark/unmark all options to remember me keys
| * | | | | [ticket/11098] Fix error reporting on the autologin key pagesMatt Friedman2014-04-091-2/+2
| | |_|_|/ | |/| | | | | | | | | | | | | PHPBB3-11098
* | | | | [ticket/12356] Assign vars preventing Plupload from loading in PM editor.Cesar G2014-04-091-1/+3
|/ / / / | | | | | | | | | | | | PHPBB3-12356
* | | | Merge remote-tracking branch 'crizz0/ticket/9758' into develop-ascraeusJoas Schilling2014-03-312-7/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * crizz0/ticket/9758: [ticket/9758] Clickable avatar in header and renamed class for avatar-img [ticket/9758] Remove unnessary if-question for include functions_display [ticket/9758] Slims the line 4775 in includes/functions.php [ticket/9758] Adds id and changes filter to fix travis CI test [ticket/9758] Removed the needless space after first ENDIF [ticket/9758] Adding impr. for overall_header display of avatar and username [ticket/9758] Fixed bug in mcp_warn.php [ticket/9758] Optimises the html code of avatar image in header [ticket/9758] Error because of missing functions_display.php fixed [ticket/9758] Removed useless if-conditions to include functions.php [ticket/9758] Changes class name of new "span" in overall_header.html [ticket/9758] Adds global template variable CURRENT_USER_AVATAR
| * | | | [ticket/9758] Remove unnessary if-question for include functions_displayCrizzo2014-03-281-5/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-9758
| * | | | [ticket/9758] Fixed bug in mcp_warn.phpCrizzo2014-03-281-0/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-9758
| * | | | [ticket/9758] Error because of missing functions_display.php fixedCrizzo2014-03-281-0/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-9758
| * | | | [ticket/9758] Removed useless if-conditions to include functions.phpCrizzo2014-03-282-9/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-9758
| * | | | [ticket/9758] Adds global template variable CURRENT_USER_AVATARCrizzo2014-03-282-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-9758
* | | | | [ticket/12300] Make only red topic/forum row icons clickable to unread postsMatt Friedman2014-03-281-0/+2
|/ / / / | | | | | | | | | | | | PHPBB3-12300
* | | | [ticket/8309] Changing $last_activity to $last_activegeetakshi2014-03-201-1/+1
| | | | | | | | | | | | | | | | PHPBB3-8309
* | | | [ticket/8309] Removing key with similar function to avoid redundancygeetakshi2014-03-171-1/+1
| | | | | | | | | | | | | | | | PHPBB3-8309
* | | | [ticket/8309] Rename $last_visit to $last_activitygeetakshi2014-03-161-1/+1
| | | | | | | | | | | | | | | | PHPBB3-8309
* | | | [ticket/8309] Renaming "Last visit" to "Last activity"geetakshi2014-03-161-1/+1
| | | | | | | | | | | | | | | | PHPBB3-8309
* | | | [ticket/8041] Add space/tabs after => in array listJoas Schilling2014-03-131-3/+3
| | | | | | | | | | | | | | | | PHPBB3-8041
* | | | [ticket/8041] Merge item name into "Return to" string for better translationsJoas Schilling2014-03-121-2/+3
| | | | | | | | | | | | | | | | PHPBB3-8041
* | | | [ticket/12236] Move AOL Instant Messanger field to custom profile fieldJoas Schilling2014-03-052-6/+0
| | | | | | | | | | | | | | | | PHPBB3-12236