aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2012-04-081-1/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10561] Removed extra tabs, changes made to $db->sql_query() [ticket/10561] Changed $temp_style_id to $style_id [ticket/10561] Added function desc for phpbb_style_is_active() [ticket/10561] Casted $config['default_style'] to int [ticket/10561] Reverted to phpbb_style_is_active() [ticket/10561] Added to database_update:database_update_info() [ticket/10561] Added section in database_update.php [ticket/10561] Moved and renamed the funtion validate_style(). [ticket/10561] Fixed syntax error and renamed return variables. [ticket/10561] Changes made to $db->sql_fetchrow(). [ticket/10561] Changes made to function phpbb_style_is_active(). [ticket/10561] All users can choose deactivated styles (fixed). Conflicts: phpBB/install/database_update.php
| * [ticket/10561] Casted $config['default_style'] to intHari Sankar R2012-04-091-1/+1
| | | | | | | | PHPBB3-10561
| * [ticket/10561] Reverted to phpbb_style_is_active()Hari Sankar R2012-04-071-2/+2
| | | | | | | | | | | | Changes made to function name, reverted to old. PHPBB3-10561
| * [ticket/10561] Moved and renamed the funtion validate_style().Hari Sankar R2012-04-051-2/+8
| | | | | | | | | | | | Fixed minor changes as suggested by @bantu. PHPBB3-10561
| * [ticket/10561] Changes made to function phpbb_style_is_active().Hari Sankar R2012-04-031-1/+1
| | | | | | | | | | | | | | Fixed return type, documented function and, removed style_id from fetch. PHPBB3-10561
| * [ticket/10561] All users can choose deactivated styles (fixed).Hari Sankar R2012-04-031-1/+2
| | | | | | | | | | | | | | | | A form exploit enabled the users to select a deactivated style. Fixed with extra check on submit, with a new function styles_verify to check if the selected style is activated or not. PHPBB3-10561
* | [feature/class-prefix] Rename auth => phpbb_authIgor Wiedler2012-03-311-1/+1
| | | | | | | | PHPBB3-10609
* | [ticket/10328] Renamed the JSON class, also now using autoloading.Callum Macrae2012-03-311-6/+18
| | | | | | | | | | | | | | It is no longer static, and uses autoloading. It has also been renamed from JSON to phpbb_json_response. PHPBB3-10328
* | [ticket/10272] Zebra operations using AJAX are now less hacky.Callum Macrae2012-03-311-0/+4
| | | | | | | | | | | | | | Before, they were splitting stuff by the <br />, and now JSON::add() is being used. PHPBB3-10272
* | Merge remote-tracking branch 'imkingdavid/ticket/10535' into developOleg Pudeyev2012-02-032-16/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/10535: [ticket/10535] Delete no longer needed email confirm language entries. [ticket/10535] Delete email confirm from installer [ticket/10535] Removed email confirm field from acp_users module [ticket/10535] Forgot a subsilver2 change. *doh* [ticket/10535] Removed email confirm from UCP, removed unused language entries [ticket/10535] Remove email confirm check on registration form
| * | [ticket/10535] Removed email confirm from UCP, removed unused language entriesDavid King2011-12-151-7/+0
| | | | | | | | | | | | PHPBB3-10535
| * | [ticket/10535] Remove email confirm check on registration formDavid King2011-12-151-9/+0
| | | | | | | | | | | | PHPBB3-10535
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-01-231-18/+2
|\ \ \ | | |/ | |/| | | | | | | * develop-olympus: [ticket/10580] Remove checking of server timezone and DST when registering
| * | [ticket/10580] Remove checking of server timezone and DST when registeringRichard Foote2012-01-211-18/+2
| | | | | | | | | | | | | | | | | | | | | | | | Remove checking of server timezone and DST. It causes a problem by selecting the wrong timezone when registering when the board_timezone is 1 hour less than the server timezone. PHPBB3-10580
* | | [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-3123-46/+23
| |/ |/| | | | | PHPBB3-9916
* | [ticket/10345] Add documentation and phpbb_ prefix to the new avatar functionsJoas Schilling2011-11-302-4/+4
| | | | | | | | PHPBB3-10345
* | [ticket/10345] Fix some last use cases of sprintf() to use $user->lang()Joas Schilling2011-11-252-4/+4
| | | | | | | | PHPBB3-10345
* | [ticket/10345] Use the plural function in some more places.Joas Schilling2011-11-255-10/+10
| | | | | | | | | | | | | | I added two function avatar_explanation_string() and avatar_error_wrong_size() for easier handling of the "pixels"-languages, as they are used quite often. PHPBB3-10345
* | [ticket/10345] Make use of the plural function in some basic placesJoas Schilling2011-11-254-7/+7
| | | | | | | | PHPBB3-10345
* | Merge branch 'develop-olympus' into developIgor Wiedler2011-11-204-20/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers(). [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers(). [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers. [ticket/10446] DRY X-AntiAbuse header addition. Conflicts: phpBB/includes/ucp/ucp_register.php
| * [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().Andreas Fischer2011-11-204-5/+5
| | | | | | | | PHPBB3-10446
| * [ticket/10446] DRY X-AntiAbuse header addition.Oleg Pudeyev2011-11-204-22/+7
| | | | | | | | PHPBB3-10446
* | Merge remote-tracking branch 'nickvergessen/ticket/10457' into developAndreas Fischer2011-11-141-1/+1
|\ \ | | | | | | | | | | | | * nickvergessen/ticket/10457: [ticket/10457] Undefined variable $request, when print-viewing PMs
| * | [ticket/10457] Undefined variable $request, when print-viewing PMsJoas Schilling2011-11-141-1/+1
| | | | | | | | | | | | PHPBB3-10457
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-141-6/+6
|\ \ \ | | |/ | |/| | | | | | | * develop-olympus: [ticket/9361] View correct error messages when editing account information
| * | Merge remote-tracking branch 'nickvergessen/ticket/9361' into develop-olympusAndreas Fischer2011-11-141-6/+6
| |\ \ | | | | | | | | | | | | | | | | * nickvergessen/ticket/9361: [ticket/9361] View correct error messages when editing account information
| | * | [ticket/9361] View correct error messages when editing account informationJoas Schilling2011-11-141-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the "current password" is only checked, when you change something. This means you get "Your profile has been updated." although you enter a wrong password. I also added proper error messages, when you leave the confirm fields empty, and sorted them in the order of the field appearances on the html page. PHPBB3-9361
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-131-1/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | * develop-olympus: [ticket/8616] Include old U_INBOX var for BC [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE [ticket/8616] Direct links in pm notification emails
| * | Merge remote-tracking branch 'igorw/ticket/8616' into develop-olympusAndreas Fischer2011-11-131-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/8616: [ticket/8616] Include old U_INBOX var for BC [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE [ticket/8616] Direct links in pm notification emails
| | * | [ticket/8616] Direct links in pm notification emailsAlan2011-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Import the "Direct links in pm notification emails" modification, version 1.0.1. PHPBB3-8616
* | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-291-28/+24
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10259] Do not send notifications to user accounts joining free groups.
| * | | [ticket/10259] Do not send notifications to user accounts joining free groups.Andreas Fischer2011-10-171-28/+24
| |/ / | | | | | | | | | | | | | | | | | | | | | It does not make sense to send notifications to users joining a freely open group. They already know that they were added to the group, because they triggered the actual join. PHPBB3-10259
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10304] Fix URL for ICQ while view private messages
| * | [ticket/10304] Fix URL for ICQ while view private messagesJoas Schilling2011-10-131-1/+1
| |/ | | | | | | PHPBB3-10304
* | [feature/remove-imagesets] Adjustments to php filesVjacheslav Trushkin2011-09-042-4/+0
| | | | | | | | | | | | Removing imagesets. Adjustments to php files PHPBB3-10336
* | [ticket/9608] Remove blank lineIgor Wiedler2011-07-171-1/+0
| | | | | | | | PHPBB3-9608
* | [ticket/9608] Remove use of references in captcha and other placesIgor Wiedler2011-07-131-4/+4
| | | | | | | | | | | | | | | | | | References are not really needed in PHP due to copy-on-write. Since PHP5, objects are always passed around as identifiers, which means they are mutable. So it is no longer required to pass these by reference either. PHPBB3-9608
* | Merge branch 'develop-olympus' into developNils Adermann2011-06-052-7/+28
|\ \ | |/ | | | | | | | | | | | | | | * develop-olympus: [ticket/10158] Remove some code duplication from generating the message. [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed. [ticket/10158] Only view "Return to" links if they are useful. [ticket/10158] Add return-link to folder, when the user replied from a folder. [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.
| * [ticket/10158] Remove some code duplication from generating the message.Nils Adermann2011-06-051-28/+10
| | | | | | | | PHPBB3-10158
| * [ticket/10158] Only view "Return to" links if they are useful.Joas Schilling2011-05-231-8/+34
| | | | | | | | PHPBB3-10158
| * [ticket/10158] Add return-link to folder, when the user replied from a folder.Joas Schilling2011-05-092-7/+17
| | | | | | | | PHPBB3-10158
| * [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.Joas Schilling2011-05-051-2/+5
| | | | | | | | PHPBB3-10158
* | Merge remote-tracking branch 'nickvergessen/ticket/8542' into developOleg Pudeyev2011-05-201-0/+43
|\ \ | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/8542: [ticket/8542] Display custom profile fields in private messages Conflicts: phpBB/install/database_update.php
| * | [ticket/8542] Display custom profile fields in private messagesJoas Schilling2011-05-201-0/+43
| | | | | | | | | | | | | | | | | | Introduce an option to display the cpf in the PM view. PHPBB3-8542
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-04-301-0/+7
|\ \ \ | | |/ | |/| | | | | | | * develop-olympus: [ticket/9961] Create log entries when users are activated.
| * | [ticket/9961] Create log entries when users are activated.Erik Frèrejean2011-04-191-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Create log entries when a user activates own account without also changing their password. * Additionally create admin log entries when an administrator activates user accounts. PHPBB3-9961
* | | [ticket/9684] Fix Forum/Topic-Tracking for global announcementsJoas Schilling2011-04-071-5/+28
| | | | | | | | | | | | | | | | | | Should be ready for intensive testing now. PHPBB3-9684
* | | [ticket/9684] Remove code in some more files especially includes/Joas Schilling2011-04-071-23/+9
| |/ |/| | | | | | | | | Topic-Tracking is still missing. PHPBB3-9684
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-04-051-1/+1
|\ \ | |/ | | | | | | | | * develop-olympus: [ticket/10121] Fix missing urlencode() for ICQ-number in viewtopic.php [ticket/10121] Fix ICQ profile link, leading to a dead web-messenger.
| * [ticket/10121] Fix ICQ profile link, leading to a dead web-messenger.Joas Schilling2011-04-031-1/+1
| | | | | | | | PHPBB3-10121