mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00
Code Issues Releases Wiki Activity
11,173 Commits 17 Branches 190 Tags
Commit Graph

4687 Commits

Author SHA1 Message Date
Andreas Fischer
0aa6398163 Merge remote-tracking branch 'p/ticket/10156' into develop 
* p/ticket/10156:
  [ticket/10156] Fix new cron on windows.
 2011-05-23 10:13:08 +02:00
Oleg Pudeyev
f9307531a7 Merge remote-tracking branch 'nickvergessen/ticket/8542' into develop 
* nickvergessen/ticket/8542:
  [ticket/8542] Display custom profile fields in private messages

Conflicts:
	phpBB/install/database_update.php
 2011-05-20 19:50:29 -04:00
Joas Schilling
8fa44cc3b9 [ticket/8542] Display custom profile fields in private messages 
Introduce an option to display the cpf in the PM view.

PHPBB3-8542
 2011-05-20 16:45:29 +02:00
Oleg Pudeyev
f231590c7b [ticket/10156] Fix new cron on windows. 
PHPBB3-10156
 2011-05-19 22:34:18 -04:00
Oleg Pudeyev
457758ef4a Merge remote-tracking branch 'bantu/ticket/10146-develop' into develop 
* bantu/ticket/10146-develop:
  [ticket/10146] Fix Firebird DECIMAL precision issue on develop.
 2011-05-13 19:35:09 -04:00
Andreas Fischer
bfdb5c413d [ticket/10146] Fix Firebird DECIMAL precision issue on develop. 
PHPBB3-10146
 2011-05-11 11:32:09 +02:00
Oleg Pudeyev
3f9e9b581b Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10170] Fix broken recaptcha verification host.
  [ticket/10170] Include www in hostname in language strings.
  [ticket/10170] Update language entries
  [ticket/10170] reCaptcha API has been moved.
 2011-05-10 23:32:27 -04:00
Oleg Pudeyev
f670aefd36 Merge remote-tracking branch 'bantu/ticket/10170' into develop-olympus 
* bantu/ticket/10170:
  [ticket/10170] Fix broken recaptcha verification host.
  [ticket/10170] Include www in hostname in language strings.
  [ticket/10170] Update language entries
  [ticket/10170] reCaptcha API has been moved.
 2011-05-10 22:06:23 -04:00
Andreas Fischer
eded608a53 [ticket/10170] Fix broken recaptcha verification host. 
PHPBB3-10170
 2011-05-11 03:26:36 +02:00
Erik Frèrejean
ca981b6d18 [ticket/10170] reCaptcha API has been moved. 
The reCaptcha API has been moved from recaptcha.net to
google.com/recaptcha.

PHPBB3-10170
 2011-05-10 23:31:41 +02:00
Oleg Pudeyev
7cbbb301e1 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common.
  [ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.
 2011-05-09 22:28:35 -04:00
Andreas Fischer
4038091382 [ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable. 
L_FORUM_FOLDER_ALT was supposed to be a language variable but the language
variable is never looked up but directly passed as L_FORUM_FOLDER_ALT instead.

Also, the expected functionality is correctly implemented by
FORUM_FOLDER_IMG_ALT.

PHPBB3-9999
 2011-05-09 23:11:56 +02:00
Andreas Fischer
6a3f34ae61 Merge remote-tracking branch 'p/ticket/9693' into develop 
* p/ticket/9693:
  [ticket/9693] Removed useless $auth globalizations.
 2011-05-05 19:59:11 +02:00
Nils Adermann
680c3fde48 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10003] Delete EOL at EOF for the benefit of 3.0 modifications.
  [ticket/10003] Ported 1802b9ff9286a7fc24493e71b3432816cbdbfcd8 to db_tools.
  [ticket/10003] Ported 5553cfc2ed81ba9eb571804c431def962720b39e to db_tools.
  [ticket/10003] Ported 023760c8b2402418310a3717db8349cac0342e42 to db_tools.
  [ticket/10003] Ported 54c22ae52a0e18232cac8fed342ea52f2e2a793d to db_tools.
  [ticket/10003] Ported 96a30afcca3ebd832c9b3083bb5c9a9f2a2dc54b to db_tools.
  [ticket/10003] Ported d7d96223e7bae7cd60b13c6e7896d95838c3633c to db_tools.
 2011-05-05 14:48:13 +02:00
Nils Adermann
e7dd37910c Merge branch 'ticket/p/10003' into develop-olympus 
* ticket/p/10003:
  [ticket/10003] Delete EOL at EOF for the benefit of 3.0 modifications.
  [ticket/10003] Ported 1802b9ff9286a7fc24493e71b3432816cbdbfcd8 to db_tools.
  [ticket/10003] Ported 5553cfc2ed81ba9eb571804c431def962720b39e to db_tools.
  [ticket/10003] Ported 023760c8b2402418310a3717db8349cac0342e42 to db_tools.
  [ticket/10003] Ported 54c22ae52a0e18232cac8fed342ea52f2e2a793d to db_tools.
  [ticket/10003] Ported 96a30afcca3ebd832c9b3083bb5c9a9f2a2dc54b to db_tools.
  [ticket/10003] Ported d7d96223e7bae7cd60b13c6e7896d95838c3633c to db_tools.
 2011-05-05 14:44:49 +02:00
Oleg Pudeyev
a4a9e38007 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9961] Create log entries when users are activated.
 2011-04-30 20:44:42 -04:00
