aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'imkingdavid/ticket/11824' into developJoas Schilling2013-09-131-0/+48
|\
| * [ticket/11824] Revert changes in functions.phpDavid King2013-09-121-3/+3
| * [ticket/11824] Revert changes to functions_content.phpDavid King2013-09-121-2/+2
| * [ticket/11824] Correct a commentDavid King2013-09-061-1/+1
| * [ticket/11824] Remove unused globalsDavid King2013-09-061-1/+1
| * [ticket/11824] Fix smiliesDavid King2013-09-061-2/+2
| * [ticket/11824] Fix logicDavid King2013-09-061-1/+1
| * [ticket/11824] Add option for mod_rewriteDavid King2013-09-032-3/+51
* | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11373Nathan Guse2013-09-1227-222/+2006
|\ \
| * \ Merge pull request #1620 from EXreaction/ticket/11745David King2013-09-121-23/+6
| |\ \
| | * | [ticket/11745] Group request approved notificationNathan Guse2013-07-271-23/+6
| * | | Merge pull request #1617 from EXreaction/ticket/11744David King2013-09-122-34/+25
| |\ \ \ | | |/ /
| | * | [ticket/11744] Move notification from ucp_groups to group_user_addNathaniel Guse2013-07-262-8/+15
| | * | [ticket/11744] Group join request notificationNathan Guse2013-07-262-31/+15
| * | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathan Guse2013-09-122-0/+2
| |\ \ \
| | * | | [ticket/11829] Use report_closed to determine status in MCP report_detailsrechosen2013-09-042-0/+2
| * | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauthJoseph Warner2013-09-103-2/+1302
| |\ \ \ \
| | * | | | [ticket/develop/11832] Fix path detectionVjacheslav Trushkin2013-09-091-1/+7
| | * | | | Merge pull request #1618 from VSEphpbb/ticket/11747Nathan Guse2013-09-051-1/+76
| | |\ \ \ \
| | | * | | | [ticket/11747] ucp_prefs_post core eventsMatt Friedman2013-07-261-0/+25
| | | * | | | [ticket/11747] ucp_prefs_view core eventsMatt Friedman2013-07-261-0/+25
| | | * | | | [ticket/11747] ucp_prefs_personal core eventsMatt Friedman2013-07-261-0/+25
| | | * | | | [ticket/11747] Add $phpbb_dispatcher to globalMatt Friedman2013-07-261-1/+1
| | | | |/ / | | | |/| |
| | * | | | [ticket/11825] Move schema_data.php into includes/ instead of phpbb/Dhruv2013-09-031-0/+1194
| | | |_|/ | | |/| |
| * | | | [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ...Joseph Warner2013-09-0624-195/+186
| |\ \ \ \ | | |/ / /
| | * | | Merge remote-tracking branch 'EXreaction/ticket/11791' into developDavid King2013-09-021-1/+1
| | |\ \ \
| | | * | | [ticket/11791] Load adm/ events from styles/adm/event/Nathan Guse2013-09-021-1/+1
| | * | | | [ticket/11215] Add commented-out URL rewrite capability to .htaccessDavid King2013-09-021-0/+8
| | * | | | Merge remote-tracking branch 'upstream/develop' into ticket/11215David King2013-09-021-0/+5
| | |\ \ \ \
| | | * \ \ \ Merge branch 'develop-olympus' into developAndreas Fischer2013-09-021-0/+5
| | | |\ \ \ \ | | | | |/ / / | | | |/| | / | | | | | |/ | | | | |/|
| | | | * | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-021-1/+4
| | | | |\ \
| | | | | * | [ticket/11769] Allow '0' as usernameJoas Schilling2013-09-021-1/+1
| | | | | * | [ticket/11769] Fix language issues in the doc blocksJoas Schilling2013-08-231-3/+3
| | | | | * | [ticket/11769] Correctly supply the post author's username in posting.phpJoas Schilling2013-08-231-1/+4
| | * | | | | [ticket/11215] Everything appears to be working...David King2013-08-311-19/+9
| | * | | | | Merge branch 'develop' into ticket/11215David King2013-08-31275-49476/+131
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628Nathan Guse2013-08-2815-112/+70
| | | |\ \ \ \
| | | | * \ \ \ Merge branch 'develop-olympus' into developJoas Schilling2013-08-261-0/+2
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | [ticket/11799] Send anti abuse headers in "new password" emails.Andreas Fischer2013-08-231-0/+2
| | | | * | | | Merge remote-tracking branch 'cyberalien/ticket/11754' into developAndreas Fischer2013-08-181-2/+0
| | | | |\ \ \ \
| | | | | * | | | [ticket/11754] Remove styleswitcher leftoversVjacheslav Trushkin2013-07-301-2/+0
| | | | * | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-08-151-2/+2
| | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | |
| | | | | * | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-151-2/+2
| | | | | |\ \ \ \ | | | | | | | |/ / | | | | | | |/| |
| | | | | | * | | [ticket/11775] Fix error when moving the last post to another topicJoas Schilling2013-08-081-2/+2
| | | | | | * | | [prep-release-3.0.12] Bumping version number for 3.0.12-RC2.Andreas Fischer2013-08-011-1/+1
| | | | * | | | | [ticket/11774] Fix constant to avoid PHP errorsOliver Schramm2013-08-081-1/+1
| | | | * | | | | Merge remote-tracking branch 'nickvergessen/ticket/11574' into developDhruv2013-08-081-7/+34
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge remote-tracking branch 'phpbb/develop' into ticket/11574Joas Schilling2013-07-3010-61/+56
| | | | | |\ \ \ \ \ | | | | | | | |_|/ / | | | | | | |/| | |
| | | | | * | | | | [ticket/11574] Fix more issues in the updaterIgor Wiedler2013-07-141-6/+6
| | | | | * | | | | Merge remote-tracking branch 'upstream/develop' into ticket/11574Igor Wiedler2013-07-14256-48956/+1883
| | | | | |\ \ \ \ \
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-14 10:26:50 +0000