makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 04:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
13165 commits 18 branches 192 tags 206 MiB
Commit graph

5578 commits

Author SHA1 Message Date
David King
4baa2bb52c [ticket/10535] Removed email confirm field from acp_users module 
PHPBB3-10535
 2011-12-23 21:55:49 +00:00
Andreas Fischer
31ddac6091 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10546] Add missing argument to adm_back_link in acp_captcha.
 2011-12-23 12:53:34 +01:00
Igor Wiedler
7779dae2cc [ticket/9681] Add password length to security settings 
PHPBB3-9681
 2011-12-23 00:42:13 -05:00
Oleg Pudeyev
fa2edf5187 [ticket/10546] Add missing argument to adm_back_link in acp_captcha. 
PHPBB3-10546
 2011-12-23 00:26:26 -05:00
Oleg Pudeyev
3412a6d676 Merge remote-tracking branch 'imkingdavid/ticket/10541' into develop 
* imkingdavid/ticket/10541:
  [ticket/10541] Fixed empty drop-down menu bug
 2011-12-22 19:59:39 -05:00
Oleg Pudeyev
c8df8e4b8c Merge remote-tracking branch 'cyberalien/ticket/develop/10399' into develop 
* cyberalien/ticket/develop/10399:
  [ticket/10399] Correctly encoding template component urls (3.1)
 2011-12-22 15:46:17 -05:00
Oleg Pudeyev
37fa5e56f3 Merge remote-tracking branch 'cyberalien/ticket/10399' into develop-olympus 
* cyberalien/ticket/10399:
  [ticket/10399] Correctly encoding template component urls (3.0)
  [ticket/10399] Correctly encoding template component urls (3.0)
 2011-12-22 15:45:48 -05:00
David King
53617dfce5 [ticket/10541] Fixed empty drop-down menu bug 
PHPBB3-10541
 2011-12-21 03:28:00 +00:00
Andreas Fischer
82fff947c6 [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords. 
PHPBB3-10538
 2011-12-19 14:24:39 +01:00
Andreas Fischer
124ff6c50a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10531] Disallow deleting of the last style

Conflicts:
	phpBB/includes/acp/acp_styles.php
 2011-12-16 16:19:22 +01:00
Andreas Fischer
8f690d3475 Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10531] Disallow deleting of the last style
 2011-12-16 16:17:40 +01:00
Andreas Fischer
56c3a66c28 Merge remote-tracking branch 'nickvergessen/ticket/10531' into prep-release-3.0.10 
* nickvergessen/ticket/10531:
  [ticket/10531] Disallow deleting of the last style
 2011-12-16 16:03:20 +01:00
David King
d73c3a297e [ticket/10535] Removed email confirm from UCP, removed unused language entries 
PHPBB3-10535
 2011-12-15 23:15:24 +00:00
Joas Schilling
0cfa843677 [ticket/10531] Disallow deleting of the last style 
Regression from PHPBB3-9675 commit 0e02f5cb0b

PHPBB3-9675
PHPBB3-10531
 2011-12-15 23:17:16 +01:00
David King
18aa4e4ecd [ticket/10535] Remove email confirm check on registration form 
PHPBB3-10535
 2011-12-15 15:13:11 +00:00
David King
a3e8d3b00b [ticket/10463] removed extra comma in malformed query in acp_styles.php 
PHPBB3-10463
 2011-12-15 13:22:04 +00:00
Vjacheslav Trushkin
cd4958f72c [ticket/10507] Sort styles in acp 
Sort styles by name in admin control panel

PHPBB3-10507
 2011-12-15 14:44:09 +02:00
Nils Adermann
94d954281e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10319] Missing hidden fields in search form
 2011-12-09 01:32:29 +01:00
Nils Adermann
2c7495e1c7 Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10319] Missing hidden fields in search form
 2011-12-09 01:32:21 +01:00
Vjacheslav Trushkin
dfb7cc625a [ticket/10319] Missing hidden fields in search form 
Missing hidden fields in search form (bug added in 3.0.9)

PHPBB3-10319
 2011-12-09 01:31:41 +01:00