Oleg Pudeyev
aa7be58d41 Merge branch 'erikfrerejean/ticket/9961' into develop-olympus 
* erikfrerejean/ticket/9961:
  [ticket/9961] Create log entries when users are activated.
 2011-04-30 17:41:04 -04:00
Oleg Pudeyev
820f22f784 [ticket/9693] Removed useless $auth globalizations. 
PHPBB3-9693
 2011-04-30 13:20:27 -04:00
Oleg Pudeyev
1e2c19f4b4 [ticket/10003] Delete EOL at EOF for the benefit of 3.0 modifications. 
PHPBB3-10003
 2011-04-29 02:16:02 -04:00
Oleg Pudeyev
85549fad83 [ticket/10003] Ported 1802b9ff9286a7fc24493e71b3432816cbdbfcd8 to db_tools. 
Most of it was already in db_tools, these changes could have applied to
code that did not exist in db_tools at the time of the commit.

PHPBB3-10003
 2011-04-29 02:10:42 -04:00
Oleg Pudeyev
55ff5da70b [ticket/10003] Ported 5553cfc2ed81ba9eb571804c431def962720b39e to db_tools. 
The diff in database_update was only partially relevant.

PHPBB3-10003
 2011-04-29 02:10:42 -04:00
Oleg Pudeyev
761e3dd36f [ticket/10003] Ported 023760c8b2402418310a3717db8349cac0342e42 to db_tools. 
This was painful. Git wanted to patch hunks in wrong places.
Hopefully I got it right.

PHPBB3-10003
 2011-04-29 02:10:42 -04:00
Oleg Pudeyev
9f34aa0b79 [ticket/10003] Ported 54c22ae52a0e18232cac8fed342ea52f2e2a793d to db_tools. 
This diff applied cleanly.

PHPBB3-10003
 2011-04-29 02:10:42 -04:00
Oleg Pudeyev
3cb1b90ca6 [ticket/10003] Ported 96a30afcca3ebd832c9b3083bb5c9a9f2a2dc54b to db_tools. 
This change is somewhat questionable, maybe it should be reviewed.

PHPBB3-10003
 2011-04-29 02:10:41 -04:00
Oleg Pudeyev
e6eb11bb11 [ticket/10003] Ported d7d96223e7bae7cd60b13c6e7896d95838c3633c to db_tools. 
PHPBB3-10003
 2011-04-29 02:10:41 -04:00
Igor Wiedler
835391c83a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.
 2011-04-26 21:49:31 +02:00
Igor Wiedler
850741ee16 Merge remote branch 'bantu/ticket/10145' into develop-olympus 
* bantu/ticket/10145:
  [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.
 2011-04-26 21:49:21 +02:00
Andreas Fischer
9a4e71ac1a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/7941] Added @return to generate_board_url docstring.
 2011-04-26 19:36:48 +02:00
Andreas Fischer
569a4b2091 Merge remote branch 'p/ticket/7941' into develop-olympus 
* p/ticket/7941:
  [ticket/7941] Added @return to generate_board_url docstring.
 2011-04-26 19:35:49 +02:00
