makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-18 01:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
12021 commits 18 branches 192 tags 207 MiB
Commit graph

11337 commits

Author SHA1 Message Date
Andreas Fischer
c865146065 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10435] Readd local announcements to total topic count in viewforum
 2011-11-13 14:29:21 +01:00
Andreas Fischer
2d989d4322 Merge remote-tracking branch 'nickvergessen/ticket/10435' into develop-olympus 
* nickvergessen/ticket/10435:
  [ticket/10435] Readd local announcements to total topic count in viewforum
 2011-11-13 14:13:42 +01:00
Andreas Fischer
019e43bc2d Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10237] Display login-box for guests, when (un)subscribing

Conflicts:
	phpBB/includes/functions_display.php
 2011-11-11 22:17:12 +01:00
Andreas Fischer
f3c9133a6c Merge remote-tracking branch 'nickvergessen/ticket/10237' into develop-olympus 
* nickvergessen/ticket/10237:
  [ticket/10237] Display login-box for guests, when (un)subscribing
 2011-11-11 22:07:11 +01:00
Joas Schilling
0d3e9bf446 [ticket/10435] Readd local announcements to total topic count in viewforum 
We need to readd the local announcements to the forums total topic count,
otherwise the number is different from the one in the forum list.

PHPBB3-10435
 2011-11-11 14:06:02 +01:00
Joas Schilling
1a19388aa3 [ticket/10237] Display login-box for guests, when (un)subscribing 
Also initialise $is_watching for PHP Notice: Undefined variable is_watching

PHPBB3-10237
 2011-11-06 23:51:29 +01:00
Andreas Fischer
5546e8cf57 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/7932] Fix font size in select boxes
 2011-11-01 20:24:00 +01:00
Andreas Fischer
945a63d204 Merge remote-tracking branch 'nickvergessen/ticket/7932' into develop-olympus 
* nickvergessen/ticket/7932:
  [ticket/7932] Fix font size in select boxes
 2011-11-01 20:23:20 +01:00
Andreas Fischer
d4cc53dfef Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9036] Add template variable 'S_AUTH_READ' to forumlist
 2011-11-01 20:08:44 +01:00
Andreas Fischer
0b1199f7b2 Merge remote-tracking branch 'nickvergessen/ticket/9036' into develop-olympus 
* nickvergessen/ticket/9036:
  [ticket/9036] Add template variable 'S_AUTH_READ' to forumlist
 2011-11-01 20:08:17 +01:00
Andreas Fischer
589f7ac8e4 Merge remote-tracking branch 'nickvergessen/ticket/10410' into develop 
* nickvergessen/ticket/10410:
  [ticket/10410] Add option to display users in their first teampage group
 2011-11-01 20:04:08 +01:00
Joas Schilling
1dfb52b805 Merge branch 'develop-olympus' into develop 2011-10-30 16:12:22 +01:00
Joas Schilling
a63490f744 Merge remote-tracking branch 'remotes/marc1706/ticket/9778' into develop-olympus 2011-10-30 16:10:45 +01:00
Marc Alexander
75a44a6970 [ticket/9778] Replaced "Find a member" with "Enter username" 
When clicking on the "Users and groups" tab in the ACP, the user is
able to either enter the username of the member he wants to manage
or click on "Find a member" below the input field. Unfortunately,
the label for the input field is also "Find a member", which leads
some users to the idea that they can search for users using that
input field. By changing the label to "Enter username" this should
be clear to the user.

PHPBB3-9778
 2011-10-30 15:46:52 +01:00
Joas Schilling
cf49b5f46f [ticket/7932] Fix font size in select boxes 
PHPBB3-7932
 2011-10-29 23:32:47 +02:00
Joas Schilling
da8cac280c [ticket/9036] Add template variable 'S_AUTH_READ' to forumlist 
PHPBB3-9036
 2011-10-29 16:26:17 +02:00
Igor Wiedler
72a3bcd048 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9307] Add config variable to installation schema.
  [ticket/9307] Remove hardcoded chunk size of mass emails.

