1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 03:54:10 +01:00

327 Commits

Author SHA1 Message Date
Joas Schilling
f4136eacdc Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/new-tz-handling 2012-07-18 11:07:32 +02:00
Andreas Fischer
2d250247f4 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10850] Changed the fopen mode to wb
2012-06-28 23:11:08 +02:00
Bruno Ais
3baeb4276d [ticket/10850] Changed the fopen mode to wb
Changed the fopen mode from "wt" to "wb" as requested in the PR.
The objective behind this is to prevent writting stuff like "\r\r\n" in
windows

PHPBB3-10850
2012-06-28 23:10:12 +02:00
Joas Schilling
3c6272ff04 [feature/new-tz-handling] Remove appearances of board_dst and user_dst
PHPBB3-9558
2012-06-18 15:08:46 +02:00
Joas Schilling
8f027b68d6 Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into feature/new-tz-handling
Conflicts:
	phpBB/includes/functions_profile_fields.php
	phpBB/includes/session.php
	phpBB/install/database_update.php
2012-06-04 18:09:35 +02:00
Oleg Pudeyev
c136bedf07 Merge PR #799 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10881] Replace old (and unify) file headers in develop files.
2012-05-10 14:43:14 -04:00
Andreas Fischer
226743d10b [ticket/10881] Replace old (and unify) file headers in develop files.
This especially also fixes the problem of the copyright symbol being
represented using 0xA9, which is neither ASCII nor the appropriate UTF8
byte sequence for the copyright symbol.

