1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-15 06:06:32 +02:00
Commit Graph

730 Commits

Author SHA1 Message Date
448df1cdf5 Merge branch 'ticket/9549' into develop
* ticket/9549:
  [ticket/9549] Display users in their primary group instead of their first group
  [ticket/9549] Change default value of "sort legend by group name" to false.
  [ticket/9549] Fix displaying empty groups
  [ticket/9549] Fix language strings.
  [ticket/9549] Only add group to legend/teampage when the checkbox is checked.
  [ticket/9549] New method move() to move a group more than 1 up/down.
  [ticket/9549] Fix some minor issues with descriptions and coding-guidelines.
  [ticket/9549] Throw an error when the given field-name is invalid.
  [ticket/9549] Make the class non static and extend delete_group function.
  [ticket/9549] Add template changes for subsilver2.
  [ticket/9549] Enhance teampage and legend functionality
  [ticket/9549] Add the module and files for the ACP.
  [ticket/9549] Update database with the new config values and columns
  [ticket/9549] Enhance teampage functionality with a new class, group_positions.

Conflicts:
	phpBB/install/database_update.php
2011-03-01 16:57:00 -05:00
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
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
fd7daf2a2b [ticket/9549] Change default value of "sort legend by group name" to false.
PHPBB3-9549
2011-02-24 02:05:48 +01:00
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
023a102082 [ticket/9549] Update database with the new config values and columns
PHPBB3-9549
2011-02-16 18:21:47 +01:00
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
1c7d29783b [feature/system-cron] Added use_system_cron to schema_data.sql.
PHPBB3-9596
2011-02-12 22:05:51 -05:00
4890006cbb [ticket/9944] Extension groups naming don't use users' language in ACP
Only happens on boards which were installed with 3.0.8

PHPBB3-9944
2011-01-27 17:24:03 +01:00
8a07e8a4f8 [ticket/9954] Remove unneeded never permission
The `ROLE_USER_NOAVATAR` role gets a *never* permission assigned
for the two "u_masspm*" permissions. Due to this, this role changes
behaviour it isn't intended to change. It should assign "no" as is
done in the `ROLE_USER_LIMITED` role.

PHPBB3-9954
2010-12-21 15:08:07 +01:00
635752fafc Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9899] Change recaptcha theme from default to 'clean' in the ACP.
  [ticket/9509] Fix a typo and wrong period placement
  [develop-olympus] Revert accidental revert of db update lang fix and version
  [develop-olympus] Remove accidentally added trailing newlines.
  [develop-olympus] Incrementing the version number to 3.0.9-dev.
2010-11-18 14:05:56 +01:00
87aa611a8e [develop-olympus] Incrementing the version number to 3.0.9-dev. 2010-11-11 11:49:17 +01:00
f977075b43 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9884] Reduce queue interval to 60 seconds, email package size to 20
2010-11-10 15:58:12 +01:00
c9c19874d6 [ticket/9884] Reduce queue interval to 60 seconds, email package size to 20
PHPBB3-9884
2010-11-10 15:50:53 +01:00
336dc70047 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9888] Update fails when Bing [Bot] was already added to the users table
  [develop-olympus] Bumping version number for 3.0.8-RC1.
  [ticket/9885] Fix extension group name updater. Loop through all languages.
  [ticket/9847] Fix typo in search synonyms. Use british english for 'judgement'.
  [ticket/9883] Change an American English spelling to British English.
  [task/phing-build] Correct the path for update package patch files.
2010-11-08 23:42:23 +01:00
794c0f6b68 [develop-olympus] Bumping version number for 3.0.8-RC1. 2010-11-08 23:21:27 +01:00
e35711ddde Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9609] Change header() calls setting HTTP status to send_status_line().
  [ticket/9613] Slightly update language strings.
  [ticket/9613] Fix missing database part for unread posts search load switch.
  [ticket/9613] Implement a load switch for unread posts search feature.
  [ticket/9785] Allow users to request new passwords when board is disabled.
  [ticket/9644] Check $mode before calling user_notification() from submit_post()
2010-09-16 22:42:32 +02:00
rxu
b83163634f [ticket/9613] Fix missing database part for unread posts search load switch.
A record for load_unreads_search parameter had to be added to CONFIG_TABLE.

