1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

10532 Commits

Author SHA1 Message Date
Andreas Fischer
cf5253c7b8 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10056] Corrected a typo in Firebird name.
  [ticket/10041] Use send_status_line more in download/file.php

Conflicts:
	phpBB/download/file.php
2011-02-24 10:54:51 +01:00
Andreas Fischer
5e2bbdb22b Merge branch 'ticket/p/10041' into develop-olympus
* ticket/p/10041:
  [ticket/10041] Use send_status_line more in download/file.php
2011-02-24 10:35:27 +01:00
Andreas Fischer
b10654e9a5 Merge branch 'ticket/p/10056' into develop-olympus
* ticket/p/10056:
  [ticket/10056] Corrected a typo in Firebird name.
2011-02-24 10:35:09 +01:00
Oleg Pudeyev
ba41e45f84 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/7778] Update all the schema files
  [ticket/7778] Add the column change to `mysql_upgrader.php`
  [ticket/7778] BBCode single limit

Conflicts:
	phpBB/install/database_update.php
2011-02-23 22:03:42 -05:00
Erik Frèrejean
5dee60e54e [ticket/7778] Update all the schema files
Correct all the schema files to contain the new field type

PHPBB3-7778
2011-02-23 21:15:40 -05:00
Erik Frèrejean
1b88f5a316 [ticket/7778] Add the column change to mysql_upgrader.php
PHPBB3-7778
2011-02-23 21:15:40 -05:00
Erik Frèrejean
a7bc76d246 [ticket/7778] BBCode single limit
There are currently two hard limits for the number of BBCodes
allowed. One is enforced by the type of the `bbcode_id` column,
the other by an hard limit in `acp/acp_bbcode.php`. However this
limit can never be reached due to the size of the database column.

Suggested fix involves adding a new constant to define the max.
number of BBCodes (as with smilies) and chaning the database
column from a tinyint to a smallint to actually allow 1511 BBCodes

PHPBB3-7778
2011-02-23 21:15:40 -05:00
Oleg Pudeyev
a0f6e185ca [ticket/10056] Corrected a typo in Firebird name.
PHPBB3-10056
2011-02-23 20:16:23 -05:00
Oleg Pudeyev
786078d423 [ticket/10041] Use send_status_line more in download/file.php
PHPBB3-10041
2011-02-23 20:16:16 -05:00
Joas Schilling
fd7daf2a2b [ticket/9549] Change default value of "sort legend by group name" to false.
PHPBB3-9549
2011-02-24 02:05:48 +01:00
Joas Schilling
e5b1cfe93b [ticket/9549] Fix displaying empty groups
PHPBB3-9549
2011-02-24 02:05:03 +01:00
Oleg Pudeyev
e3c854288c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9675] Correctly check whether the style/component is still in use.
  [ticket/9675] Put the code into methods to avoid code duplication.
  [ticket/9675] Adjust the language-string to reflect the changes.
  [ticket/9675] Add option to delete template/theme/imageset when deleting style.
2011-02-21 20:47:44 -05:00
Oleg Pudeyev
15a5d2c4bf Merge branch 'ticket/nickvergessen/9675' into develop-olympus
* ticket/nickvergessen/9675:
  [ticket/9675] Correctly check whether the style/component is still in use.
  [ticket/9675] Put the code into methods to avoid code duplication.
  [ticket/9675] Adjust the language-string to reflect the changes.
  [ticket/9675] Add option to delete template/theme/imageset when deleting style.
2011-02-21 20:47:31 -05:00
Andreas Fischer
d11a0097d0 [ticket/10009] Entries are always posts, update fields accordingly.
PHPBB3-10009
2011-02-21 20:24:04 +01:00
Andreas Fischer
366107a54c [ticket/10009] Always show 'published' data in feed item statistics.
PHPBB3-10009
2011-02-21 20:23:51 +01:00
Kevin Locke
361f6fc16c [ticket/10009] Make atom:update output unconditional and before atom:published
PHPBB3-10009
2011-02-21 20:23:39 +01:00
Kevin Locke
df93856ac4 [ticket/10009] Send atom:updated whenever possible
For posts/topics which have not been edited/updated, use the creation
date to populate atom:updated, as suggested by bantu.  This should
increase compatibility with user agents which expect an atom:updated
element.

PHPBB3-10009
2011-02-21 20:22:48 +01:00
Kevin Locke
24520f26ad [ticket/10009] Differentiate published from updated in Atom feed
Change the handling of dates to differentiate between the date when an
entry was published and the date on which it was last updated.
Incorporate this information into the Atom feed by using <published> and
<updated> appropriately according to sections 4.2.9 and 4.2.15 of the
spec.

PHPBB3-10009
2011-02-21 20:19:17 +01:00
Oleg Pudeyev
c025d6079b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10047] Do not put session id in URL on posting.php when cookies are on.
2011-02-20 11:40:19 -05:00
Andreas Fischer
aba31aeff9 [ticket/10047] Do not put session id in URL on posting.php when cookies are on.
PHPBB3-10047
2011-02-19 14:30:39 +01:00
Joas Schilling
6e9aecec79 [ticket/9549] Fix language strings.
PHPBB3-9549
2011-02-18 00:22:17 +01:00
Joas Schilling
d9f092a18b [ticket/9549] Only add group to legend/teampage when the checkbox is checked.
The checkbox for the teampage was also missing from the template file.

PHPBB3-9549
2011-02-17 23:59:41 +01:00
Oleg Pudeyev
f24fe7b09e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9944] Add empty line before the while() so you can better read the code
  [ticket/9944] Extension groups naming don't use users' language in ACP

