mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity
11,133 Commits 17 Branches 190 Tags
Commit Graph

11133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
c033698815 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9954] Remove unneeded never permission
 2011-05-03 00:51:10 -04:00
Oleg Pudeyev
3a70cb478c Merge remote-tracking branch 'erikfrerejean/ticket/9954' into develop-olympus 
* erikfrerejean/ticket/9954:
  [ticket/9954] Remove unneeded never permission
 2011-05-03 00:24:44 -04: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
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
Andreas Fischer
026358ec72 Merge remote branch 'p/ticket/10148' into develop 
* p/ticket/10148:
  [ticket/10148] Turn TEMPLATE_BITFIELD into an instance variable.
 2011-04-24 17:31:45 +02:00
Andreas Fischer
1ec2ab6689 Merge remote branch 'p/ticket/10143' into develop 
* p/ticket/10143:
  [ticket/10143] Added tests for storing a previously deleted value in db cache.
 2011-04-24 17:31:33 +02: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
Andreas Fischer
bc48fe1704 Merge branch 'ticket/p/10141' into develop-olympus 
* ticket/p/10141:
  [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:16:32 +02:00
Oleg Pudeyev
f08880e2c4 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10137] Remove unintended space at end of PHP_URL_FOPEN_SUPPORT_EXPLAIN.
 2011-04-22 00:16:37 -04:00
Oleg Pudeyev
0a8893498d Merge branch 'ticket/bantu/10137' into develop-olympus 
* ticket/bantu/10137:
  [ticket/10137] Remove unintended space at end of PHP_URL_FOPEN_SUPPORT_EXPLAIN.
 2011-04-22 00:16:21 -04:00
Oleg Pudeyev
2a566b0863 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10105] Update AIM express link.
  [ticket/10105] Update AIM application download link.
 2011-04-22 00:04:51 -04:00
Oleg Pudeyev
ff5274181c Merge branch 'ticket/bantu/10105' into develop-olympus 2011-04-22 00:03:02 -04: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
Oleg Pudeyev
5e7c945de9 [ticket/10143] Added tests for storing a previously deleted value in db cache. 
PHPBB3-10143
 2011-04-21 23:00:25 -04:00
Andreas Fischer
8c3cfbb40e [ticket/10105] Update AIM express link. 
PHPBB3-10105
 2011-04-22 00:42:49 +02:00
Andreas Fischer
78fa3a3b03 [ticket/10105] Update AIM application download link. 
PHPBB3-10105
 2011-04-22 00:41:55 +02:00
Andreas Fischer
6ee6245e5b [ticket/10137] Remove unintended space at end of PHP_URL_FOPEN_SUPPORT_EXPLAIN. 
PHPBB3-10137
 2011-04-22 00:30:13 +02:00
Andreas Fischer
b1367bce48 [ticket/10141] Split double-assignment into conditional and unconditional part. 
PHPBB3-10141
 2011-04-22 00:20:09 +02:00
Oleg Pudeyev
37b38abec6 Merge branch 'ticket/bantu/10139' into develop 2011-04-21 04:43:27 -04: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
Andreas Fischer
dcfab4e507 Merge branch 'ticket/p/7252' into develop 
* ticket/p/7252:
  [ticket/7252] Removed an outdated comment pertaining to PHP 4.x.
 2011-04-18 17:06:04 +02: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
503b87da48 [ticket/10006] More testing 
Change the DB test to test agains new cache/config mock objects

PHPBB3-10006
 2011-04-18 12:28:47 +02:00
Erik Frèrejean
7b1638c37f [ticket/10006] Tweak the tests a bit 
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