aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | [feature/migrations] Basic migrations with schema and data changesNils Adermann2013-01-0911-0/+415
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The migrator takes care of applying migrations as necessary. RFC: http://area51.phpbb.com/phpBB/viewtopic.php?f=84&t=41337 PHPBB3-9737
* | | | [ticket/11201] Revert WLM dropping because it is still used in China.Andreas Fischer2013-02-0439-21/+267
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows Live Messenger is still in use in china which accounts for ~20% of world population. Revert WLM dropping which has been merged under the assumption that WLM data and features are completely useless. This commit reverts commits - 460470229d972b93ef5a98b0d1d97a2a970d684f - 9affd6f7e7b95442f1ef14894858d8213f3fbd2a which have been merged by d59431691c27c73fba8ae9934b84b34a13280dd2. PHPBB3-11201
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-02-031-3/+3
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * develop-olympus: [ticket/11220] Improvement to the info pop-up from "list="
| * | | Merge remote-tracking branch 'Crizz0/ticket/11220' into develop-olympusAndreas Fischer2013-02-031-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * Crizz0/ticket/11220: [ticket/11220] Improvement to the info pop-up from "list="
| | * | | [ticket/11220] Improvement to the info pop-up from "list="Crizz02013-02-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A improvement to the info popup which is displayed when the cursor is over the bbcode-button [list=] in the posting-editor PHPBB3-11220
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-01-311-1/+1
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | * develop-olympus: [ticket/11233] prohibit selecting anonymous user as a PM recipient
| * | | Merge remote-tracking branch 'dhruvgoel92/ticket/11233' into develop-olympusAndreas Fischer2013-01-311-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11233: [ticket/11233] prohibit selecting anonymous user as a PM recipient
| | * | | [ticket/11233] prohibit selecting anonymous user as a PM recipientDhruv2013-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While composing pm, it should not be allowed to add anonymous user as a PM recipient PHPBB3-11233
* | | | | Merge branch 'develop-olympus' into developNathaniel Guse2013-01-301-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Senky # Via Nathaniel Guse (1) and Senky (1) * develop-olympus: [ticket/10050] removing prosilver edits [ticket/10050] adding .topicrow to template condition Conflicts: phpBB/styles/subsilver2/template/viewforum_body.html
| * | | | Merge remote-tracking branch 'remotes/Senky/ticket/10050' into develop-olympusNathaniel Guse2013-01-301-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Senky # Via Senky * remotes/Senky/ticket/10050: [ticket/10050] removing prosilver edits [ticket/10050] adding .topicrow to template condition
| | * | | [ticket/10050] removing prosilver editsSenky2013-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10050
| | * | | [ticket/10050] adding .topicrow to template conditionSenky2013-01-222-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10050
* | | | | Merge PR #1219 branch 'develop-olympus' into developOleg Pudeyev2013-01-271-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Oleg Pudeyev (1) * develop-olympus: [ticket/11343] Remove spare parentheses. [ticket/11343] Remove spare space. [ticket/11343] Use === when checking stored user_actkey against user input.
| * | | | [ticket/11343] Remove spare parentheses.Andreas Fischer2013-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11343
| * | | | [ticket/11343] Remove spare space.Andreas Fischer2013-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11343
| * | | | [ticket/11343] Use === when checking stored user_actkey against user input.Andreas Fischer2013-01-251-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Use strict comparison when checking whether stored user_actkey is equal to user input. PHPBB3-11343
| * | | Merge remote-tracking branch 'remotes/Sajaki/ticket/10854' into develop-olympusNathan Guse2013-01-151-0/+16
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Sajaki # Via Sajaki * remotes/Sajaki/ticket/10854: [ticket/10854] sql server drop default constraint when dropping column
* | \ \ \ Merge remote-tracking branch 'remotes/cyberalien/ticket/11329' into developNathan Guse2013-01-222-21/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11329: [ticket/11329] Moving colors to colours.css
| * | | | | [ticket/11329] Moving colors to colours.cssVjacheslav Trushkin2013-01-212-21/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving color values from buttons.css to colours.css PHPBB3-11329
* | | | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11328' into developNathan Guse2013-01-224-8/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11328: [ticket/11328] Replace long buttons text with short text [ticket/11328] Add language variables for buttons
| * | | | | | [ticket/11328] Replace long buttons text with short textVjacheslav Trushkin2013-01-163-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace long buttons text with short text, like it was on images PHPBB3-11328
| * | | | | | [ticket/11328] Add language variables for buttonsVjacheslav Trushkin2013-01-161-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New language variables for buttons PHPBB3-11328
* | | | | | | [ticket/9492] Fix typo in SQL queryJoas Schilling2013-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9492
* | | | | | | [ticket/9492] Ensure to delete the avatar/rank data when we change itJoas Schilling2013-01-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9492
* | | | | | | [ticket/9492] Ensure to update all avatar values when the avatar is changedJoas Schilling2013-01-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9492
* | | | | | | [ticket/9492] Fix undefined user_avatar_* values when updating the group avatarJoas Schilling2013-01-171-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9492
* | | | | | | [ticket/9492] Retain custom ranks and avatars when setting users default groupJoas Schilling2013-01-171-30/+53
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-9492
* | | | | | [ticket/10786] Javascript toggle member search panel in memberlist.phpDavid Colón2013-01-152-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search functions on the memberlist.php page are now rendered by default and displayed via javascript. If javascript is disabled the page still works as it previously did. PHPBB3-10786
* | | | | | [ticket/10786] Javascript toggle member search panel in memberlist.phpDavid Colón2013-01-156-85/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search functions on the memberlist.php page are now rendered by default and displayed via javascript. If javascript is disabled the page still works as it previously did. PHPBB3-10786
* | | | | | [ticket/10786] Javascript toggle member search panel in memberlist.phpDavid Colón2013-01-156-19/+89
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10786
* | | | | | Merge remote-tracking branch 'remotes/Sajaki/ticket/10854' into developNathan Guse2013-01-151-0/+16
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Sajaki # Via Sajaki * remotes/Sajaki/ticket/10854: [ticket/10854] sql server drop default constraint when dropping column
| * | | | | [ticket/10854] sql server drop default constraint when dropping columnSajaki2012-04-281-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drops default columns with T-SQL before attempting drop column to avoids sql exception. This is a huge annoyance in UMIL scripts running under sql server.
* | | | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/10431' into developNathan Guse2013-01-156-64/+60
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/10431: [ticket/10431] Remove .left class from reply-all [ticket/10431] Remove reply-all custom css [ticket/10431] Adjustments for large buttons [ticket/10431] Changed fonts for Linux [ticket/10431] Adjustments for IE7 [ticket/10431] Different font for iOS [ticket/10431] CSS3 buttons
| * | | | | [ticket/10431] Remove .left class from reply-allVjacheslav Trushkin2013-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove .left class from .reply-all button PHPBB3-10431
| * | | | | [ticket/10431] Remove reply-all custom cssVjacheslav Trushkin2013-01-161-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove CSS for reply-all button that is no longer used PHPBB3-10431
| * | | | | [ticket/10431] Adjustments for large buttonsVjacheslav Trushkin2013-01-151-33/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing CSS for large buttons to display better on Mac browsers. Fixing tabs. PHPBB3-10431
| * | | | | [ticket/10431] Changed fonts for LinuxVjacheslav Trushkin2012-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added backup fonts for Linux systems that do not have Verdana font PHPBB3-10431
| * | | | | [ticket/10431] Adjustments for IE7Vjacheslav Trushkin2012-11-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjustments to buttons for IE7 PHPBB3-10431
| * | | | | [ticket/10431] Different font for iOSVjacheslav Trushkin2012-11-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Different font for buttons on iOS devices because Verdana looks incorrectly aligned in Safari/iOS. Also slightly changed text shadow. PHPBB3-10431
| * | | | | [ticket/10431] CSS3 buttonsVjacheslav Trushkin2012-11-114-50/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CSS3 replacements for big buttons PHPBB3-10431
* | | | | | Merge remote-tracking branch 'remotes/nickv/ticket/11201' into developNathan Guse2013-01-1539-267/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/11201: [ticket/11201] Remove database column on update [ticket/11201] Remove MSN/WLM fields
| * | | | | | [ticket/11201] Remove database column on updateJoas Schilling2013-01-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11201
| * | | | | | [ticket/11201] Remove MSN/WLM fieldsJoas Schilling2013-01-1138-267/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WLM will be shutdown in March 2013. Skype is the new replacement. But as Skype uses a different login ID and service, the values in this field are useless. So we can safely remove the field and the links/functions we create. PHPBB3-11201
* | | | | | | Merge remote-tracking branch 'remotes/brunoais/ticket/11171' into developNathan Guse2013-01-1411-51/+80
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Bruno Ais # Via Bruno Ais * remotes/brunoais/ticket/11171: [ticket/11171] Moved the DB schema changes to its place [ticket/11171] Cleanup of leftovers [ticket/11171] Adapted the code in report.php [ticket/11171] Use the options stored to decide how to show it [ticket/11171] DB changes for the update [ticket/11171] DB additions for these changes Conflicts: phpBB/install/schemas/firebird_schema.sql phpBB/install/schemas/mssql_schema.sql phpBB/install/schemas/mysql_40_schema.sql phpBB/install/schemas/mysql_41_schema.sql phpBB/install/schemas/oracle_schema.sql phpBB/install/schemas/postgres_schema.sql phpBB/install/schemas/sqlite_schema.sql
| * | | | | | [ticket/11171] Moved the DB schema changes to its placeBruno Ais2012-12-071-19/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the db changes schema to the place where all the other schema changes are. PHPBB3-11171
| * | | | | | [ticket/11171] Cleanup of leftoversBruno Ais2012-12-071-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I didn't notice that there were actually leftovers from the other PR. Anyway, this will remove all the leftovers I noticed from the other PR. PHPBB3-11171
| * | | | | | [ticket/11171] Adapted the code in report.phpBruno Ais2012-12-071-19/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the variable aliases needed (to look and feel the same as it was before) Added the variables into the table insert. PHPBB3-11171
| * | | | | | [ticket/11171] Use the options stored to decide how to show itBruno Ais2012-12-071-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added what's needed so that the post in the report is parsed the same way as it was being parsed when the post was reported PHPBB3-11171
| * | | | | | [ticket/11171] DB changes for the updateBruno Ais2012-12-071-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are the changes to database_update.php required for this ticket. PHPBB3-11171
| * | | | | | [ticket/11171] DB additions for these changesBruno Ais2012-12-058-19/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made the required changes to develop/create_schema_files.php and this is what resulted of that. PHPBB3-11171