makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-19 09:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
13626 commits 18 branches 192 tags 207 MiB
Commit graph

13626 commits

This branch
This branch
All branches
Author SHA1 Message Date
Igor Wiedler
28b67d24e4 [feature/event-dispatcher] Fix docblock in phpbb_event_data 
PHPBB3-10732
 2012-03-29 08:45:17 +02:00
Oleg Pudeyev
ae824aef12 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10730] Added label tag around "select" text in post splitting UI
 2012-03-28 23:24:06 -04:00
Oleg Pudeyev
ccf83dd69b Merge remote-tracking branch 'janschejbal/ticket/10730' into develop-olympus 
* janschejbal/ticket/10730:
  [ticket/10730] Added label tag around "select" text in post splitting UI
 2012-03-28 23:23:53 -04:00
Jan Schejbal
fff9f6611e [ticket/10730] Added label tag around "select" text in post splitting UI 
Added label tags around the "select" text in the post splitting UI in the MCP.
Had to add IDs based on the post ID to the select boxes to allow label to
work. Tested in Firefox and Chrome.

PHPBB3-10730
 2012-03-29 04:16:34 +02:00
David King
caf47f8e19 [ticket/10586] Removed incorrect method call 
PHPBB3-10586
 2012-03-28 20:21:54 -04:00
Andreas Fischer
3048f8691d Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10708] Check converted passwords for multi-byte characters

Conflicts:
	phpBB/includes/auth/auth_db.php
 2012-03-29 00:52:07 +02:00
Andreas Fischer
2516b1e8f1 Merge remote-tracking branch 'Dickyf/ticket/10708' into develop-olympus 
* Dickyf/ticket/10708:
  [ticket/10708] Check converted passwords for multi-byte characters
 2012-03-29 00:51:12 +02:00
Igor Wiedler
9be55ba771 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10732] Add config_dev.php and config_test.php to .gitignore
 2012-03-28 23:39:16 +02:00
Igor Wiedler
a820ff1ebc Merge pull request #664 from imkingdavid/ticket/10732 
[ticket/10732] Add config_dev.php and config_test.php to .gitignore
 2012-03-28 14:38:16 -07:00
David King
1789e0948b [ticket/10732] Add config_dev.php and config_test.php to .gitignore 
PHPBB3-10732
 2012-03-28 17:05:45 -04:00
David King
afc55b4c08 [ticket/10586] Added visibility indication to __construct() 
PHPBB3-10586
 2012-03-28 16:50:18 -04:00
David King
35805a2740 [ticket/10586] Moved some loading stuff below extension controller, updated tests 
PHPBB3-10586
 2012-03-28 16:48:16 -04:00
David King
c44d77b031 [ticket/10586] Undo change in language/en/common.php 
PHPBB3-10586
 2012-03-28 16:39:30 -04:00
David King
7b091f18a8 [ticket/10586] Remove handle() from abstract class, undo change in index.php 
PHPBB3-10586
 2012-03-28 16:37:42 -04:00
David King
7071110d9a [ticket/10586] Do not pass as reference 
PHPBB3-10586
 2012-03-28 16:23:40 -04:00
David King
9a8b3ff449 [ticket/10586] Make the abstract class implement the original interface 
PHPBB3-10586
 2012-03-28 16:21:17 -04:00
David King
cb7dabbffc [ticket/10586] Change the interface to an abstract class 
This allows the common phpBB objects to be automatically accessible to
extensions without the author having to globalize and assign each one
himself. This is better because it also gives purpose to the
phpbb_extension_controller class; instead of just being the way to
ensure a handle() method is present, it also does this work for us.

PHPBB3-10586
 2012-03-28 16:13:59 -04:00
Igor Wiedler
138e7dae00 [feature/event-dispatcher] Rename PHPBB_NO_AUTOLOAD=>PHPBB_NO_COMPOSER_AUTOLOAD 
PHPBB3-9550
 2012-03-28 21:48:46 +02:00
Igor Wiedler
7f1abaa318 [feature/event-dispatcher] Add empty dispatcher to installer and db updater 
PHPBB3-9550
 2012-03-28 21:45:56 +02:00
Igor Wiedler
821948b96f [feature/event-dispatcher] Add missing dispatcher to file.php 
PHPBB3-9550
 2012-03-28 21:45:21 +02:00
Igor Wiedler
7258794be3 Merge remote-tracking branch 'imkingdavid/ticket/10586' into develop 
* imkingdavid/ticket/10586:
  [ticket/10586] Added space in if statement
  [ticket/10586] Tidy up comments
  [ticket/10586] Tests finally work (thanks naderman)
  [ticket/10586] Correctly purge board cache and don't rename install directory
  [ticket/10586] trying to get tests to work
  [ticket/10586] more work on getting tests to pass
  [ticket/10586] Tests are coming along, just a little more to go
  [ticket/10586] Rename install directory back to install/ after tests
  [ticket/10586] browse tests now work, but mine dont. at least we are making progress
  [ticket/10586] initial work on copying fixtures. Note that this depends on 10706
  [ticket/10586] Adding the extensions used by the tests
  [ticket/10586] Now tests run, but fail. But here is what I have.
  [ticket/10586] some bootstrap additions and test changes to try and make it work
  [ticket/10586] test stuff. does not work yet, still need to put phpBB objects in bootstrap.php
  [ticket/10586] Copy/paste fail fixed
  [ticket/10586] Sanitize periods from class names, use manager to get path.
  [ticket/10586] Removed file_exists() check because class_exists() covers that.
  [ticket/10586] Extension front controller
 2012-03-28 21:36:07 +02:00
David King
7c3ebcc3ff [ticket/10586] Added space in if statement 
PHPBB3-10586
 2012-03-28 15:34:24 -04:00
