aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2092 from nickvergessen/ticket/12090Nathan Guse2014-03-103-40/+84
|\
| * [ticket/12090] Move find() call to container and fix testsJoas Schilling2014-03-091-1/+1
| * [ticket/12090] Split finding routes and returning routes into 2 methodsJoas Schilling2014-03-092-7/+22
| * [ticket/12090] Fix parameter list of controller helper constructorJoas Schilling2014-03-091-2/+3
| * [ticket/12090] Make provider a service and inject it into the helperJoas Schilling2014-03-082-23/+13
| * [ticket/12090] Fix pagination for routesJoas Schilling2014-03-081-4/+24
| * [ticket/12090] Pass route name to url() to allow admins to change the routesJoas Schilling2014-03-071-10/+28
* | Merge remote-tracking branch 'rxu3/ticket/12224' into developJoas Schilling2014-03-103-0/+34
|\ \
| * | [ticket/12224] Add template wrapper method to assign block arraysrxu2014-02-233-0/+34
* | | Merge pull request #2089 from nickvergessen/ticket/12251Nathan Guse2014-03-097-18/+49
|\ \ \
| * | | [ticket/12251] Remove leading whitespace on doc blocksJoas Schilling2014-03-096-6/+6
| * | | [ticket/12251] Add string validation for a-zA-Z0-9 and underscoreJoas Schilling2014-03-061-13/+14
| * | | [ticket/12251] Load profile fields by default on posts, pms and memberlistJoas Schilling2014-03-061-0/+30
| | |/ | |/|
* | | Merge pull request #2099 from bantu/ticket/12256Nathan Guse2014-03-091-1/+1
|\ \ \
| * | | [ticket/12256] Selecting founders is fetching $sql instead of $resultForumhulp.com2014-03-091-1/+1
| |/ /
* | | Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/10945-develop' into ...Nathan Guse2014-03-091-23/+10
|\ \ \
| * | | Merge branch 'ticket/10945' into ticket/10945-developDhruv2014-03-081-23/+10
| |/ /
* | | [ticket/11938] Fix whitespace charactersDhruv2014-03-091-2/+2
* | | [ticket/11938] use sql_attr_string instead of sql_attr_str2ordinalDhruv2014-03-091-1/+1
|/ /
* | Merge pull request #2088 from nickvergessen/ticket/12236Nathan Guse2014-03-055-1/+197
|\ \
| * | [ticket/12249] Fix "Undefined variable: row" when editing profileJoas Schilling2014-03-051-1/+1
| * | [ticket/12236] Move AOL Instant Messanger field to custom profile fieldJoas Schilling2014-03-052-0/+98
| * | [ticket/12237] Convert yahoo messanger to custom profile fieldJoas Schilling2014-03-052-0/+98
* | | Merge pull request #2058 from nickvergessen/ticket/12216Nathan Guse2014-03-051-0/+1
|\ \ \
| * | | [ticket/12216] Undefined index: lang_options when creating date profile fieldJoas Schilling2014-02-241-0/+1
| | |/ | |/|
* | | Merge pull request #2075 from Elsensee/ticket/11693Nathan Guse2014-03-051-2/+2
|\ \ \ | |_|/ |/| |
| * | [ticket/11693] Change sql_build_array to support DELETEOliver Schramm2014-03-021-2/+2
* | | Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into developNils Adermann2014-03-0514-77/+550
|\ \ \ | |/ / |/| |
| * | [ticket/12235] Convert WLM to custom profile fieldJoas Schilling2014-03-042-0/+98
| * | [ticket/12187] Do not make clickable when using as contact fieldJoas Schilling2014-03-045-27/+53
| * | [ticket/12187] Split generate_profile_fields_template() into 2 methodsJoas Schilling2014-03-041-96/+96
| * | [ticket/12187] Remove user_website fieldJoas Schilling2014-03-041-0/+47
| * | [ticket/12187] Convert website field data to custom profile fieldJoas Schilling2014-03-031-0/+52
| * | [ticket/12187] Add URL type for profile fieldsJoas Schilling2014-03-033-2/+85
| * | [ticket/12234] Replace ICQ with custom profile fieldJoas Schilling2014-02-282-0/+97
| * | [ticket/12233] Allow profile fields to be contact fieldsJoas Schilling2014-02-282-0/+70
* | | [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
|/ /
* | [ticket/12194] Ensure that field_show_novalue is presentJoas Schilling2014-02-272-0/+46
* | Merge remote-tracking branch 'nickvergessen/ticket/12205' into ticket/12205-d...Joas Schilling2014-02-251-1/+1
|/
* Merge pull request #2025 from marc1706/ticket/12183Nathan Guse2014-02-201-0/+40
|\
| * [ticket/12183] Add migration file for updating user_newpasswd columnMarc Alexander2014-02-101-0/+40
* | Merge pull request #1994 from prototech/ticket/12158Nathan Guse2014-02-181-1/+1
|\ \
| * | [ticket/12158] The pagination start value should be 0 when there are no items.Cesar G2014-02-031-1/+1
* | | Merge pull request #2002 from prototech/ticket/12153Nathan Guse2014-02-181-99/+88
|\ \ \
| * | | [ticket/12153] Remove duplicate assignment of $u_previous_page & $u_next_page.Cesar G2014-02-181-1/+0
| * | | [ticket/12153] Remove vars already assigned in generate_template_pagination().Cesar G2014-02-031-11/+2
| * | | [ticket/12153] Assign PAGE_NUMBER in pagination.generate_template_pagination()Cesar G2014-02-031-89/+88
* | | | Merge branch 'develop-olympus' into developNils Adermann2014-02-181-1/+1
* | | | Merge pull request #2008 from marc1706/ticket/12167Nathan Guse2014-02-181-1/+1
|\ \ \ \