Oleg Pudeyev
0c0befe2f8 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10349] Removed duplicated functions from schema loading in tests
  [ticket/10349] Update function comment
  [ticket/10349] Use new schema comment function in installer
  [ticket/10349] Unit tests: Consolidate schema comment removal functions
  [ticket/10349] Unit tests: Remove comments while loading schema files
 2011-12-03 22:25:32 -05:00
Oleg Pudeyev
bf6d501ab1 Merge remote-tracking branch 'Noxwizard/ticket/10349' into develop-olympus 
* Noxwizard/ticket/10349:
  [ticket/10349] Removed duplicated functions from schema loading in tests
  [ticket/10349] Update function comment
  [ticket/10349] Use new schema comment function in installer
  [ticket/10349] Unit tests: Consolidate schema comment removal functions
  [ticket/10349] Unit tests: Remove comments while loading schema files
 2011-12-03 22:07:34 -05:00
Oleg Pudeyev
552df1f6eb [ticket/10500] Use correct class name in @uses. 
PHPBB3-10500
 2011-12-03 21:15:29 -05:00
Andreas Fischer
69cbb4ac1d [prep-release-3.0.10] Bumping version number for 3.0.10-RC3. 2011-12-04 00:22:10 +01:00
Oleg Pudeyev
6027541dc7 Merge remote-tracking branch 'nickvergessen/ticket/develop/10345' into develop 
* nickvergessen/ticket/develop/10345: (21 commits)
  [ticket/10345] Check directly whether the key to use exists
  [ticket/10345] Return the language key when the key has an empty array
  [ticket/10345] Document behaviour for floating numbers on phpbb_get_plural_form
  [ticket/10345] Remove doubled check for valid plural rule
  [ticket/10345] Add documentation and phpbb_ prefix to the new avatar functions
  [ticket/10345] Add cases for 1 pixel height on MAX_FLASH and MAX_IMG sizes
  [ticket/10345] Fix parsing error in language/en/viewtopic.php
  [ticket/10345] Move rule determination code into a new function
  [ticket/10345] Fix little type in unit test
  [ticket/10345] Remove more useless 0-cases
  [ticket/10345] Make the use of the 0-case optional
  [ticket/10345] Remove some unused 0 cases
  [ticket/10345] Fix some last use cases of sprintf() to use $user->lang()
  [ticket/10345] Add tests for array() as first parameter on call to $user->lang()
  [ticket/10345] Fix some documentation issues.
  [ticket/10345] Allow float as array key and add some tests
  [ticket/10345] Use the plural function in some more places.
  [ticket/10345] Make use of the plural function in some basic places
  [ticket/10345] Remove '1 hour ago' string which conflicted with plural rules
  [ticket/10345] Fix documentation on the new function and the switch
  ...
 2011-12-03 15:39:06 -05:00
Vjacheslav Trushkin
179543b2c7 [ticket/10399] Correctly encoding template component urls (3.1) 
Correctly encoding template component urls

PHPBB3-10399
 2011-12-01 01:50:54 +02:00
Vjacheslav Trushkin
74ae7d0339 [ticket/10399] Correctly encoding template component urls (3.0) 
Correctly encoding template component urls

PHPBB3-10399
 2011-12-01 01:46:33 +02:00
Joas Schilling
c1311faebf [ticket/10345] Check directly whether the key to use exists 
PHPBB3-10345
 2011-11-30 21:36:56 +01:00
Joas Schilling
65e6ab5530 [ticket/10345] Return the language key when the key has an empty array 
PHPBB3-10345
 2011-11-30 21:23:00 +01:00
Joas Schilling
dd99675f72 [ticket/10345] Document behaviour for floating numbers on phpbb_get_plural_form 
The numbers are floored by casting to int.

PHPBB3-10345
 2011-11-30 21:07:53 +01:00
Joas Schilling
b195fce0a4 [ticket/10345] Remove doubled check for valid plural rule 
PHPBB3-10345
 2011-11-30 21:06:04 +01:00
Joas Schilling
b790d2e283 [ticket/10345] Add documentation and phpbb_ prefix to the new avatar functions 
PHPBB3-10345
 2011-11-30 21:03:29 +01:00