Conflicts:
	phpBB/install/database_update.php
 2011-10-29 13:03:04 +02:00
Igor Wiedler
6d913d3646 Merge remote-tracking branch 'cs278/ticket/9307' into develop-olympus 
* cs278/ticket/9307:
  [ticket/9307] Add config variable to installation schema.
  [ticket/9307] Remove hardcoded chunk size of mass emails.
 2011-10-29 13:01:03 +02:00
Igor Wiedler
5351195dd7 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10420] Update includes/startup.php for PHP 5.4.
 2011-10-29 12:37:32 +02:00
Igor Wiedler
319d12bedf Merge remote-tracking branch 'bantu/ticket/10420' into develop-olympus 
* bantu/ticket/10420:
  [ticket/10420] Update includes/startup.php for PHP 5.4.
 2011-10-29 12:37:16 +02:00
Igor Wiedler
27a80d0379 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10422] Invalid "if" in viewtopic_body.html
 2011-10-29 12:35:44 +02:00
Igor Wiedler
d0bbb3f7f0 Merge remote-tracking branch 'cyberalien/ticket/10422' into develop-olympus 
* cyberalien/ticket/10422:
  [ticket/10422] Invalid "if" in viewtopic_body.html
 2011-10-29 12:35:30 +02:00
Igor Wiedler
189bd6dc9b Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php
 2011-10-29 12:32:39 +02:00
Igor Wiedler
020106eeb9 Merge remote-tracking branch 'bantu/ticket/10421' into develop-olympus 
* bantu/ticket/10421:
  [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php
 2011-10-29 12:32:25 +02:00
Igor Wiedler
acd72fad7b Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10430] Fix typos/etc in coding guidelines
 2011-10-29 12:22:17 +02:00
Igor Wiedler
17451e0842 Merge remote-tracking branch 'dellsystem/ticket/olympus/10430' into develop-olympus 
* dellsystem/ticket/olympus/10430:
  [ticket/10430] Fix typos/etc in coding guidelines
 2011-10-29 12:22:02 +02:00
Igor Wiedler
735e89c91b Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10259] Do not send notifications to user accounts joining free groups.
 2011-10-29 11:43:44 +02:00
Igor Wiedler
5e3f73c498 Merge remote-tracking branch 'bantu/ticket/10259' into develop-olympus 
* bantu/ticket/10259:
  [ticket/10259] Do not send notifications to user accounts joining free groups.
 2011-10-29 11:43:28 +02:00
Igor Wiedler
7c10058787 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10166] No longer refer to previous mail in admin_welcome_activated.txt
 2011-10-29 11:41:01 +02:00
Andreas Fischer
2e9e0a7d78 [ticket/10166] No longer refer to previous mail in admin_welcome_activated.txt 
It does not make much sense to say "the username you received in a previous
e-mail" when the message itself contains the username.

PHPBB3-10166
 2011-10-29 00:32:38 +02:00
Joas Schilling
65a34fd047 [ticket/10410] Add option to display users in their first teampage group 
PHPBB3-10410
 2011-10-28 22:55:26 +02:00
dellsystem
8b99f04943 [ticket/10430] Fix typos/etc in coding guidelines 
Mainly minor changes to correct errors and improve readability.

* "overcroud" --> "overcrowd"
* "concentinations" --> "concatenations"
* "SQL Statements", "SQL Formatting" - unnecessary capitalisation removed
* "keep a very close eye to it" --> "keep a very close eye on it"
* Fixed some fragmented sentences under the SQL Quotes section
* Added capitalisation of "sql", "select", "select distinct"
* "noticable" --> "noticeable"
* "outputed" --> "outputted"
* Added a missing "it" on the line about append_sid()
* And some other grammatical/stylistic changes, not worth listing them all

PHPBB3-10430
 2011-10-28 10:27:38 -04:00
