aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'EXreaction/ticket/11408' into developDavid King2013-03-061-1/+1
|\
| * [ticket/11408] user_jabber instead of jabberNathaniel Guse2013-03-061-1/+1
* | Merge remote-tracking branch 'remotes/bantu/ticket/10202' into developNathan Guse2013-03-062-0/+208
|\ \
| * | [ticket/10202] Rename method names _all() to _array().Andreas Fischer2013-03-051-6/+6
| * | [ticket/10202] Add migration file for config_db_text.Andreas Fischer2013-03-051-0/+45
| * | [ticket/10202] Improve method documentation.Andreas Fischer2013-03-051-4/+9
| * | [ticket/10202] SQL escape the table name.Andreas Fischer2013-03-051-1/+1
| * | [ticket/10202] Add $this->db->sql_freeresult($result) to SELECT queries.Andreas Fischer2013-03-051-0/+1
| * | [ticket/10202] Adjust method names to guidelines.Andreas Fischer2013-03-051-6/+6
| * | [ticket/10202] Implementation of config options with arbitrary length values.Andreas Fischer2013-03-051-0/+157
* | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11166Joas Schilling2013-03-06159-3799/+17693
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'EXreaction/ticket/11400' into developDavid King2013-03-051-2/+1
| |\ \
| | * | [ticket/11400] If email is disabled, disable it for notificationsNathan Guse2013-03-051-2/+1
| | |/
| * | [ticket/11402] Fix undefined index in post/topic_in_queueNathan Guse2013-03-052-8/+35
| |/
| * Merge remote-tracking branch 'remotes/marc/ticket/11398' into developNathaniel Guse2013-03-041-1/+1
| |\
| | * [ticket/11398] Correctly call permission_set method in permission toolMarc Alexander2013-03-051-1/+1
| * | Merge remote-tracking branch 'remotes/nickv/ticket/10714' into developNathaniel Guse2013-03-046-310/+897
| |\ \ | | |/ | |/|
| | * Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2013-03-0485-569/+8956
| | |\
| | * | [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/Joas Schilling2013-03-031-1/+1
| | * | [ticket/10714] Logs are disabled for this page call onlyJoas Schilling2013-03-032-4/+14
| | * | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2013-02-2530-79/+2744
| | |\ \
| | * | | [ticket/10714] Update add_log docs block with @param and @deprecatedJoas Schilling2013-02-251-1/+12
| | * | | [ticket/10714] Remove fallback code from previous commits and move globalJoas Schilling2013-01-231-10/+2
| | * | | [ticket/10714] Fix missing parameter and global phpbb_log in unit testsJoas Schilling2013-01-221-0/+1
| | * | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2013-01-223-33/+62
| | |\ \ \
| | * | | | [ticket/10714] Add getter for is_in_admin and use itJoas Schilling2013-01-221-3/+20
| | * | | | [ticket/10714] Fix more commentsJoas Schilling2013-01-221-5/+9
| | * | | | [ticket/10714] Cast values to integer before using them in the queryJoas Schilling2013-01-221-6/+6
| | * | | | [ticket/10714] Fix several doc blocks and commentsJoas Schilling2013-01-223-8/+11
| | * | | | [ticket/10714] Use new core.adm_relative_path to create the object.Joas Schilling2013-01-161-7/+12
| | * | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2013-01-1651-1974/+2308
| | |\ \ \ \
| | * | | | | [ticket/10714] Fix several comments and variable namesJoas Schilling2013-01-162-53/+52
| | * | | | | [ticket/10714] Fix database driver class nameJoas Schilling2012-12-141-4/+4
| | * | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2012-12-1440-224/+906
| | |\ \ \ \ \
| | * | | | | | [ticket/10714] Remove type hinting to allow the usage of mocks in testsJoas Schilling2012-12-111-1/+1
| | * | | | | | [ticket/10714] Use dependencies instead of globalsJoas Schilling2012-12-091-45/+116
| | * | | | | | [ticket/10714] Compare log_type to false, rather then nullJoas Schilling2012-12-071-4/+4
| | * | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2012-12-07135-1138/+4403
| | |\ \ \ \ \ \
| | * | | | | | | [ticket/10714] Rely on global instead of creating an instanceJoas Schilling2012-12-072-12/+0
| | * | | | | | | [ticket/10714] Make attributed protected rather then privateJoas Schilling2012-12-071-4/+4
| | * | | | | | | [ticket/10714] Remove some private functions from the log interfaceJoas Schilling2012-11-112-47/+26
| | * | | | | | | [ticket/10714] Fix some commentsJoas Schilling2012-11-112-5/+5
| | * | | | | | | [ticket/10714] Remove dependency injection and use global insteadJoas Schilling2012-08-212-34/+11
| | * | | | | | | [ticket/10714] Always try to trigger events on phpbb_dispatcherJoas Schilling2012-08-211-20/+8
| | * | | | | | | [ticket/10714] Remove event core.function_add_log, add_log should be used ins...Joas Schilling2012-08-211-12/+0
| | * | | | | | | [ticket/10714] Enable event core.get_logs_get_additional_dataJoas Schilling2012-08-211-3/+10
| | * | | | | | | [ticket/10714] Enable event core.get_logs_modify_entry_dataJoas Schilling2012-08-211-4/+8
| | * | | | | | | [ticket/10714] Fix core.add_log eventJoas Schilling2012-08-211-1/+1
| | * | | | | | | [ticket/10714] Add event core.get_logs_modify_typeJoas Schilling2012-08-211-23/+30
| | * | | | | | | [ticket/10714] Enable core.add_log event and remove superseded add_log_caseJoas Schilling2012-08-211-24/+22