aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/dhruv/ticket/11303' into developNathaniel Guse2013-03-095-4/+5
|\
| * [ticket/11303] rename attribute to timezone-preselectDhruv2013-02-174-4/+4
| * [ticket/11303] remove additional bracketsDhruv2013-02-121-1/+1
| * [ticket/11303] use S_TZ_PRESELECT in subsilverDhruv2013-02-121-1/+1
| * [ticket/11303] add S_TZ_PRESELECT template varDhruv2013-02-082-1/+2
* | Merge remote-tracking branch 'remotes/marc/ticket/11323' into developNathaniel Guse2013-03-092-4/+12
|\ \
| * | [ticket/11323] Reduce additional code and revert regex to previous oneMarc Alexander2013-02-261-7/+12
| * | [ticket/11323] Enable tests for inclusion of defined variablesMarc Alexander2013-02-191-3/+0
| * | [ticket/11323] Correctly treat variables in template definesMarc Alexander2013-02-191-3/+9
* | | Merge remote-tracking branch 'remotes/Blitze/ticket/11383' into developNathaniel Guse2013-03-091-0/+6
|\ \ \
| * | | [ticket/11383] Correctly revert modules added/removed by migratorOpenShift guest2013-03-031-0/+6
* | | | Merge remote-tracking branch 'EXreaction/ticket/11423' into developDavid King2013-03-092-2/+2
|\ \ \ \
| * | | | [ticket/11423] Send unformatted usernames to the email templateNathaniel Guse2013-03-092-2/+2
|/ / / /
* | | | Merge remote-tracking branch 'remotes/nickv/ticket/11421' into developNathan Guse2013-03-071-1/+1
|\ \ \ \
| * | | | [ticket/11421] Correctly display submit button when neededJoas Schilling2013-03-071-1/+1
* | | | | Merge remote-tracking branch 'remotes/nickv/ticket/11417' into developNathan Guse2013-03-071-1/+1
|\ \ \ \ \
| * | | | | [ticket/11417] FIx submit button description on notifications options pageJoas Schilling2013-03-071-1/+1
| |/ / / /
* | | | | Merge remote-tracking branch 'remotes/nickv/ticket/11390' into developNathan Guse2013-03-071-7/+7
|\ \ \ \ \
| * | | | | [ticket/11390] Correctly separate list of notifications from headerJoas Schilling2013-03-071-0/+2
| * | | | | [ticket/11390] Hide pagination when there are no notificationsJoas Schilling2013-03-071-7/+5
| |/ / / /
* | | | | Merge remote-tracking branch 'remotes/nickv/ticket/11407' into developNathan Guse2013-03-071-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ticket/11407] Fix <dfn> description of "notification" option.Joas Schilling2013-03-071-1/+1
|/ / / /
* | | | 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-0614-0/+428
|\ \ \ \ \
| * | | | | [ticket/10202] Rename method names _all() to _array().Andreas Fischer2013-03-052-17/+17
| * | | | | [ticket/10202] Add migration file for config_db_text.Andreas Fischer2013-03-051-0/+45
| * | | | | [ticket/10202] Upgrade TEXT to the bigger MTEXT.Andreas Fischer2013-03-056-7/+7
| * | | | | [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] Define phpbb_config_db_text as a service.Andreas Fischer2013-03-052-0/+7
| * | | | | [ticket/10202] Add tests for phpbb_config_db_text.Andreas Fischer2013-03-052-0/+134
| * | | | | [ticket/10202] Adjust method names to guidelines.Andreas Fischer2013-03-051-6/+6
| * | | | | [ticket/10202] Add database schema for phpbb_config_db_text.Andreas Fischer2013-03-058-0/+79
| * | | | | [ticket/10202] Implementation of config options with arbitrary length values.Andreas Fischer2013-03-051-0/+157
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/11166' into developDavid King2013-03-0610-20/+133
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11166Joas Schilling2013-03-06368-7928/+26189
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | 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
| | |/ / / / | |/| | | |
* | | | | | Merge remote-tracking branch 'EXreaction/ticket/11402' into developDavid King2013-03-052-8/+35
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [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-0418-313/+1725
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ticket/10714] Get log from container in install, update and download/fileJoas Schilling2013-03-043-2/+5
| * | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2013-03-04162-3467/+11651
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | [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-25100-144/+4465
| |\ \ \ \ \