aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/memberlist.php
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323Nathan Guse2013-09-051-34/+49
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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] CommentsNathan Guse2012-12-071-6/+15
| | | | | | | | | | | | | | | | PHPBB3-8323
| * | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/8323Nathan Guse2012-12-071-5/+40
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/viewtopic.php
| * | | | [ticket/8323] Only disable administrative deactivated accounts from ↵Nathan2012-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Hide the Send PM link if users cannot receive the PMNathan2012-07-101-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated memberlist/viewtopic to the new rules PHPBB3-8323
* | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12273' into ↵Nils Adermann2014-05-021-3/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | [ticket/12273] Update existing eventsJoas Schilling2014-04-251-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | [ticket/12273] Fix long $vars lines for existing eventsJoas Schilling2014-04-241-1/+2
| | |_|_|/ | |/| | | | | | | | | | | | | PHPBB3-12273
* | | | | [ticket/12052] Use different visibility when post was editedJoas Schilling2014-04-251-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | ... and needs to be reapproved. PHPBB3-12052
* | | | [ticket/12364] Add template identifier var to all missing pagesPayBas2014-04-061-0/+3
| | | | | | | | | | | | | | | | PHPBB3-12364
* | | | Merge remote-tracking branch 'Elsensee/ticket/7707' into develop-ascraeusJoas Schilling2014-04-051-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/7707: [ticket/7707] Fix undefined variable: perm_from [ticket/7707] Add comma to last entry of arrays [ticket/7707] Remove unnecessary variables [ticket/7707] Add get_username_string() once more [ticket/7707] Remove unnecessary variables [ticket/7707] Add get_username_string() where possible
| * | | | [ticket/7707] Add comma to last entry of arraysOliver Schramm2014-04-011-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-7707
| * | | | [ticket/7707] Add get_username_string() where possibleOliver Schramm2014-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-7707
* | | | | Merge branch 'ticket/lucifer4o/12276' into develop-ascraeusJoas Schilling2014-03-291-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/lucifer4o/12276: [ticket/12276] Expand core.memberlist_view_profile [ticket/12276] Expand core.memberlist_view_profile
| * | | | | [ticket/12276] Expand core.memberlist_view_profilelucifer4o2014-03-291-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expand core.memberlist_view_profile to include zebra states PHPBB3-12276
| * | | | | [ticket/12276] Expand core.memberlist_view_profilelucifer4o2014-03-171-1/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Expand core.memberlist_view_profile to include zebra states PHPBB3-12276
* | | | | [ticket/11336] Adds 301 info to redirectCrizzo2014-03-281-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11336
* | | | | [ticket/11336] Adds redirect for old "leaders" modeCrizzo2014-03-281-0/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-11336
* | | | | [ticket/11336] Changes "leaders"-mode to "team"-mode and so in test-fileCrizzo2014-03-281-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11336
* | | | | Merge remote-tracking branch 'geetakshi/ticket/11360' into develop-ascraeusJoas Schilling2014-03-281-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * geetakshi/ticket/11360: [ticket/11360] Updating default value of $display_online_list [ticket/11360] Avoiding online list where not required [ticket/11360] Change second parameter in page_header function
| * | | | | [ticket/11360] Change second parameter in page_header functiongeetakshi2014-03-191-1/+1
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-11360
* | | | | [ticket/8309] Changing $last_activity to $last_activegeetakshi2014-03-201-3/+3
| | | | | | | | | | | | | | | | | | | | 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-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-8309
* | | | | [ticket/8309] Renaming "Last visit" to "Last activity"geetakshi2014-03-161-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-8309
* | | | [ticket/12236] Move AOL Instant Messanger field to custom profile fieldJoas Schilling2014-03-051-22/+3
| | | | | | | | | | | | | | | | PHPBB3-12236
* | | | [ticket/12237] Convert yahoo messanger to custom profile fieldJoas Schilling2014-03-051-12/+3
| | | | | | | | | | | | | | | | PHPBB3-12237
* | | | [ticket/12235] Convert WLM to custom profile fieldJoas Schilling2014-03-041-19/+3
| | | | | | | | | | | | | | | | PHPBB3-12235
* | | | [ticket/12187] Do not make clickable when using as contact fieldJoas Schilling2014-03-041-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12187
* | | | [ticket/12187] Split generate_profile_fields_template() into 2 methodsJoas Schilling2014-03-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Removing the mode switch that wraps the content of the method PHPBB3-12187
* | | | [ticket/12187] Remove user_website functionalityJoas Schilling2014-03-031-7/+2
| | | | | | | | | | | | | | | | PHPBB3-12187
* | | | [ticket/12234] Replace ICQ with custom profile fieldJoas Schilling2014-02-281-13/+3
| | | | | | | | | | | | | | | | PHPBB3-12234
* | | | Merge pull request #2002 from prototech/ticket/12153Nathan Guse2014-02-181-1/+0
|\ \ \ \ | | | | | | | | | | [ticket/12153] Assign PAGE_NUMBER in pagination.generate_template_pagination()
| * | | | [ticket/12153] Remove redundant calls to pagination.on_page().Cesar G2014-02-031-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12153
* | | | | [ticket/12169] Split mode==headline into it's own functionJoas Schilling2014-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12169
* | | | | [ticket/12169] Add new option to display profile fields on memberlistJoas Schilling2014-02-101-3/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12169
* | | | | [ticket/12169] Allow displaying profile fields on memberlistJoas Schilling2014-02-101-7/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can not sort by profile field values atm. And also I'm not sure whether this is possible at all. PHPBB3-12169
* | | | | [ticket/12115] Also port user interests to profile fieldsJoas Schilling2014-02-061-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12115
* | | | | [ticket/12115] Convert user occupation to a profile fieldJoas Schilling2014-02-061-1/+0
|/ / / / | | | | | | | | | | | | PHPBB3-12115
* | | | [ticket/11201] Rename profilefields class to managerJoas Schilling2014-02-021-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11201
* | | | [ticket/11201] Make profile field classes autoloadableJoas Schilling2014-01-101-4/+2
| | | | | | | | | | | | | | | | PHPBB3-11201
* | | | [ticket/11849] Update search and memberlistJoas Schilling2013-12-181-2/+5
| | | | | | | | | | | | | | | | PHPBB3-11849
* | | | Merge pull request #1654 from rechosen/ticket/11786Nathan Guse2013-10-031-1/+1
|\ \ \ \ | | | | | | | | | | [ticket/11786] Fix various defects in PHPDoc in-code documentation
| * | | | [ticket/11786] Fix PHPDoc documentation of a few eventsrechosen2013-08-131-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some PHPDoc errors I noticed while working on the karma extension. Mostly spacing issues or omitted characters, though there was one description that made no sense at all. PHPBB3-11786
* | | | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-161-11/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-phpbb/develop: (586 commits) [ticket/11735] Display disabled checkbox in subsilver for read notifications [ticket/11735] Display disabled checkbox when notification is already read [ticket/11844] update acp/authentication language var [ticket/11795] Remove PM popup [ticket/11795] Remove outdated comment from forum_fn.js [ticket/11795] Move find user JS to forum_fn [ticket/11795] Replace TWIG with phpBB syntax in ACP [ticket/11795] Move MSN scripts to forum_fn.js [ticket/11795] Use phpBB template syntax instead of TWIG [ticket/11795] Move PM popup JS to forum_fn.js [ticket/11795] Get rid of pagination JS variables [ticket/11795] Get rid of onload_functions [ticket/11795] Use data-reset-on-edit attr to reset elements [ticket/11795] Redo form elements auto-focus [ticket/11811] Remove outline on :focus [ticket/11836] Fix subsilver fatal error [ticket/11837] Replace escaped single quote with utf-8 single quote [ticket/11836] Fix fatal error on unsupported provider for auth link [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED [ticket/11809] Ensure code.js is first script included after jQuery ... Conflicts: phpBB/config/services.yml phpBB/develop/create_schema_files.php phpBB/develop/mysql_upgrader.php phpBB/download/file.php phpBB/includes/bbcode.php phpBB/includes/functions_container.php phpBB/install/database_update.php phpBB/install/index.php phpBB/phpbb/controller/helper.php phpBB/phpbb/controller/resolver.php phpBB/phpbb/request/request_interface.php phpBB/phpbb/session.php phpBB/phpbb/style/extension_path_provider.php phpBB/phpbb/style/path_provider.php phpBB/phpbb/style/path_provider_interface.php phpBB/phpbb/style/resource_locator.php phpBB/phpbb/style/style.php phpBB/phpbb/template/locator.php phpBB/phpbb/template/template.php phpBB/phpbb/template/twig/node/includeasset.php phpBB/phpbb/template/twig/node/includecss.php phpBB/phpbb/template/twig/node/includejs.php phpBB/phpbb/template/twig/twig.php tests/controller/helper_url_test.php tests/di/create_container_test.php tests/extension/style_path_provider_test.php tests/notification/notification_test.php tests/session/continue_test.php tests/session/creation_test.php tests/template/template_events_test.php tests/template/template_test_case.php tests/template/template_test_case_with_tree.php tests/test_framework/phpbb_functional_test_case.php
| * | | Merge remote-tracking branch 'brunoais/ticket/11656' into developJoas Schilling2013-07-241-11/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/11656: [ticket/11656] Made the check for the bitfield just like other PR's [ticket/11656] Wrong bitwise OR [ticket/11656] Remove line break in function call [ticket/11656] generate_text_for_display on memberlist.php