aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/12236] Fix layout of memberlist searchJoas Schilling2014-03-052-34/+25
* [ticket/12236] Move AOL Instant Messanger field to custom profile fieldJoas Schilling2014-03-0540-134/+139
* [ticket/12237] Regenerate db schema filesJoas Schilling2014-03-057-14/+14
* [ticket/12237] Convert yahoo messanger to custom profile fieldJoas Schilling2014-03-0530-69/+119
* [develop] Fix incorrect merge conflict resolution from PR #2085Nils Adermann2014-03-051-1/+1
* Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into developNils Adermann2014-03-0566-528/+758
|\
| * [ticket/12235] Convert WLM to custom profile fieldJoas Schilling2014-03-0434-239/+144
| * [ticket/12187] Do not make clickable when using as contact fieldJoas Schilling2014-03-046-28/+54
| * [ticket/12187] Split generate_profile_fields_template() into 2 methodsJoas Schilling2014-03-044-104/+104
| * [ticket/12187] Remove user_website fieldJoas Schilling2014-03-049-8/+47
| * [ticket/12187] Remove user_website functionalityJoas Schilling2014-03-0329-86/+19
| * [ticket/12187] Convert website field data to custom profile fieldJoas Schilling2014-03-0310-4/+64
| * [ticket/12187] Add URL type for profile fieldsJoas Schilling2014-03-039-2/+105
| * [ticket/12234] Replace ICQ with custom profile fieldJoas Schilling2014-02-2840-117/+128
| * [ticket/12233] Update schema fileJoas Schilling2014-02-281-3/+3
| * [ticket/12233] Add images back to subsilver2Joas Schilling2014-02-281-1/+1
| * [ticket/12233] Allow profile fields to be contact fieldsJoas Schilling2014-02-2818-13/+166
* | Merge pull request #2057 from nickvergessen/ticket/12226Nils Adermann2014-03-054-9/+14
|\ \
| * | [ticket/12227] "X from Y messages" should be "X out of Y messages"Joas Schilling2014-02-241-6/+6
| * | [ticket/12226] Split language strings to correctly allow multiple plural rulesJoas Schilling2014-02-244-9/+14
* | | Merge pull request #2083 from hjpotter92/ticket/12245Andreas Fischer2014-03-031-2/+2
|\ \ \
| * | | [ticket/12245] Fix id attributes in acp_prune_users.htmlhjpotter922014-03-041-2/+2
|/ / /
* | | Merge remote-tracking branch 'vsephpbb/ticket/11645' into developJoas Schilling2014-03-021-1/+1
|\ \ \
| * | | [ticket/11645] Rename .MODs tab in ACP to ExtensionsMatt Friedman2014-03-021-1/+1
* | | | Merge remote-tracking branch 'Crizz0/ticket/9255' into developCesar G2014-03-021-0/+2
|\ \ \ \
| * | | | [ticket/9255] Changed overflow-x to overflow-yCrizzo2014-03-021-1/+1
| * | | | [ticket/9255] Added max-height and overflow-x to cp-mini in cp.cssCrizzo2014-03-021-0/+2
| |/ / /
* | | | Merge remote-tracking branch 'Crizz0/ticket/12126' into developCesar G2014-03-023-11/+10
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/12126] deleted left:0 and right:0 in responsive.css .phpbb_alertCrizzo2014-03-021-2/+0
| * | | [ticket/12126] left:0 and right: 0; admin.css --> width: autoCrizzo2014-03-022-3/+4
| * | | [ticket/12126] Changed .phpbb_alert "max-width: 640px" to "width: 620px"Crizzo2014-03-023-2/+3
| * | | [ticket/12126] Fixed position of alert box in IECrizz02014-03-022-8/+7
|/ / /
* | | Merge pull request #2065 from prototech/ticket/12232Nathan Guse2014-03-011-2/+4
|\ \ \
| * | | [ticket/12232] Fix a similar excessive pattern in the method.Cesar G2014-02-271-1/+2
| * | | [ticket/12232] Remove excessive calls to sizeof() in assign_block_vars() methodCesar G2014-02-271-1/+2
| | |/ | |/|
* | | Merge remote-tracking branch 'rxu3/ticket/12222' into developJoas Schilling2014-03-012-2/+2
|\ \ \
| * | | [ticket/12222] Replace hardoded comma with translatable separatorrxu2014-02-232-2/+2
| | |/ | |/|
* | | Merge remote-tracking branch 'prototech/ticket/12238' into developJoas Schilling2014-03-012-33/+0
|\ \ \
| * | | [ticket/12238] Remove defunct confirmation box template code.Cesar G2014-03-012-33/+0
| | |/ | |/|
* | | Merge branch 'develop-olympus' into developJoas Schilling2014-03-012-5/+26
|\ \ \
| * \ \ Merge remote-tracking branch 'bantu/ticket/11509' into develop-olympusJoas Schilling2014-03-012-5/+26
| |\ \ \
| | * | | [ticket/11509] Exit with the expected (non-zero) exit status on failure.Andreas Fischer2014-02-211-3/+22
| | * | | [ticket/11509] Output which commit is being inspected.Andreas Fischer2014-02-211-0/+2
| | * | | [ticket/11509] Three dots means sym. difference, but we only want new commits.Andreas Fischer2014-02-212-2/+2
* | | | | Merge branch 'develop-olympus' into developJoas Schilling2014-03-010-0/+0
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Merge pull request #2059 from nickvergessen/ticket/12205Nils Adermann2014-02-252-1/+43
| |\ \ \
* | \ \ \ Merge pull request #2062 from nickvergessen/ticket/12194Nils Adermann2014-02-272-0/+46
|\ \ \ \ \
| * | | | | [ticket/12194] Ensure that field_show_novalue is presentJoas Schilling2014-02-272-0/+46
|/ / / / /
* | | | | Merge pull request #2060 from nickvergessen/ticket/12205-developNils Adermann2014-02-262-1/+43
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/12205' into ticket/12205-d...Joas Schilling2014-02-252-1/+43
| |\ \ \ \ |/ / / / / | | | _ / | | | /