1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-12 04:36:32 +02:00
Commit Graph

11038 Commits

Author SHA1 Message Date
HTF
2768db44f5 [ticket/10129] Remove apostrophes and plurals in ACP user management -> permissions language file as per ticket.
PHPBB3-10129
2012-03-24 15:13:04 +00:00
9c85c6c318 Merge remote-tracking branch 'unknownbliss/ticket/10723' into develop-olympus
* unknownbliss/ticket/10723:
  [ticket/10723] Stop Travis running all tests on sqlite
2012-03-24 14:52:50 +01:00
5bcdfe94dd [ticket/10723] Stop Travis running all tests on sqlite
Correct information so all tests don't run on sqlite

PHPBB3-10723
2012-03-23 06:40:15 +00:00
57eb50812f Merge remote-tracking branch 'rxu/ticket/10684' into develop-olympus
* rxu/ticket/10684:
  [ticket/10684] Adjust function and parameter name, minor changes.
  [ticket/10684] Rename function phpbb_get_banned_users_ids() parameter
  [ticket/10684] Remove intval mapping for array keys
  [ticket/10684] Adjust pm_notifications() to handle stale bans
  [ticket/10684] Cast user_id to integer
  [ticket/10684] Refactor $sql_ignore_users array update
  [ticket/10684] Remove isset() for $sql_ignore_users update
  [ticket/10684] Fix 2 typos in comment lines.
  [ticket/10684] Send notifications for users with stale bans
2012-03-22 18:14:13 +01:00
1337f86123 Merge remote-tracking branch 'github-unknownbliss/task/travis' into develop-olympus
* github-unknownbliss/task/travis:
  [task/travis] Refactor php version check for dbunit install
2012-03-22 17:15:52 +01:00
841d11c6cd [task/travis] Refactor php version check for dbunit install
PHPBB3-10718
2012-03-22 16:09:58 +00:00
992b58d468 Merge remote-tracking branch 'github-unknownbliss/task/travis' into develop-olympus
* github-unknownbliss/task/travis:
  [task/travis] Exclude functional and slow tests
2012-03-22 17:03:03 +01:00
0ed66ad0e8 [task/travis] Exclude functional and slow tests
PHPBB3-10718
2012-03-22 16:00:10 +00:00
6f809416ba Merge remote-tracking branch 'github-unknownbliss/task/travis' into develop-olympus
* github-unknownbliss/task/travis:
  [task/travis] Some more small travis fixes
  [task/travis] Rename travis phpunit config files
  [task/travis] Fixing some travis issues
  [task/travis] Add automated testing to readme
  [task/travis] Removing development information
  [task/travis] Adding Travis Continuous Intergration Support
2012-03-22 16:11:55 +01:00
115ee7f3b8 [task/travis] Some more small travis fixes
PHPBB3-10718
2012-03-22 14:44:36 +00:00
c7f65fba62 [task/travis] Rename travis phpunit config files
PHPBB3-10718
2012-03-22 14:13:25 +00:00
d1980f6ad6 [task/travis] Fixing some travis issues
PHPBB3-10718
2012-03-22 13:32:58 +00:00
rxu
5a9dd1994f [ticket/10684] Adjust function and parameter name, minor changes.
PHPBB3-10684
2012-03-22 21:19:01 +08:00
99a271f34b Merge remote-tracking branch 'nickvergessen/ticket/10717' into develop-olympus
* nickvergessen/ticket/10717:
  [ticket/10717] Fix profile field sample in prosilver´s memberlist_view.html
