aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-213-6/+6
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/12990] Use protected instead of privateTristan Darricau2014-08-171-1/+1
| * | | | [ticket/12990] Use the full services name for the notification's typesTristan Darricau2014-08-163-7/+7
| | |/ / | |/| |
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-112-37/+44
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'github-marc1706/ticket/12822' into develop-ascr...Nils Adermann2014-08-112-37/+44
| |\ \ \
| | * | | [ticket/12822] Add method for deleting avatars and use confirm_boxMarc Alexander2014-08-072-37/+44
| | |/ /
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-113-7/+5
|\ \ \ \ | |/ / /
| * | | [ticket/11854] Rename captchas.factory service to captcha.factoryTristan Darricau2014-08-113-3/+3
| * | | [ticket/11854] Move captcha stuff to phpbb/ and use DI for pluginsTristan Darricau2014-08-113-7/+5
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-101-7/+0
|\ \ \ \ | |/ / /
| * | | [ticket/12938] Remove the 'Download all attachments' feature.Andreas Fischer2014-08-091-7/+0
| |/ /
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-021-6/+6
|\ \ \ | |/ /
| * | [ticket/12895] Rename user style setting to resolve conflict with style paramMarc Alexander2014-07-291-6/+6
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-07-161-3/+21
|\ \ \ | |/ /
| * | Merge pull request #2709 from rxu/ticket/12828Joas Schilling2014-07-161-3/+21
| |\ \
| | * | [ticket/12828] Add ucp_prefs.php common core eventrxu2014-07-131-3/+21
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-07-081-2/+3
|\ \ \ \ | |/ / /
| * | | [ticket/12804] Dont use ternary formPayBas2014-07-071-1/+1
| * | | [ticket/12804] Hide Jabber from UCP & member search when disabledPayBas2014-07-071-2/+3
| |/ /
* | | Merge branch 'develop-ascraeus' into developDhruv2014-07-011-1/+10
|\ \ \ | |/ /
| * | [ticket/12674] Use user's colour in 'Last edited' line in sent PMsOliver Schramm2014-06-301-1/+10
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-251-0/+1
|\ \ \ | |/ /
| * | Merge pull request #2567 from Crizz0/ticket/12680Joas Schilling2014-06-251-0/+1
| |\ \
| | * | [ticket/12680] Solves last bugs. viewprofile: contact --> contact nicknameCrizzo2014-06-231-1/+1
| | * | [ticket/12680] Still some problems with displaying the nickname in ucpCrizzo2014-06-151-1/+1
| | * | [ticket/12680] Little changes, but some issues are still thereCrizzo2014-06-141-0/+1
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-06-111-1/+0
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'github-marc1706/ticket/12352' into develop-ascr...Nils Adermann2014-06-111-1/+0
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/12352] Remove usages of user_pass_convert columnMarc Alexander2014-06-011-1/+0
* | | | Merge pull request #2557 from Elsensee/ticket/12516Joas Schilling2014-06-101-56/+50
|\ \ \ \
| * | | | [ticket/12516] Always preview signature in UCP/ACP moduleOliver Schramm2014-06-071-56/+50
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-06-092-2/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'github-nickvergessen/ticket/10073' into develop...Nils Adermann2014-06-092-2/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [ticket/10073] Split email validation from email ban and taken checksJoas Schilling2014-05-292-2/+2
| | |/ /
* | | | Merge branch 'develop-ascraeus' into developCesar G2014-06-021-1/+1
|\ \ \ \ | |/ / /
| * | | [ticket/12566] Also changed for ucp_pm_viewmessage.phpPayBas2014-06-021-1/+1
| |/ /
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-05-2828-129/+198
|\ \ \ | |/ /
| * | [ticket/12594] Remove @package tags and update file headersYuriy Rusko2014-05-2728-129/+198
* | | [ticket/12564] Remove version definition from ACP/MCP/UCP module info filesMatt Friedman2014-05-189-9/+0
|/ /
* | [ticket/12526] Fix undefined index: filesize when editing PM with attachments.Cesar G2014-05-111-1/+1
* | [ticket/12493] Fix sql query for selection of users that have disabled PMn-aleha2014-05-071-8/+7
* | Merge remote-tracking branch 'github-vse/ticket/12254' into develop-ascraeusNils Adermann2014-05-021-9/+14
|\ \
| * | [ticket/12254] Use a cookie instead of SID to store language selectionMatt Friedman2014-05-021-2/+9
| * | [ticket/12254] No longer need to add change_lang to the URL paramsMatt Friedman2014-04-111-5/+4
| * | [ticket/12254] Use 'language' instead of 'set_lang' as the variable nameMatt Friedman2014-04-111-2/+2
| * | [ticket/12254] Persist set_lang after reg only if changed from defaultMatt Friedman2014-04-071-2/+2
| * | [ticket/12254] Use new set_lang var to avoid conflict with change_langMatt Friedman2014-04-071-3/+3
| * | [ticket/12254] Better language switching on registration pageMatt Friedman2014-04-061-1/+0
* | | Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-asc...Nils Adermann2014-05-021-2/+49
|\ \ \
| * | | [ticket/12265] Actually use $u_pm.Cesar G2014-04-151-1/+1