aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1788 from VSEphpbb/ticket/11935Nathan Guse2013-11-0451-78/+96
|\ | | | | [ticket/11935] Fix invalid HTML and Errors
| * [ticket/11935] Merge remote-tracking branch 'upstream/develop'Matt Friedman2013-10-29101-985/+2768
| |\ | | | | | | | | | PHPBB3-11935
| * \ Merge branch 'develop' into ticket/11935Matt Friedman2013-10-2039-219/+1419
| |\ \
| * | | [ticket/11935] Tweak colour swatch tableMatt Friedman2013-10-191-2/+9
| | | | | | | | | | | | | | | | PHPBB3-11935
| * | | [ticket/11935] Replace obsolete table attributes in Admin with CSSMatt Friedman2013-10-1932-46/+51
| | | | | | | | | | | | | | | | PHPBB3-11935
| * | | [ticket/11935] Remove obsolete table attributes from ProsilverMatt Friedman2013-10-1913-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | cellpadding, cellspacing, border are obsolete table attributes. They are handled by CSS already using table and .table1 PHPBB3-11935
| * | | [ticket/11935] Fix invalid HTML usage of <label> tag in prosilverMatt Friedman2013-10-196-6/+12
| | | | | | | | | | | | | | | | PHPBB3-11935
| * | | [ticket/11935] Fix stray </a> tagsMatt Friedman2013-10-191-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11935
| * | | [ticket/11935] Fix incorrect alt tags that should be title tagsMatt Friedman2013-10-191-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11935
| * | | [ticket/11935] Fix <p> tags not allowed inside <strong> tagsMatt Friedman2013-10-191-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11935
* | | | Merge pull request #1826 from imkingdavid/ticket/11975Nathan Guse2013-11-0410-16/+14
|\ \ \ \ | | | | | | | | | | [ticket/11975] Add ACP link next to MCP link in header
| * | | | [ticket/11975] Remove copy/paste fail, fix testsDavid King2013-11-021-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-11975
| * | | | [ticket/11975] Change shortened ACP/MCP label to Administer/ModerateDavid King2013-11-025-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also utilizing the new data-responsive-text attribute PHPBB3-11975
| * | | | [ticket/11975] Make link text shorter on smaller resolutionsDavid King2013-11-025-5/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-11975
| * | | | [ticket/11975] Add ACP link next to MCP link in headerDavid King2013-11-029-15/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-11975
* | | | | Merge remote-tracking branch 'prototech/ticket/11899' into developDhruv2013-11-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Cesar G # Via Cesar G * prototech/ticket/11899: [ticket/11899] Give indication of activity after voting in poll.
| * | | | | [ticket/11899] Give indication of activity after voting in poll.Cesar G2013-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11899
* | | | | | Merge remote-tracking branch 'prototech/ticket/11928' into developDhruv2013-11-048-25/+67
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Cesar G # Via Cesar G * prototech/ticket/11928: [ticket/11928] Javascript requires camel case. [ticket/11928] Rename loadingAlert to loading_indicator. [ticket/11928] Make sure the indicator is on top of other elements. [ticket/11928] Replace AJAX loading popup with animation.
| * | | | | | [ticket/11928] Javascript requires camel case.Cesar G2013-11-031-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11928
| * | | | | | [ticket/11928] Rename loadingAlert to loading_indicator.Cesar G2013-10-301-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11928
| * | | | | | [ticket/11928] Make sure the indicator is on top of other elements.Cesar G2013-10-292-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11928
| * | | | | | [ticket/11928] Replace AJAX loading popup with animation.Cesar G2013-10-298-15/+55
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | PHPBB3-11928
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/11973' into developDhruv2013-11-041-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/11973: [ticket/11973] Remove logic from tokens language array
| * | | | | | [ticket/11973] Remove logic from tokens language arrayJoas Schilling2013-10-261-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if a translator did no translate a token, it would not be displayed. On the other hand, the translator could add additional tokens which have no functionality. Functionality is already hardcoded into bbcode.php so we can that in the ACP aswell, in order to prevent namend issues. PHPBB3-11973
* | | | | | | Merge remote-tracking branch 'Noxwizard/ticket/11990' into developAndreas Fischer2013-11-031-8/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Noxwizard/ticket/11990: [ticket/11990] Remove result_mssqlnative usage in acp_database.php
| * | | | | | | [ticket/11990] Remove result_mssqlnative usage in acp_database.phpPatrick Webster2013-11-031-8/+9
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The class result_mssqlnative was removed in ticket 11980. This removes the dependency on that class from the database backup utility. It is possible to use the sqlsrv functions to retrieve the field information, but they must be then mapped back to type names. That mapping was removed in 11980 and it is easier to just look it up in the information schema table. PHPBB3-11990
* | | | | | | Merge remote-tracking branch 'cyberalien/ticket/11977' into developJoas Schilling2013-11-035-151/+28
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/11977: [ticket/11977] Remove data and change code in acp_modules [ticket/11977] Use CSS instead of JS to disable up/down icons
| * | | | | | [ticket/11977] Remove data and change code in acp_modulesVjacheslav Trushkin2013-11-033-17/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11977
| * | | | | | [ticket/11977] Use CSS instead of JS to disable up/down iconsVjacheslav Trushkin2013-11-024-134/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11977
* | | | | | | [ticket/11972] Fix the sincesDavid King2013-11-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11972
* | | | | | | [ticket/11972] Add the sincesDavid King2013-11-021-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11972
* | | | | | | [ticket/11972] Add posting_editor_message_after template eventDavid King2013-11-023-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11972
* | | | | | | [ticket/11972] Add posting_editor_message_before template eventDavid King2013-11-023-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11972
* | | | | | | [ticket/11972] Add posting_editor_subject_before template eventDavid King2013-11-023-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11972
* | | | | | | [ticket/11972] Add posting_editor_subject_after template eventDavid King2013-11-023-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11972
* | | | | | | [ticket/11746] The IN_PHPBB check is not necessary.Cesar G2013-11-021-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11746
* | | | | | | Merge pull request #1840 from cyberalien/ticket/11030Nathan Guse2013-11-021-2/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix cursor in prosilver and ACP
| * | | | | | [ticket/11030] Fix cursor for checkboxesVjacheslav Trushkin2013-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11030
| * | | | | | [ticket/11030] Fixing cursor appearing in file upload browse button.erangamapa2013-10-301-2/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed unnecessary cursor CSS properties added for form inputs in both acp and prosilver styles. Added cursor:pointer property only for buttons. PHPBB3-11030
* | | | | | Merge pull request #1790 from prototech/ticket/11280Nathan Guse2013-11-021-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/11280] Prevent duplicate entry in forums_track table.
| * | | | | | [ticket/11280] Prevent duplicate entry in forums_track table.Cesar G2013-10-161-1/+0
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enforcing a time limit prevents all rows from being selected, thus a new row is inserted resulting in a duplicate entry. PHPBB3-11280
* | | | | | Merge pull request #1812 from prototech/ticket/11746Nathan Guse2013-11-027-35/+211
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/11746] Add "admin activation required" notification.
| * | | | | | [ticket/11746] Delete the notification after user is approved & fix language.Cesar G2013-10-263-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11746
| * | | | | | [ticket/11746] Add "admin activation required" notification.Cesar G2013-10-247-35/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11746
* | | | | | | [ticket/11995] Fix Revert of config.removeJoas Schilling2013-11-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11995
* | | | | | | Merge remote-tracking branch 'brunoais/ticket/11663' into developJoas Schilling2013-11-021-1/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/11663: [ticket/11663] Add the doc block about the parameters. [ticket/11663] Add the doc block about the return value. [ticket/11663] Make generate_text_for_storage return the errors.
| * | | | | | | [ticket/11663] Add the doc block about the parameters.brunoais2013-08-171-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11663
| * | | | | | | [ticket/11663] Add the doc block about the return value.brunoais2013-08-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generate_text_for_storage does not return anything, all returned values are outputted using the parameters so this uses the returned value with the same idea as many C language functions where the returned value is if all went well or not and if it didn't what went wrong. PHPBB3-11663
| * | | | | | | [ticket/11663] Make generate_text_for_storage return the errors.brunoais2013-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generate_text_for_storage does not return anything, all returned values are outputted using the parameters so this uses the returned value with the same idea as many C language functions where the returned value is if all went well or not and if it didn't what went wrong. PHPBB3-11663
* | | | | | | | Merge pull request #1810 from nickvergessen/ticket/11031Nils Adermann2013-11-024-11/+172
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Ticket/11031 Bring phpBB2 converter up to speed with 3.1 changes