PHPBB3-9613
2010-08-29 16:09:41 +02:00
591217a903 Merge branch 'develop-olympus' into develop
* develop-olympus: (21 commits)
  [feature/notify_status] Define'd constants for notify_status
  [ticket/7782] Send 404 HTTP code when a nonexistent user/forum/topic is requested.
  [ticket/9530] The prosilver problem in #9531 exists in subsilver2 editor.js
  [ticket/9530] Subsilver2 is missing BBCode-less quotes fallback-option when bbcodes are disabled.
  [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:" line when quoting from topic-review.
  [ticket/9547] Use separate constants for display/enable active topics.
  [ticket/9535] Also fix the margin in the install_update.html
  [ticket/9535] Fix some more rtl margin issues.
  [ticket/9535] Correctly set margin of textarea in ACP > Users signature for RTL languages.
  [ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting with ::
  [ticket/9510] Unable to copy permissions from and to forums you cannot see
  [ticket/9510] Unable to copy permissions from and to forums you cannot see
  [ticket/9545] Initial forum should display active topics by default.
  [ticket/9546] Also delete bookmarks, when a topic is deleted.
  [ticket/9529] Topic review is not showing all selected posts.
  [ticket/9528] Also fall back to bbcode-less quotes for PMs, when bbcodes are disabled.
  [ticket/9146] Fix double occurring tabindex="6" in prosilver's QR
  [ticket/9119] Respect language selection on automated update.
  [ticket/8894] Fix JavaScript-Error and hide Quote-Button on topic review if BBCodes are not allowed.
  [ticket/9567] Newly registered users group description rewording.
  ...
2010-05-16 19:52:36 +02:00
36c1986986 [ticket/9545] Initial forum should display active topics by default.
The initial forum 'Your first forum' should show topics
(especially the 'Welcome to phpBB3' topic) in the active topics list after
installing phpBB because this is the default setting for new forums
(but not categories).

The default database column value for forum_flags is 32 =
FORUM_FLAG_POST_REVIEW, we therefore have to explicitly set forum_flags to
FORUM_FLAG_POST_REVIEW + FORUM_FLAG_ACTIVE_TOPICS = 48 for this forum.

PHPBB3-9545
2010-05-16 17:49:06 +02:00
693a2dc99b Merge branch 'develop-olympus' into develop
I simply used the develop-olympus version of all files that conflicted.
Afterall there should not have been anything new in develop yet.
2010-03-03 23:32:09 +01:00
1802b9ff92 Support for Microsoft's Native SQL Server Driver for PHP - Patch by Chris Pucci at Microsoft [Bug #57055]
If you are using SQL Server, please try to test this new dbal so we can safely include it in 3.0.8. If you
want to try it on a current phpBB version you can apply the latest version of the patch to your board which
you can find attached to the bug tracker ticket (look in the comments for the latest version, the one in the
ticket itself is outdated): http://www.phpbb.com/bugs/phpbb3/ticket.php?ticket_id=57055



git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10489 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-11 00:02:51 +00:00
f90bab90c7 Change version number to 3.0.8-dev in preparation for development on next release
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10469 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-01 01:18:21 +00:00
5a429ee61e Change version numbers to 3.0.7 and 3.0.8-dev in preparation for development on next release
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10468 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-01 01:14:06 +00:00
2906a24122 Bug #56545 - Speed up topic move operation by adding an index for topic_id on the topics track table.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10462 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-28 23:15:25 +00:00
5306a586b1 Revert r9564, Fix #54445, Related to #44665.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10445 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-25 18:42:04 +00:00
77af6caed7 [Feature] Ability to use HTTP authentication in ATOM feeds by passing the GET parameter auth=http
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10430 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-19 19:08:51 +00:00
ad7e3ccf4c Integrate active topics feed. Some language adjustments and rearrangements.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10382 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-27 00:48:52 +00:00
749fe6f9d0 Turn all forums feed off by default.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10373 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-23 02:59:44 +00:00
736f26dea1 Reflect changes in schema data. This should also close #55775 ;-)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10371 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-23 02:55:28 +00:00
b68de2323d merge changes from 3.0.x branch
git-svn-id: file:///svn/phpbb/trunk@10342 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-16 15:48:23 +00:00
46112228c0 Tag as 3.0.6
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10267 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-11-14 20:11:38 +00:00
110f81684e I am very sorry... but the changes require (a hopefully very short) RC4 phase
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10241 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-28 16:05:17 +00:00
30f3ba83e3 sneaks in and changes the version number. Seems like we see no RC4...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10228 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-22 14:35:56 +00:00
08437d1538 update constants and schema data from RC2 to RC3
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10220 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-11 09:56:47 +00:00
2e17e448de Copy 3.0.x branch to trunk
git-svn-id: file:///svn/phpbb/trunk@10211 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-04 18:14:59 +00:00
bf8ac19eaa Move trunk/phpBB to old_trunk/phpBB
git-svn-id: file:///svn/phpbb/trunk@10210 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-04 18:13:59 +00:00
3e0bf1f8a4 prepare for RC2
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10187 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-25 09:41:49 +00:00
fc5a21e16a Revert r10106 - Index usage is very unlikely because of WHERE IN (). :-|
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10107 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-04 17:27:13 +00:00
0fe74ebcea Add INDEX on user_regdate because this is the default ORDER BY in memberlist.php - thanks nickvergessen.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10106 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-04 15:44:10 +00:00
31856352be Change version numbers to 3.0.6 and 3.0.6-RC1 for a final internal test run
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10105 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-04 15:19:26 +00:00
2b5f04cf1c changes for a little internal update test run
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10098 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-04 10:25:31 +00:00
139f1d3530 fix r10076 for #48615 - Ability to specify amount of time user is able to delete his last post in topic.
Authorised by: AcydBurn


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10080 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-31 14:57:04 +00:00
09ad10a734 ok, i am very sorry, but this needs to be fixed.
Generally, our config table is not really suited for holding large datasets. Because feed settings for the forums to enable news feeds and excluded forums rely on the forums itself we have decided to introduce a forum_options table where custom options can be stored.
Additionally, for this to work across all DBMS we support, we added a new method to the DBAL for the bitwise AND operator.
Also moved the forum/topic feed template variable to the location where they belong to (forum and topic view)


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9965 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-12 15:00:47 +00:00
ee65d2147b fix r9713 for #36565
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9931 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-05 15:28:46 +00:00
1f871950d8 #48985
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9916 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-03 15:46:56 +00:00
e6f133dc55 Revert r9878 - QR was already disabled by default, for admin convenience we enable the global setting but no local setting, which results in OFF by default
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9895 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-31 08:16:36 +00:00
fecc3383a2 disable QR by default
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9878 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-28 11:26:55 +00:00
6e4a7c03d1 Users can report PMs to moderators which are then visible in a new MCP module
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9814 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-21 20:59:11 +00:00
0ee8d7ab15 increase default maximum pass chars to 100
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9813 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-21 20:30:50 +00:00