Andreas Fischer
a3a70e13b5 [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined. 
PHPBB3-10145
 2011-04-26 12:35:44 +02:00
Oleg Pudeyev
8fc748770a Merge branch 'feature/rxu/attachment-management-no-reassignment' into develop 
* feature/rxu/attachment-management-no-reassignment:
  [feature/attachment-management-no-reassignment] Handle privacy and some more.
  [feature/attachment-management-no-reassignment] Further feature adjustments.
  [feature/attachment-management-no-reassignment] Fix some more errors
  [feature/attachment-management-no-reassignment] Fix minor flaws in the code.
  [feature/attachment-management-no-reassignment] Attachments management
 2011-04-24 14:29:59 -04:00
rxu
baba66a229 [feature/attachment-management-no-reassignment] Handle privacy and some more. 
- restrict files info for PM attachments;
- add an option to resync files stats if wrong;
- replace post_id sorting with post type (PM/regular post) one;
- some language fixes.

PHPBB3-9721
 2011-04-24 23:33:51 +08:00
Oleg Pudeyev
dfbbc4797e [ticket/10148] Turn TEMPLATE_BITFIELD into an instance variable. 
PHPBB3-10148
 2011-04-24 01:35:09 -04:00
Andreas Fischer
513b95642e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10147] Corrected a typo in includes/functions_template.php.
 2011-04-23 21:52:04 +02:00
Andreas Fischer
8a97722464 Merge branch 'ticket/p/10147' into develop-olympus 
* ticket/p/10147:
  [ticket/10147] Corrected a typo in includes/functions_template.php.
 2011-04-23 21:51:49 +02:00
Oleg Pudeyev
a8ecd30fe1 [ticket/10147] Corrected a typo in includes/functions_template.php. 
PHPBB3-10147
 2011-04-23 15:36:45 -04:00
Andreas Fischer
ca0a066854 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10141] Save a hash lookup when value is not in cache.
  [ticket/10141] Split double-assignment into conditional and unconditional part.
  [ticket/10141] Use a cache in $auth->_fill_acl() for better performance.
 2011-04-22 11:17:39 +02:00
Oleg Pudeyev
f49656986c [ticket/10141] Save a hash lookup when value is not in cache. 
PHPBB3-10141
 2011-04-21 23:15:51 -04:00
Andreas Fischer
b1367bce48 [ticket/10141] Split double-assignment into conditional and unconditional part. 
PHPBB3-10141
 2011-04-22 00:20:09 +02:00
Bart van Bragt
11dd4b54fa [ticket/10141] Use a cache in $auth->_fill_acl() for better performance. 
Many sequences being converted are the same. Use a local cache to
convert each sequence once, speeding up the function.

PHPBB3-10141
 2011-04-21 04:21:09 -04:00
Erik Frèrejean
1d2201902f [ticket/9961] Create log entries when users are activated. 
* 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
 2011-04-19 13:11:20 +02:00
Andreas Fischer
2701a587ac [ticket/10139] Make signatures of set_atomic() consistent by using $new_value. 
PHPBB3-10139
 2011-04-19 10:17:18 +02:00
Andreas Fischer
9241aa79ff [ticket/10139] Rename $cache to $use_cache to avoid confusion with cache object 
PHPBB3-10139
 2011-04-19 10:13:18 +02:00
Oleg Pudeyev
8fe75aefbb Merge branch 'ticket/erikfrerejean/10006' into develop 2011-04-19 00:28:21 -04:00
Erik Frèrejean
27bbfde243 [ticket/10006] Remove unneeded if statements 
Remove some of the additional `if (isset)` checks

PHPBB3-10006
 2011-04-18 12:28:47 +02:00
Erik Frèrejean
f93ac340a2 [ticket/10006] Remove return values 
Remove some unneeded return values

PHPBB3-10006
 2011-04-18 12:28:47 +02:00
Erik Frèrejean
2f67ade05a [ticket/10006] Add phpbb_config::delete 
Add the missing `phpbb_config::delete` method to the config class

PHPBB3-10006
 2011-04-18 12:28:47 +02:00
Oleg Pudeyev
682814180c [ticket/7941] Added @return to generate_board_url docstring. 
PHPBB3-7941
 2011-04-17 18:46:03 -04:00
Oleg Pudeyev
9a8a8d41d3 [ticket/7252] Removed an outdated comment pertaining to PHP 4.x. 
PHPBB3-7252
 2011-04-17 18:41:18 -04:00
Oleg Pudeyev
8c5a9979ad Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10109] Fix "Undefined Index" errors when copying a topic.
 2011-04-17 11:09:17 -04:00