Conflicts:
	phpBB/install/database_update.php
2011-02-17 17:11:55 -05:00
Oleg Pudeyev
676daf3076 Merge branch 'ticket/nickvergessen/9944' into develop-olympus
* ticket/nickvergessen/9944:
  [ticket/9944] Add empty line before the while() so you can better read the code
  [ticket/9944] Extension groups naming don't use users' language in ACP
2011-02-17 17:03:08 -05:00
Joas Schilling
f908a01661 [ticket/9549] New method move() to move a group more than 1 up/down.
PHPBB3-9549
2011-02-16 18:22:32 +01:00
Joas Schilling
d2e2ccf8a4 [ticket/9549] Fix some minor issues with descriptions and coding-guidelines.
PHPBB3-9549
2011-02-16 18:22:31 +01:00
Joas Schilling
ad05f32c49 [ticket/9549] Throw an error when the given field-name is invalid.
Also the code now only appends an adm_back_link, when we are in the ACP.

PHPBB3-9549
2011-02-16 18:22:30 +01:00
Joas Schilling
8d12838aed [ticket/9549] Make the class non static and extend delete_group function.
delete_group() can now be used, so it does not update the actual group.
This can save a query, when you update the group anyway.

PHPBB3-9549
2011-02-16 18:22:29 +01:00
Joas Schilling
750fc3aca8 [ticket/9549] Add template changes for subsilver2.
PHPBB3-9549
2011-02-16 18:21:49 +01:00
Joas Schilling
663220418e [ticket/9549] Enhance teampage and legend functionality
PHPBB3-9549
2011-02-16 18:21:49 +01:00
Joas Schilling
4f2b0d9d42 [ticket/9549] Add the module and files for the ACP.
PHPBB3-9549
2011-02-16 18:21:48 +01:00
Joas Schilling
023a102082 [ticket/9549] Update database with the new config values and columns
PHPBB3-9549
2011-02-16 18:21:47 +01:00
Joas Schilling
b7d3d57b70 [ticket/9549] Enhance teampage functionality with a new class, group_positions.
PHPBB3-9549
2011-02-16 18:19:51 +01:00
Joas Schilling
59454ccd99 [ticket/10045] Update version in some more files.
I did not include the docs/INSTALL.html, because we need to do a bit more on that file before releasing 3.1 (Add section how to update from 3.0 to 3.1, ...)

PHPBB3-10045
2011-02-16 16:06:23 +01:00
Joas Schilling
528c54f0f7 [ticket/10045] Database updater version for 3.1-changes should be 3.1.0-dev
PHPBB3-10045
2011-02-16 11:29:49 +01:00
Joas Schilling
bcbbeacaf8 [ticket/9944] Add empty line before the while() so you can better read the code
PHPBB3-9944
2011-02-14 16:40:12 +01:00
Igor Wiedler
1cc5087c36 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8904] Show default value for numeric custom profile fields when editing
2011-02-13 18:33:27 +01:00
Niklas Schmidtmer
c717e44094 [ticket/8904] Show default value for numeric custom profile fields when editing
When displaying the default value for a numeric custom profile field, only use
request_var to obtain the value on creation. When editing, it will always
override the actual value with an empty string, as this is request_var's default
return value.

PHPBB3-8904
2011-02-13 18:32:11 +01:00
Oleg Pudeyev
4e689c522f [feature/system-cron] Added documentation for cron manager constructor.
PHPBB3-9596
2011-02-12 22:05:54 -05:00
Nils Adermann
92c278d39a [feature/system-cron] Remove an unecessary assignment and an unecessary comment
PHPBB3-9596
2011-02-12 22:05:54 -05:00
Nils Adermann
c6a8abb409 [feature/system-cron] Clarify comments about flush() call in cron.
PHPBB3-9596
2011-02-12 22:05:54 -05:00
Nils Adermann
7a2c5e618b [feature/system-cron] preg_match returns int so cast to bool, fix comment
PHPBB3-9596
2011-02-12 22:05:54 -05:00
Nils Adermann
2e47409e80 [feature/system-cron] Rename lock() to acquire and unlock() to release.
PHPBB3-9596
2011-02-12 22:05:54 -05:00
Nils Adermann
09b136272b [feature/system-cron] Cache cron's task names.
Instead of using a path relative to phpbb_root_path the path to the task
directory is directly passed to the cron manager. Dummy tasks are now
in the tests directory directly.

PHPBB3-9596
2011-02-12 22:05:54 -05:00
Nils Adermann
7a8233020b [feature/system-cron] Use a RecursiveDirectoryIterator instead of readdir.
PHPBB3-9596
2011-02-12 22:05:54 -05:00
Nils Adermann
9bc62056b2 [feature/system-cron] Add array type hints if appropriate and remove globals.
PHPBB3-9596
2011-02-12 22:05:53 -05:00
Nils Adermann
165b0ec0b2 [feature/system-cron] Make use of the new config class in locks.
PHPBB3-9596
2011-02-12 22:05:53 -05:00
Nils Adermann
3a3a8bb96d [feature/system-cron] Abstract the database locking mechanism out of cron.
Added a number of tests for the locking mechanism which can now lock
arbitrary config variables.

PHPBB3-9596
2011-02-12 22:05:53 -05:00
Oleg Pudeyev
53dd847dd5 [feature/system-cron] Added @param/@return documentation
Also adjusted some function descriptions for greater informativity.

PHPBB3-9596
2011-02-12 22:05:53 -05:00
Andreas Fischer
47702b8ca7 [feature/system-cron] Add phpDoc documentation for everything else.
PHPBB3-9596
2011-02-12 22:05:53 -05:00