Oleg Pudeyev
83d71ecb88 Merge remote-tracking branch 'VSEphpbb/ticket/10390' into develop 
* VSEphpbb/ticket/10390:
  [ticket/10390] Revert back to escaped script tags inside document.write
  [ticket/10390] Fix wording: fallback should be fall back
  [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP
  [ticket/10390] Use simpler HTML5 compliant js for the jQuery fallback
  [ticket/10390] Drop http protocol for Microsoft's CDN option
  [ticket/10390] Reword the language for jQuery host/server options
  [ticket/10390] Fix a type-o - captialize AJAX
  [ticket/10390] Improve the jQuery CDN url generation function
  [ticket/10390] Move jQuery version definition
  [ticket/10390] Allow option for jQuery to be hosted by a remote CDN

Conflicts:
	phpBB/install/database_update.php
 2011-10-20 20:46:48 -04:00
Andreas Fischer
ba1464b6e0 [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php 
PHPBB3-10421
 2011-10-18 21:25:27 +02:00
Andreas Fischer
cd184e4912 [ticket/10420] Update includes/startup.php for PHP 5.4. 
PHP 5.4 dropped support for register globals and magic quotes.

Calling set_magic_quotes_runtime() on PHP 5.4 actually results in an
E_CORE_ERROR error.

PHPBB3-10420
 2011-10-18 21:16:42 +02:00
Vjacheslav Trushkin
c8399b8e30 [ticket/10422] Invalid "if" in viewtopic_body.html 
Fixing incorrect "IF" in viewtopic_body.html

PHPBB3-10422
 2011-10-18 21:37:51 +03:00
Andreas Fischer
8f6cfc77d2 [ticket/10259] Do not send notifications to user accounts joining free groups. 
It does not make sense to send notifications to users joining a freely open
group. They already know that they were added to the group, because they
triggered the actual join.

PHPBB3-10259
 2011-10-17 19:10:41 +02:00
Andreas Fischer
c6e370d33a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9525] Minimum post length 0 is accepted but not working.
 2011-10-17 16:44:08 +02:00
Andreas Fischer
cfb5135805 Merge remote-tracking branch 'nickvergessen/ticket/9525' into develop-olympus 
* nickvergessen/ticket/9525:
  [ticket/9525] Minimum post length 0 is accepted but not working.
 2011-10-17 16:43:58 +02: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
Nils Adermann
95fed7806d Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10377] Do not allow all moderators to sticky posts
 2011-10-14 17:56:46 +02:00
Nils Adermann
7813135365 Merge remote-tracking branch 'github-igorw/ticket/10377' into develop-olympus 
* github-igorw/ticket/10377:
  [ticket/10377] Do not allow all moderators to sticky posts
 2011-10-14 17:56:38 +02:00
Igor Wiedler
99d6f00d51 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10327] Use $this->tools instead of creating a new instance of db_tools.
  [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.
 2011-10-14 17:50:53 +02:00
Igor Wiedler
cafefe9379 Merge remote-tracking branch 'bantu/ticket/10327' into develop-olympus 
* bantu/ticket/10327:
  [ticket/10327] Use $this->tools instead of creating a new instance of db_tools.
  [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.
 2011-10-14 17:50:08 +02:00
Nils Adermann
8a82ec95a5 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8240] Add ability to get a list of columns of a tables to db_tools.
  [ticket/8240] Add ability to get a list of tables to db_tools.
 2011-10-14 17:48:15 +02:00
Igor Wiedler
27279afa1e [ticket/10377] Do not allow all moderators to sticky posts 
In the mcp the change_topic_type does not properly check permissions,
allowing moderators to make any post sticky or announced by visiting the
correct URL.

PHPBB3-10377
 2011-10-14 17:37:12 +02:00
Nils Adermann
a3928bf82d [feature/functional-tests] Generate config correctly and install only once 
PHPBB3-10414
 2011-10-14 17:23:31 +02:00
Andreas Fischer
7e18d2b861 [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE. 
PHPBB3-10327
 2011-10-14 17:23:21 +02:00