aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11010] adding new input types into build_cfg_template()Senky2013-05-201-0/+2
* Merge remote-tracking branch 'EXreaction/ticket/11413' into developDavid King2013-05-208-119/+306
|\
| * [ticket/11413] Revert some cache service related changes from earlierNathaniel Guse2013-05-131-3/+3
| * [ticket/11413] $user should have been $this->userNathaniel Guse2013-05-131-1/+1
| * [ticket/11413] Translate the errorNathan Guse2013-05-101-1/+1
| * [ticket/11413] Rename file to something more helpfulNathan Guse2013-05-101-1/+1
| * [ticket/11413] Remove remaining irrelevant code to this PRNathaniel Guse2013-05-031-3/+3
| * [ticket/11413] Remove conversion of user_notificationsNathaniel Guse2013-05-021-90/+0
| * [ticket/11413] Correct copyright yearNathaniel Guse2013-05-021-1/+1
| * [ticket/11413] Remove changes for ticket 11420 from this branchNathaniel Guse2013-05-021-0/+64
| * [ticket/11413] Don't use the database for the convert testNathaniel Guse2013-04-301-1/+10
| * [ticket/11413] Use sql_insert_bufferNathaniel Guse2013-04-301-19/+8
| * [ticket/11413] Fix notification testsNathaniel Guse2013-04-293-4/+33
| * [ticket/11413] Prevent recursive function callsNathaniel Guse2013-04-291-1/+4
| * [ticket/11413] Undo editing the user_notifications tableNathaniel Guse2013-04-296-70/+57
| * [ticket/11413] Rename columns in notification/manager.phpNathaniel Guse2013-04-281-111/+165
| * [ticket/11413] Schema changes and migration fileNathaniel Guse2013-04-282-64/+206
* | Merge remote-tracking branch 'remotes/cyberalien/ticket/11482' into developNathan Guse2013-05-201-0/+28
|\ \
| * | [ticket/11482] Use double quotes for codeVjacheslav Trushkin2013-04-101-7/+7
| * | [ticket/11482] Implementation of advanced DEFINE tagVjacheslav Trushkin2013-04-071-0/+28
* | | Merge remote-tracking branch 'marc1706/ticket/11535' into developAndreas Fischer2013-05-192-4/+16
|\ \ \
| * | | [ticket/11535] Correctly merge avatar_errors array into primary error arrayMarc Alexander2013-05-132-4/+16
* | | | Merge remote-tracking branch 'EXreaction/ticket/11415' into developDavid King2013-05-184-103/+138
|\ \ \ \
| * | | | [ticket/11415] Send the extension base the finder rather than the managerNathan Guse2013-05-102-10/+9
| * | | | [ticket/11415] Create function in finder find_from_extensionNathan Guse2013-05-102-13/+30
| * | | | [ticket/11415] Make migrator/ext.manager dependencies of the base ext classNathaniel Guse2013-05-012-13/+23
| * | | | [ticket/11415] Remove migrator dependency from extension managerNathaniel Guse2013-05-011-4/+1
| * | | | [ticket/11415] Move migrator to base extension class from ext.managerNathaniel Guse2013-05-012-75/+86
| * | | | [ticket/11415] Move while loop from ext manager to acp_extensions.phpNathaniel Guse2013-05-012-27/+28
| | |_|/ | |/| |
* | | | Merge remote-tracking branch 'remotes/blitze/ticket/11458' into developNathaniel Guse2013-05-181-25/+16
|\ \ \ \
| * | | | [ticket/11458] Use finder to get all permission language filesOpenShift guest2013-05-101-35/+12
| * | | | [ticket/11458] We still auto add language files from the mods and acpOpenShift guest2013-04-131-4/+31
| * | | | [ticket/11458] Search for permission language files in extensionsOpenShift guest2013-03-251-24/+11
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-161-1/+1
|\ \ \ \ \
| * | | | | [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absoluteJoas Schilling2013-05-161-1/+1
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-151-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | [ticket/11546] Fix is_absolute() throws E_NOTICE for empty stringJoas Schilling2013-05-151-1/+1
* | | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11533' into developNathan Guse2013-05-121-0/+4
|\ \ \ \ \
| * | | | | [ticket/11533] Columns counter for notification settingsVjacheslav Trushkin2013-05-111-0/+4
* | | | | | Merge remote-tracking branch 'remotes/Marc/ticket/11465' into developNathan Guse2013-05-121-47/+26
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11465Marc Alexander2013-05-1262-620/+1999
| |\ \ \ \ \ \
| * | | | | | | [ticket/11465] Check if class exists before including info fileMarc Alexander2013-04-141-1/+1
| * | | | | | | [ticket/11465] The info file does not have _info suffixJoas Schilling2013-04-101-3/+4
| * | | | | | | [ticket/11465] Use extension finder when adding extensions' acp modulesMarc Alexander2013-03-211-47/+25
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'develop-olympus' into developNils Adermann2013-05-121-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | [ticket/11105] Added spaces between ; and "url=" to adhere to w3c conventions.gamerchan2013-05-121-1/+1
* | | | | | Merge remote-tracking branch 'remotes/bantu/ticket/11452' into developNathaniel Guse2013-05-111-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | [ticket/11452] Now notification_method_email checks whether user has address.Andreas Fischer2013-03-171-1/+1
* | | | | | Merge PR #1294 branch 'VSEphpbb/ticket/10155' into developOleg Pudeyev2013-05-081-0/+31
|\ \ \ \ \ \
| * | | | | | [ticket/10155] Update copyright in new migration file to 2013Matt Friedman2013-05-061-1/+1