aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2012-07-231-2/+5
|\
| * Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-231-2/+5
| |\
| | * [ticket/10965] Profile data is only grabbed when show_novalue is enabledNils Adermann2012-07-231-2/+5
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-231-0/+8
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-231-0/+8
| |\ \ | | |/
| | * [ticket/10965] Make sure all profile fields are always grabbed on viewtopicNils Adermann2012-07-231-0/+8
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-2313-13/+46
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-2313-13/+46
| |\ \ | | |/
| | * [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1Nils Adermann2012-07-231-1/+1
| | * [ticket/10965] Introduce a new profile field option to display no valueNils Adermann2012-07-2313-13/+46
* | | Merge pull request #914 from EXreaction/ticket/10990Nils Adermann2012-07-2218-30/+31
|\ \ \
| * | | [ticket/10990] Changes for developNathan Guse2012-07-227-29/+29
| * | | [ticket/10990] Do not use comma separator when storing it as a log.Nathan Guse2012-07-226-10/+10
| * | | [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriateNathan2012-07-2222-61/+62
* | | | Merge remote-tracking branch 'github-igorw/ticket/11012' into developNils Adermann2012-07-216-29/+29
|\ \ \ \
| * | | | [ticket/11012] Normalize $phpEx member vars to $php_extIgor Wiedler2012-07-216-29/+29
* | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/11002' into developNils Adermann2012-07-212-40/+69
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ticket/11002] Use translating option to rename the Etc/GMT optionsJoas Schilling2012-07-212-40/+69
| |/ / /
* | | | Merge branch 'develop-olympus' into developNils Adermann2012-07-212-84/+123
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'prep-release-3.0.11' into develop-olympusNils Adermann2012-07-212-84/+123
| |\ \ \ | | | |/ | | |/|
| | * | Merge remote-tracking branch 'github-nickvergessen/ticket/10950' into prep-re...Nils Adermann2012-07-212-84/+123
| | |\ \
| | | * | [ticket/10950] Fix grammar in commentsJoas Schilling2012-07-201-3/+3
| | | * | [ticket/10950] Delete PMs for users that have not yet read the pmJoas Schilling2012-07-202-33/+45
| | | * | [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each userJoas Schilling2012-07-161-5/+18
| | | * | [ticket/10950] Use database count() and group by instead of doing that in phpJoas Schilling2012-07-111-11/+5
| | | * | [ticket/10950] Check $delete_ids to be not emptyJoas Schilling2012-07-041-19/+22
| | | * | [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()Joas Schilling2012-07-041-58/+74
| | | * | [ticket/10950] Correct comment for the second query.Andreas Fischer2012-06-231-1/+1
| | | * | [ticket/10950] Add empty line to make unset() call more visible.Andreas Fischer2012-06-231-0/+1
| | | * | [ticket/10950] Select the correct columns in SQL queries.Andreas Fischer2012-06-231-2/+2
| | | * | [ticket/10950] Use a variable for the private message id.Andreas Fischer2012-06-231-6/+8
| | | * | [ticket/10950] Move array initialisation to the front.Andreas Fischer2012-06-231-1/+2
| | | * | [ticket/10950] Remove redundant if statement.Andreas Fischer2012-06-231-12/+9
| | | * | [ticket/10950] Fix SQL coding style (indentation) in second SQL query.Andreas Fischer2012-06-231-1/+1
| | | * | [ticket/10950] Use proper ' in order to fix comment.Andreas Fischer2012-06-231-1/+1
* | | | | [ticket/11008] Change onunload_functions to not use eval()Igor Wiedler2012-07-216-8/+12
* | | | | [ticket/11008] Remove eval() calls to get document[id]Igor Wiedler2012-07-214-20/+4
| |_|_|/ |/| | |
* | | | Merge branch 'develop-olympus' into developNils Adermann2012-07-191-29/+40
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.0.11' into develop-olympusNils Adermann2012-07-191-30/+37
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'github-noxwizard/ticket/10441' into prep-releas...Nils Adermann2012-07-191-30/+37
| | |\ \
| | | * | [ticket/10441] Make CDB linking more consistentPatrick Webster2012-07-021-5/+5
| | | * | [ticket/10441] TypoPatrick Webster2012-06-291-1/+1
| | | * | [ticket/10441] Update to docs/README.htmlOyabun12012-06-291-28/+35
| | | |/
* | | | Merge pull request #843 from nickvergessen/feature/new-tz-handlingNils Adermann2012-07-1947-280/+877
|\ \ \ \
| * | | | [feature/new-tz-handling] Don't use global user but make it a parameterJoas Schilling2012-07-195-8/+11
| * | | | [feature/new-tz-handling] Fix size of suggestion button in chromeJoas Schilling2012-07-191-1/+1
| * | | | [feature/new-tz-handling] Fall back to UTC, if the timezone is invalidJoas Schilling2012-07-192-2/+17
| * | | | [feature/new-tz-handling] Add previous selected value to validation if validJoas Schilling2012-07-192-5/+39
| * | | | [feature/new-tz-handling] Display suggestion when a different value is selectedJoas Schilling2012-07-192-2/+10
| * | | | [feature/new-tz-handling] Remove additional marking of selected itemsJoas Schilling2012-07-182-3/+2