2012-03-22 11:11:21 +01:00
e5205ba2f8 Merge remote-tracking branch 'p/task/php54-olympus' into develop-olympus
* p/task/php54-olympus:
  [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
  [task/php54] Refactor error_reporting call slightly.
2012-03-22 10:49:37 +01:00
4325bbf4c6 [task/travis] Add automated testing to readme
PHPBB3-10718
2012-03-22 09:08:43 +00:00
9120c7691e [task/travis] Removing development information
PHPBB3-10718
2012-03-22 09:08:12 +00:00
4dafcc2525 [task/travis] Adding Travis Continuous Intergration Support
PHPBB3-10718
2012-03-22 09:05:59 +00:00
c2169f6899 [feature/events-dispatcher] Adding phpBB/vendor to .gitignore
PHPBB3-9550
2012-03-21 09:17:16 +00:00
2005c339ff [ticket/10717] Fix profile field sample in prosilver´s memberlist_view.html
PHPBB3-10717
2012-03-20 17:45:08 +01:00
70d88965c7 [ticket/10708] Check converted passwords for multi-byte characters
Check for multi-byte characters in converted passwords.

PHPBB3-10708
2012-03-19 23:19:21 -04:00
97d4f168f5 [ticket/10675] Add disk full language string when posting attachments
Add language string visible by admins only for when the disk does not have
enough free space to upload attachments.

PHPBB3-10675
2012-03-19 15:08:28 -04:00
dad37a4329 Merge remote-tracking branch 'dhruvgoel92/ticket/10691' into develop-olympus
* dhruvgoel92/ticket/10691:
  [ticket/10691] Fixed the speed of creating search index
2012-03-19 12:55:24 +01:00
c551b46115 [ticket/10691] Fixed the speed of creating search index
$time is now initialized after each batch iteration.
Speed for each batch iteration of creating search index is fixed.

PHPBB3-10691
2012-03-19 17:11:30 +05:30
81eeafbb8d Merge remote-tracking branch 'nickvergessen/ticket/8636' into develop-olympus
* nickvergessen/ticket/8636:
  [ticket/8636] Add resync option to topic_view moderation page
2012-03-16 06:18:29 -04:00
95e011ccbe Merge remote-tracking branch 'nickvergessen/ticket/10689' into develop-olympus
* nickvergessen/ticket/10689:
  [ticket/10689] Fix "First character"-option in "Find a member"-search
2012-03-16 06:06:44 -04:00
5efdbfa5e4 [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
We cannot use static in Olympus because it must be PHP 4 compatible.

Therefore disable E_STRICT for Olympus.

This commit should be reverted for Ascraeus.

PHPBB3-10615
2012-03-15 22:47:42 -04:00
71afba0ded [task/php54] Refactor error_reporting call slightly.
Separate error level assignment into a variable in this commit
so that the only difference between Olympus and Ascraeus
is the addition of logic altering $level.

PHPBB3-10615
2012-03-15 22:46:06 -04:00
3b7a6a3efa [ticket/10689] Fix "First character"-option in "Find a member"-search
PHPBB3-10689
2012-03-12 00:39:12 +01:00
rxu
ff8d523768 [ticket/10684] Rename function phpbb_get_banned_users_ids() parameter
PHPBB3-10684
2012-03-12 01:57:51 +08:00
rxu
da395edbca [ticket/10684] Remove intval mapping for array keys
PHP manual for arrays http://php.net/manual/en/language.types.array.php states
that the following key cast will occur: Strings containing valid integers will
be cast to the integer type. E.g. the key "8" will actually be stored under 8.
Thus, no intval mapping for numeric array keys is needed.

PHPBB3-10684
2012-03-12 01:47:28 +08:00
rxu
321d0d9b56 [ticket/10684] Adjust pm_notifications() to handle stale bans
- Add parameter (array) to the function phpbb_get_banned_users_ids()
- Fix function pm_notification() to handle users with stale bans

PHPBB3-10684
2012-03-12 01:44:00 +08:00
b652e1a1bb Merge branch 'unknownbliss/ticket/10697' into develop-olympus 2012-03-11 12:58:55 -04:00
24f1896b3c [ticket/10697] Updating gitignore to match develop branch
PHPBB3-10697
2012-03-11 09:42:56 +00:00
rxu
a79b3490c2 [ticket/10684] Cast user_id to integer
PHPBB3-10684
2012-03-11 00:56:07 +08:00
668c61686b [ticket/10694] Adjusting details link to 5.3 announcement
PHPBB3-10694
2012-03-10 16:47:07 +00:00
aee79c6cdb Merge remote-tracking branch 'p/ticket/7432' into develop-olympus
* p/ticket/7432:
  [ticket/7432] Delete redundant reference to "appropriate menu item".
  [ticket/7432] Explain what users are inactive in more detail.
2012-03-09 23:41:43 +01:00
rxu
89a6cb2886 [ticket/10684] Refactor $sql_ignore_users array update
PHPBB3-10684
2012-03-10 00:17:39 +08:00
fbe8086697 [ticket/10694] Update PHP warning to 5.3.2
PHPBB3-10694
2012-03-09 16:10:02 +00:00
rxu
f563647e4b [ticket/10684] Remove isset() for $sql_ignore_users update
PHPBB3-10684
2012-03-09 22:35:13 +08:00
bd1fb91dd2 Merge remote-tracking branch 'rxu/ticket/9831' into develop-olympus
* rxu/ticket/9831:
  [ticket/9831] Fix saving unchecked checkbox field value
  [ticket/9831] Correctly store checkbox default value for boolean CPF.
2012-03-09 05:24:03 -05:00
0ec8e9dbff Merge remote-tracking branch 'rxu/ticket/9084' into develop-olympus
* rxu/ticket/9084:
  [ticket/9084] Explain the logic.
  [ticket/9084] Don't hide 'non-entered' dropdown CPF value if not required
2012-03-09 04:42:05 -05:00
cd61de4bfd [ticket/9084] Explain the logic.
PHPBB3-9084
2012-03-09 04:35:09 -05:00
rxu
ee6783109a [ticket/10684] Fix 2 typos in comment lines.
PHPBB3-10684
2012-03-09 16:41:49 +08:00
rxu
025de9ee19 [ticket/10684] Send notifications for users with stale bans
PHPBB3-10684
2012-03-08 23:28:03 +08:00
bb7e86c2b1 [ticket/10658] Do not fetch ranks into the $ranks array, it is no longer used.
PHPBB3-10658
2012-03-08 15:19:15 +01:00
d380a1a36f Merge remote-tracking branch 'bantu/ticket/9813' into develop-olympus
* bantu/ticket/9813:
  [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count
  [ticket/9813] Only get posts table row count if we detected a fulltext index.
  [ticket/9813] Also use estimated row count of posts table for fulltext mysql.
  [ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1.
  [ticket/10653] Unit tests for get_row_count() and get_estimated_row_count().
  [ticket/10653] Add ability to count table rows to database abstraction layer.
  [ticket/9813] Use table status row count only if greater than 100000 or exact.
  [ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
2012-03-08 08:44:24 -05:00
c11607bdd1 [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count
There is no point in fetching the table status again.

PHPBB3-10653
2012-03-08 14:39:03 +01:00
01d90e59a8 [ticket/9813] Only get posts table row count if we detected a fulltext index.
PHPBB3-9813
2012-03-08 14:38:59 +01:00
89a0cbc57e [ticket/7432] Delete redundant reference to "appropriate menu item".
PHPBB3-7432
2012-03-07 18:00:57 -05:00