Andreas Fischer
6215740112 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10497] Fix SQL error when guest visits forum with unread topic
 2011-11-27 16:13:18 +01:00
Andreas Fischer
ede3963951 Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10497] Fix SQL error when guest visits forum with unread topic
 2011-11-27 16:13:11 +01:00
Andreas Fischer
b89320ad39 Merge remote-tracking branch 'rxu/ticket/10497' into prep-release-3.0.10 
* rxu/ticket/10497:
  [ticket/10497] Fix SQL error when guest visits forum with unread topic
 2011-11-27 16:12:39 +01:00
rxu
77e00d14a1 [ticket/10497] Fix SQL error when guest visits forum with unread topic 
Regression from the ticket PHPBB3-9008 fix.

When topic marking was enabled for guests, and a guest visited a forum with
a new topic which is marked unread, the built SQL missed an alias for a
TOPICS_TABLE which resulted in the following error:

Unknown column 't.topic_approved' in 'where clause' [1054]

The fix is to add an alias for the table.

PHPBB3-10497
PHPBB3-9008
 2011-11-27 23:11:22 +08:00
Andreas Fischer
007457f182 [prep-release-3.0.10] Bumping version number for 3.0.10-RC2. 2011-11-26 22:17:43 +01:00
Joas Schilling
454280c6e8 [ticket/10345] Move rule determination code into a new function 
PHPBB3-10345
 2011-11-25 15:10:51 -05:00
Joas Schilling
33e3bf4f64 [ticket/10345] Make the use of the 0-case optional 
And correctly determinate the rule otherwise

PHPBB3-10345
 2011-11-25 15:10:51 -05:00
Joas Schilling
c4aa8d8401 [ticket/10345] Fix some last use cases of sprintf() to use $user->lang() 
PHPBB3-10345
 2011-11-25 15:10:50 -05:00
Joas Schilling
4c2c842a7d [ticket/10345] Fix some documentation issues. 
PHPBB3-10345
 2011-11-25 15:10:50 -05:00
Joas Schilling
2de7153afd [ticket/10345] Allow float as array key and add some tests 
Added tests for the fallback when a key is missing and the float-feature.

PHPBB3-10345
 2011-11-25 15:10:49 -05:00
Joas Schilling
179662e949 [ticket/10345] Use the plural function in some more places. 
I added two function avatar_explanation_string() and avatar_error_wrong_size()
for easier handling of the "pixels"-languages, as they are used quite often.

PHPBB3-10345
 2011-11-25 15:10:49 -05:00
Joas Schilling
88ae40a4b1 [ticket/10345] Make use of the plural function in some basic places 
PHPBB3-10345
 2011-11-25 15:10:44 -05:00
Joas Schilling
0734dd3c42 [ticket/10345] Remove '1 hour ago' string which conflicted with plural rules 
This message was only viewed for 1 second anyway,
as floor($delta / 60) is only 60 for 3600 to 3660,
but the code was limited to $delta <= 3600

PHPBB3-10345
 2011-11-25 15:04:31 -05:00
Joas Schilling
f16d72fcfb [ticket/10345] Fix documentation on the new function and the switch 
Also do not min/max the value, but throw an error on an invalid Plural rule.

PHPBB3-10345
 2011-11-25 15:04:31 -05:00
Joas Schilling
757fcd3e63 [ticket/10345] Add a system to allow multiple plural forms 
See http://wiki.phpbb.com/Plural_Rules for explanation and examples.

PHPBB3-10345
 2011-11-25 15:04:30 -05:00
Andreas Fischer
79443eb1d4 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10280] Change the display of user activation settings in the ACP.
 2011-11-25 18:15:00 +01:00
RMcGirr83
3ce5b1d386 [ticket/10280] Change the display of user activation settings in the ACP. 
Use a select box to be consistent with other settings.

PHPBB3-10280
 2011-11-25 01:27:44 -05:00
Oleg Pudeyev
90a7f55831 Merge remote-tracking branch 'nickvergessen/ticket/10484' into develop 
* nickvergessen/ticket/10484:
  [ticket/10484] Use variables for sql_build_query() calls

Conflicts:
	phpBB/includes/mcp/mcp_front.php
 2011-11-24 21:51:10 -05:00