Oleg Pudeyev
4239d8aa4e Merge remote-tracking branch 'brunoais/feature/save-post-on-report' into develop 
* brunoais/feature/save-post-on-report:
  [feature/save-post-on-report] Changed mark in subsilver2 to look like viewtopic
  [feature/save-post-on-report] bbcode_nl2br missing.
  [feature/save-post-on-report] Change the column type of reported text
  [feature/save-post-on-report] Changed the name of the column
  [feature/save-post-on-report] Bug fix table name
  [feature/save-post-on-report] Saves the post reported when a report is creat
  [feature/save-post-on-report] The complete changes for this feature
 2012-03-27 22:45:02 -04:00
David King
56f75dbf93 [ticket/10586] Tidy up comments 
PHPBB3-10586
 2012-03-27 19:57:32 -04:00
Joas Schilling
b9324577ac [ticket/10605] Reset user´s pm count to 0 when deleting his PMs 
PHPBB3-10605
 2012-03-27 17:32:55 +02:00
Joas Schilling
0397b46217 [ticket/10605] Split query to be able to use indexes 
PHPBB3-10605
 2012-03-27 17:29:03 +02:00
Andreas Fischer
9c8aab4d32 [ticket/10605] Rename $delete_rows to $delete_ids. 
PHPBB3-10605
 2012-03-27 02:02:17 +02:00
Andreas Fischer
ad073d22b9 [ticket/10605] Break long comment into multiple lines 80 chars short. 
PHPBB3-10605
 2012-03-27 01:43:09 +02:00
Andreas Fischer
dd53d0576d [ticket/10605] Remove unnecessary $delete_ids array. 
PHPBB3-10605
 2012-03-27 01:39:49 +02:00
Andreas Fischer
9040f18d7c [ticket/10605] Remove unnecessary array_keys calls on $delete_rows. 
PHPBB3-10605
 2012-03-27 01:35:01 +02:00
Andreas Fischer
dbc7a69ad2 [ticket/10605] Remove unused variable declarations. 
PHPBB3-10605
 2012-03-27 01:30:52 +02:00
Andreas Fischer
2203bc204e [ticket/10605] Turn $undelivered_user into a real array of counters. 
PHPBB3-10605
 2012-03-27 01:29:29 +02:00
Andreas Fischer
e8830f605f [ticket/10605] Use unset() instead of checking user_id over and over again. 
PHPBB3-10605
 2012-03-27 01:18:02 +02:00
Andreas Fischer
17a7fb7743 Merge remote-tracking branch 'imkingdavid/task/php5.3' into develop 
* imkingdavid/task/php5.3:
  [task/php5.3] Updated range of tested PHP versions
  [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2
  [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2
 2012-03-27 00:26:59 +02:00
David King
9bcf53057e [task/php5.3] Updated range of tested PHP versions 
PHPBB3-10693
 2012-03-26 17:56:10 -04:00
David King
063f6893af [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2 
PHPBB3-10693
 2012-03-25 21:20:52 -04:00
David King
75e731e14b [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2 
PHPBB3-10693
 2012-03-25 21:20:52 -04:00
Andreas Fischer
a74e050310 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10694] Adjusting details link to 5.3 announcement
  [ticket/10694] Update PHP warning to 5.3.2
 2012-03-26 00:06:25 +02:00
Andreas Fischer
a618e22fca Merge remote-tracking branch 'unknownbliss/ticket/10694' into develop-olympus 
* unknownbliss/ticket/10694:
  [ticket/10694] Adjusting details link to 5.3 announcement
  [ticket/10694] Update PHP warning to 5.3.2
 2012-03-26 00:06:17 +02:00
Andreas Fischer
0257cd1653 Merge remote-tracking branch 'dhruvgoel92/ticket/10703' into develop 
* dhruvgoel92/ticket/10703:
  [ticket/10703] Added a condition to check if ext directory exists
 2012-03-25 23:58:56 +02:00
David King
cfb8f01040 [ticket/10727] Do not hide Quick Reply with javascript on prosilver 
PHPBB3-10727
 2012-03-24 22:03:03 -04:00
Igor Wiedler
a44423baee [feature/event-dispatcher] Change composer autoloading options 
Check if composer's generated autoloader is present, and if not give an error.

PHPBB3-9550
 2012-03-24 21:37:45 +01:00
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
Igor Wiedler
ef85ef8ed6 Merge remote-tracking branch 'upstream/develop' into feature/event-dispatcher 
* upstream/develop:
  [ticket/10723] Stop Travis running all tests on sqlite
  [feature/prosilver-cleanup/css-reset-v2] CSS reset
 2012-03-24 15:45:54 +01:00
Igor Wiedler
400277c036 [feature/event-dispatcher] Change phpbb_event_dispatcher to inheritance, tests 
PHPBB3-9550
 2012-03-24 15:45:18 +01:00
Andreas Fischer
0ce899cb87 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10723] Stop Travis running all tests on sqlite
 2012-03-24 14:57:42 +01:00
Andreas Fischer
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
Igor Wiedler
935a4abb7e Merge pull request #12 from unknownbliss/feature/events-dispatcher 
Feature/events dispatcher
 2012-03-24 06:31:54 -07:00
Michael Cullum
afc2c5a2e3 [feature/event-dispatcher] Add composer install to travis 
PHPBB3-9550
 2012-03-24 11:03:54 +00:00
Oleg Pudeyev
fb51bc487a Merge remote-tracking branch 'cyberalien/feature/prosilver-cleanup/css-reset-v2' into develop 
* cyberalien/feature/prosilver-cleanup/css-reset-v2:
  [feature/prosilver-cleanup/css-reset-v2] CSS reset
 2012-03-24 06:54:26 -04:00