PHPBB3-10881
2012-05-10 11:53:54 +02:00
Senky
b83fa0349a [ticket/10847] fixing all misspelled "dependant" to "dependent"
PHPBB3-10847
2012-04-30 21:55:24 +02:00
Callum Macrae
e0df7d17f9 [ticket/10785] Fixed illegal use of $_REQUEST in develop/fill.php.
PHPBB3-10785
2012-04-11 13:00:02 +01:00
Oleg Pudeyev
98964a913c [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop
The pull request (#654) was merged a little too quickly.

In particular, display_last_subject per-forum option needs consensus.

This reverts commit b1fb34a4d7e446768b9f66ba6dd359173cd2a5fb, reversing
changes made to 7d6b289671c51694f17dd5f9849abf2534b55e59.

PHPBB3-10650
2012-04-04 19:23:05 -04:00
Rahul
f32547c215 [ticket/10650] Displaying last topic on forum list
The most recent topic title of the forum can now
be displayed on the board index. An option is provided
in the ACP under the 'General Forum Setting' which
allows the admin to enable or disable this feature.

PHPBB3-10650
2012-04-05 00:45:26 +05:30
Vjacheslav Trushkin
ba431def5d Merge remote-tracking branch 'upstream/develop' into feature/merging-style-components
* upstream/develop: (65 commits)
  [ticket/10730] Added label tag around "select" text in post splitting UI
  [ticket/10732] Add config_dev.php and config_test.php to .gitignore
  [ticket/10586] Added space in if statement
  [ticket/10586] Tidy up comments
  [task/php5.3] Updated range of tested PHP versions
  [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2
  [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2
  [ticket/10723] Stop Travis running all tests on sqlite
  [ticket/10703] Added a condition to check if ext directory exists
  [task/travis] Refactor php version check for dbunit install
  [task/travis] Exclude functional and slow tests
  [ticket/10719] Revert "Skip functional tests on PHP 5.2"
  [task/travis-develop2] Update version from 5.3 to 5.3.2
  [task/travis] Dropping support for 5.2 in develop branch
  [task/travis] Some more small travis fixes
  [task/travis] Rename travis phpunit config files
  [task/travis] Fixing some travis issues
  [ticket/10684] Adjust function and parameter name, minor changes.
  [task/travis] Add automated testing to readme
  [task/travis] Removing development information
  ...

Conflicts:
	phpBB/install/database_update.php
2012-03-29 22:38:07 +03:00
Oleg Pudeyev
4239d8aa4e Merge remote-tracking branch 'brunoais/feature/save-post-on-report' into develop
* brunoais/feature/save-post-on-report:
  [feature/save-post-on-report] Changed mark in subsilver2 to look like viewtopic
  [feature/save-post-on-report] bbcode_nl2br missing.
  [feature/save-post-on-report] Change the column type of reported text
  [feature/save-post-on-report] Changed the name of the column
  [feature/save-post-on-report] Bug fix table name
  [feature/save-post-on-report] Saves the post reported when a report is creat
  [feature/save-post-on-report] The complete changes for this feature
2012-03-27 22:45:02 -04:00
Andreas Fischer
0257cd1653 Merge remote-tracking branch 'dhruvgoel92/ticket/10703' into develop
* dhruvgoel92/ticket/10703:
  [ticket/10703] Added a condition to check if ext directory exists
2012-03-25 23:58:56 +02:00
Dhruv Goel
18c541dfee [ticket/10703] Added a condition to check if ext directory exists
The existence of ext directory is checked, if not present a proper
error message that file doesn't exist is printed out. No Fatal
Error messages.

PHPBB3-10703
2012-03-23 00:27:29 +05:30
Bruno Ais
18373035c3 [feature/save-post-on-report] Changed the name of the column
The name of the column was changed from reported_post AND
reported_text to reported_post_text.
This change was made by request

PHPBB3-10600
2012-03-19 08:27:32 -04:00
Bruno Ais
c241a4a2b4 [feature/save-post-on-report] Saves the post reported when a report is creat
A problem when creating a report is that the report may be made and then
the post changed. After the changes, if the report is seen the message
it shows may not be correct to be reported. With these changes, when
a report is created the system copies the post that was reported and
shows it in the report details in the MCP

PHPBB3-10600
2012-03-19 08:27:31 -04:00
Andreas Fischer
cfd0afe4ea Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10691] Fixed the speed of creating search index
2012-03-19 12:55:37 +01:00
Dhruv Goel
c551b46115 [ticket/10691] Fixed the speed of creating search index
$time is now initialized after each batch iteration.
Speed for each batch iteration of creating search index is fixed.

PHPBB3-10691
2012-03-19 17:11:30 +05:30
Chris Smith
af789040b8 [feature/new-tz-handling] Modify database schemas.
- Dropped the user_dst column which is no longer required.
- Modified the user_timezone column to take a string, max length 100.

PHPBB3-9558
2012-03-14 22:57:30 -04:00
Vjacheslav Trushkin
ae3b0f736d [feature/merging-style-components] Updating database and acp modules
Removing theme and template tables, adding new columns to styles table, deleting acp modules, deleting code that updates theme in updater

PHPBB3-10632
2012-03-14 23:18:18 +02:00
Igor Wiedler
625a1f2b20 Merge remote-tracking branch 'cyberalien/ticket/10378' into develop
* cyberalien/ticket/10378:
  [ticket/10378] Missing entries from imageset to css conversion
  [ticket/10378] Imageset to css convertor typo
2012-02-17 14:08:03 +01:00
Igor Wiedler
fa5f094197 Merge branch 'develop' into ticket/10380
* develop:
  [ticket/10652] Fixing typo in template class
  [ticket/10645] Missing CSS for checkboxes
  [ticket/10614] Change not installed heading to available.
  [ticket/10614] Unbreak all_available on extension manager.
  [ticket/10614] Check if cache exists before destroying it
  [ticket/10614] Remove ext manager exceptions for now
  [ticket/10614] Refactor list command to use manager API
  [ticket/10614] Add purge command
  [ticket/10614] Tweak list output, show state, purge cache, handle missing exts
  [ticket/10614] Make script accessible from anywhere
  [ticket/10614] Better usage output
  [ticket/10614] Add a script to enable, disable and view status of extensions.
  [ticket/10500] Use correct class name in @uses.
  [ticket/10500] Fix phpbb_template_compile instantiation.
2012-02-17 13:51:31 +01:00
Igor Wiedler
d70c3f1eb8 Merge branch 'develop' into ticket/10380
* develop: (325 commits)
  [ticket/10641] Update MCP template with new plurality forms
  [ticket/10637] Leftovers from implementation of extensions in convertor
  [ticket/10637] Leftovers from implementation of extensions in develop tools
  [ticket/10637] Leftovers from implementation of extensions in mcp_post
  [ticket/10637] Leftovers from implementation of extensions in mcp_main
  [ticket/10637] Leftovers from implementation of extensions
  [ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic).
  [ticket/10606] Fix incorrect hidden fields array name in page_header().
  [ticket/10633] Stop leaking filename of attachments when thumbnail is requested
  [ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().
  [ticket/10634] Specify module type when viewing profile
  [ticket/10634] Changing p_master::is_full_class
  [ticket/10569] Invalid string comparison in prosilver
  [ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc drop
  [ticket/10512] Call startup.php from tests/bootstrap.php
  [ticket/10535] Delete no longer needed email confirm language entries.
  [ticket/9914] Add backup warning to updater.
  [ticket/10616] Add template inheritance to exported template
  [ticket/10616] Ignore template inheritance that points to self
  [ticket/10616] Add template inheritance to default styles
  ...
2012-02-17 13:48:48 +01:00
Igor Wiedler
dd495e7a14 Merge pull request #526 from p/ticket/10500
Ticket/10500 Miscellaneous issues in the new template engine
2012-02-14 15:41:15 -08:00
Igor Wiedler
14b1c87714 Merge pull request #546 from p/ticket/10614
[ticket/10614] Add a script to enable, disable and view status of extens...
2012-02-11 14:54:22 -08:00
Oleg Pudeyev
87914d2788 [ticket/10614] Change not installed heading to available.
"Not installed" implies that extensions listed there can be
installed, but the operation is called enable.

Reduce the confusion by using "available" for the heading,
this matches extension manager code.

PHPBB3-10614
2012-02-11 17:31:22 -05:00
Vjacheslav Trushkin
a1a1b61ae8 [ticket/10637] Leftovers from implementation of extensions in develop tools
Replacing code in development tools that was missed in ticket 10323

PHPBB3-10637
2012-02-09 22:22:32 +02:00
Igor Wiedler
36728d3414 [ticket/10614] Refactor list command to use manager API
PHPBB3-10614
2012-02-09 01:36:06 +01:00
Igor Wiedler
fb83a5f6c0 [ticket/10614] Add purge command
PHPBB3-10614
2012-02-09 01:04:54 +01:00
Igor Wiedler
5ccd6b0c7a [ticket/10614] Tweak list output, show state, purge cache, handle missing exts
PHPBB3-10614
2012-02-09 01:04:47 +01:00
Igor Wiedler
b222030ca7 [ticket/10614] Make script accessible from anywhere
PHPBB3-10614
2012-02-09 01:02:00 +01:00
Igor Wiedler
9e15d83022 [ticket/10614] Better usage output
PHPBB3-10614
2012-02-06 16:49:50 +01:00
Oleg Pudeyev
be74b5286c [ticket/10614] Add a script to enable, disable and view status of extensions.
PHPBB3-10614
2012-02-03 03:42:53 -05:00
Vjacheslav Trushkin
d4c3d4b21d [ticket/10378] Imageset to css convertor typo
Imageset to css convertor typo

PHPBB3-10378
2012-01-20 12:41:00 +02:00
Vjacheslav Trushkin
7295e5824a [ticket/10380] BIDI support for imageset
BIDI support for imageset conversion script, added RTL imageset entries to prosilver and subsilver2, fixed small bug in imageset.css, changed spacing in code to match phpbb coding guidelines

PHPBB3-10380
2012-01-16 14:35:29 +02:00
Unknown
656a8ece6f [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2012-01-02 19:10:27 +01:00
Andreas Fischer
a01e916737 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9916] Changing header in non-distributed files
  [ticket/9916] Changing coding guidelines license
  [ticket/9916] Updating License in the header

Conflicts:
	tests/mock/cache.php
2012-01-02 17:36:21 +01:00
Unknown
5e52734c24 [ticket/9916] Changing header in non-distributed files
PHPBB3-9916
2012-01-02 16:20:30 +00:00
Oleg Pudeyev
b05c658722 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10434] Add script for creating search index from CLI.
2011-12-03 22:42:01 -05:00
Oleg Pudeyev
c4a19a4e3e [ticket/10500] Fix phpbb_template_compile instantiation.
The required $allow_php argument was missing.

PHPBB3-10500
2011-12-03 21:15:29 -05:00
Nils Adermann
addf81f62e Merge branch 'develop' into feature/extension-manager
* develop: (93 commits)
  [ticket/10157] Add notification to update cpfs when installing a language.
  [ticket/10185] Always set board startdate on conversion
  [ticket/10419] Reword the language strings
  [ticket/9361] View correct error messages when editing account information
  [ticket/10457] Undefined variable $request, when print-viewing PMs
  [ticket/10452] Fix xHTML errors when print-viewing PMs
  [ticket/9066] Move regex into get_preg_expression function and add tests
  [ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css
  [ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com.
  [ticket/10254] Removing the NOTE as it is incompatible with phpBB.com.
  [ticket/10254] Remove subsilver2 as default style on theme.
  [ticket/10254] Remove style names from themes and fix some informations on it.
  [ticket/7138] Allow simple header and footer for trigger_error() messages
  [ticket/9066] Disallow some database prefix to prevent same errors and problems
  [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read
  [ticket/10437] Do not display announcements that are waiting for approval
  [ticket/10087] Organize bans in acp_baninto optgroups
  [ticket/8616] Include old U_INBOX var for BC
  [ticket/10435] Remove global announcement from forums total topic count
  [ticket/10435] Readd local announcements to total topic count in viewforum
  ...

Conflicts:
	phpBB/install/database_update.php
2011-11-18 19:14:06 +01:00
Andreas Fischer
bb40789552 [ticket/10434] Add script for creating search index from CLI.
PHPBB3-10434
2011-10-30 14:00:30 +01:00
Andreas Fischer
c451a15504 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10413] Fix CS
  [ticket/10413] Make create_schema_files usable
2011-10-16 20:16:25 +02:00
Andreas Fischer
cc227cc6f6 Merge remote-tracking branch 'igorw/ticket/10413' into develop-olympus
* igorw/ticket/10413:
  [ticket/10413] Fix CS
  [ticket/10413] Make create_schema_files usable
2011-10-16 20:16:12 +02:00
Igor Wiedler
8d33dea2cd [ticket/10413] Fix CS
PHPBB3-10413
2011-10-16 19:30:33 +02:00
Joas Schilling
8f6e99740b Merge branch 'develop-olympus' into develop 2011-10-14 04:39:20 +02:00
Igor Wiedler
c3f3435228 [ticket/10189] Get rid of $id$ from schema files
PHPBB3-10189
2011-10-14 04:29:28 +02:00
Igor Wiedler
8cf22f5529 [ticket/10189] Add "automatically generated" comment into schema-files
PHPBB3-10189
2011-10-14 03:41:02 +02:00
Igor Wiedler
7fa14e654a [ticket/10413] Make create_schema_files usable
PHPBB3-10413
2011-10-14 03:12:44 +02:00