Commit graph

18570 commits

Author SHA1 Message Date
Joas Schilling
499dd3a833 [ticket/11495] Move tests to tree/ directory
PHPBB3-11495
2013-04-25 17:13:21 +02:00
Dhruv
c6e9bd13a7 [ticket/10325] trigger error if forgot password option disabled
PHPBB3-10325
2013-04-25 20:39:50 +05:30
Dhruv
5de14b940e [ticket/10325] add allow forgot password option in acp
PHPBB3-10325
2013-04-25 20:39:49 +05:30
Joas Schilling
b334a2ce0f [ticket/11495] Move classes to tree/ as they all implement a tree
PHPBB3-11495
2013-04-25 17:04:37 +02:00
Joas Schilling
94dee77647 [ticket/11495] Replace fixtures content with manual calls
Should be easier to maintain

PHPBB3-11495
2013-04-25 16:50:11 +02:00
Joas Schilling
c72f5bf487 [ticket/11495] Explain use of set_subset_zero on remove_subset()
PHPBB3-11495
2013-04-25 16:24:31 +02:00
Joas Schilling
804f139be0 [ticket/11495] Use default exceptions
PHPBB3-11495
2013-04-25 16:17:58 +02:00
Nils Adermann
2bf01098d2 Merge pull request #1361 from MGaetan89/ticket/11471
[ticket/11471] Unrelated text in e-mail templates
2013-04-25 06:09:08 -07:00
Joas Schilling
9d7d962c0d [ticket/11495] Explain what "given item" means
PHPBB3-11495
2013-04-25 14:08:06 +02:00
Joas Schilling
fe97915fc9 [ticket/11495] Split get_branch_data into multiple methods
PHPBB3-11495
2013-04-25 14:05:41 +02:00
Joas Schilling
ab7054445f [ticket/11495] Rename set_parent to change_parent()
PHPBB3-11495
2013-04-25 13:48:19 +02:00
Joas Schilling
3efae6d8af [ticket/11495] Explain whether move_children prepends/appends/overwrittes
PHPBB3-11495
2013-04-25 13:44:52 +02:00
Joas Schilling
4bff28a0ee [ticket/11495] Rename fix function to regenerate_left_right_ids()
This method regenerates the left/right ids for the nested set based on the
parent/child relations. This function executes three queries per item, so
it should only be called, when the set has one of the following problems:
- The set has a duplicated value inside the left/right id chain
- The set has a missing value inside the left/right id chain
- The set has items that do not have a left/right is set

When regenerating the items, the items are sorted by parent id and their
current left id, so the current child/parent relationships are kept and
running the function on a working set will not change any orders.

PHPBB3-11495
2013-04-25 13:40:25 +02:00
Joas Schilling
61e72d3a10 [ticket/11495] Explain move() more
An item is only moved up/down within the same parent. If the delta is larger
then the number of children, the item is moved to the top/bottom of the list
of children within this parent.

PHPBB3-11495
2013-04-25 13:09:00 +02:00
Nils Adermann
ba05c9dd6b Merge pull request #1368 from EXreaction/ticket/11479
[ticket/11479] Fix install/update (rebuild container)
2013-04-25 04:02:42 -07:00
Nils Adermann
7b144bbff2 Merge pull request #1369 from EXreaction/ticket/11335
Ticket/11335
2013-04-25 04:01:38 -07:00
Nils Adermann
6d0b183553 Merge pull request #1367 from EXreaction/ticket/11454
Ticket/11454 - Jabber notifications are not working at all
2013-04-25 03:59:34 -07:00
Joas Schilling
e8b192fa32 [ticket/11495] Do not compare to null anymore (left over from item class)
PHPBB3-11495
2013-04-25 12:57:21 +02:00
Nathaniel Guse
9c4553c41f [ticket/11335] Replace "$phpEx" with $phpEx
PHPBB3-11335
2013-04-24 20:39:24 -05:00
Nathaniel Guse
0d2d72e8ee [ticket/11454] Check if the fields are set
PHPBB3-11454
2013-04-24 20:28:35 -05:00
Nathan Guse
f49993766e [ticket/11335] (more) Make php_ext 'php' not '.php'
PHPBB3-11335
2013-04-24 17:46:00 -05:00
Nathan Guse
c870b9f43b [ticket/11335] (more tests) Make php_ext 'php' not '.php'
PHPBB3-11335
2013-04-24 17:45:56 -05:00
Nathan Guse
e5d032ca21 [ticket/11335] (more class loader) Make php_ext 'php' not '.php'
PHPBB3-11335
2013-04-24 17:45:53 -05:00
Nathan Guse
df518ac131 [ticket/11335] (tests) Make php_ext 'php' not '.php'
PHPBB3-11335
2013-04-24 17:45:51 -05:00
Nathan Guse
14f1340903 [ticket/11335] (avatars) Make php_ext 'php' not '.php'
PHPBB3-11335
2013-04-24 17:45:46 -05:00
Nathan Guse
df70b6ebe6 [ticket/11335] (kernel request subscriber) Make php_ext 'php' not '.php'
PHPBB3-11335
2013-04-24 17:45:41 -05:00
Nathan Guse
fe89e56686 [ticket/11335] (hook finder) Make php_ext 'php' not '.php'
PHPBB3-11335
2013-04-24 17:45:39 -05:00
Nathan Guse
ce230f8dea [ticket/11335] (extension manager/finder) Make php_ext 'php' not '.php'
PHPBB3-11335
2013-04-24 17:45:36 -05:00
Nathan Guse
6ef363547a [ticket/11335] (controller/helper.php) Make php_ext 'php' not '.php'
PHPBB3-11335
2013-04-24 17:45:33 -05:00
Nathan Guse
e870c04067 [ticket/11335] (class loader) Make php_ext 'php' not '.php'
PHPBB3-11335
2013-04-24 17:45:30 -05:00
Nathan Guse
fcdfe748b8 [ticket/11454] Use set_addresses in other applicable areas
This should fix some other bugs that may not have yet been recognized--some
areas only set to(), but sent according to user_notify_type, which is not
necessarily email.

PHPBB3-11454
2013-04-24 15:34:12 -05:00
Nathaniel Guse
ebb5169a46 [ticket/11454] Add messenger function set_addresses
Automatically fills to/im from a user row

Send messenger the Jabber address if using Jabber notifications

PHPBB3-11454
2013-04-24 15:19:37 -05:00
Nathan Guse
4becf85f52 [ticket/11479] Use phpbb_create_default_container
PHPBB3-11479
2013-04-24 14:58:27 -05:00
Gaëtan Muller
1f6f2435d0 [ticket/11471] Unrelated text in e-mail templates
Some e-mail templates contain text unrelated
with the subject of the e-mail

PHPBB3-11471
2013-04-24 20:07:05 +02:00
Nils Adermann
f8ffe84969 Merge pull request #1366 from asperous/ticket/11129
[ticket/11129] Added headers to empty subscription state
2013-04-24 10:29:50 -07:00
Nils Adermann
b8c2bf6ce4 Merge remote-tracking branch 'github-asperous/ticket/9975' into develop
* github-asperous/ticket/9975:
  [ticket/9975] Moved a few E_USER_ERROR errors to /language

Conflicts:
	phpBB/includes/user.php
2013-04-24 19:16:46 +02:00
Nils Adermann
b3497d955f Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9975] Translate missing style error message

Conflicts:
	phpBB/includes/session.php
2013-04-24 19:13:47 +02:00
Nils Adermann
a33cc92fc8 Merge pull request #1358 from MGaetan89/ticket/9975
[ticket/9975] Translate missing style error message
2013-04-24 10:01:30 -07:00
Nils Adermann
aaf109e07d Merge pull request #1326 from dhruvgoel92/ticket/11485
[ticket/11485] add columns to update_schema before adding data
2013-04-24 09:59:41 -07:00
Nils Adermann
81daf21dc0 Merge pull request #1324 from nickvergessen/ticket/10844-2
Ticket/10844 Extensions are not located when front-end file has a diffferent phpbb_root_path
2013-04-24 09:52:57 -07:00
Nils Adermann
3e32655c7f Merge pull request #1290 from nickvergessen/ticket/11362
Correctly sanitise the directory path in finder
2013-04-24 09:45:34 -07:00
Nathaniel Guse
cc902ddee0 [ticket/11479] Fix install/update (rebuild container)
Code copied from fix in 11305

PHPBB3-11479
2013-04-24 11:26:13 -05:00
Nathaniel Guse
212971a3a6 [ticket/11454] Correct jabber global available check
Copied from msg_jabber()

PBPBB3-11454
2013-04-24 10:37:53 -05:00
asperous
0f41cc34dd [ticket/11129] Added headers to empty subscription state
Added a newline to better seperate the two headers.

PHPBB3-11129
2013-04-23 15:02:38 -07:00
asperous
51a869b13a [ticket/11129] Added headers to empty subscription state
"You are not subscribed to any forums".
While correct, could lead to confusion. What's missing is a header right above the message that says "Watched Topics" to match the "Watched Forums" header above. This will assert the idea that there are two separate watchable sections.
As is, it looks like that message is talking about the "Watched Forums" section, since it's listed under that header.

PHPBB3-11129
2013-04-23 11:27:36 -07:00
asperous
9f545a7f6b [ticket/9975] Moved a few E_USER_ERROR errors to /language
There were a few error messages that a user could experience that would, previously, be without any the ability to be localized. There are some more E_USER_ERRORs that I did not change to a constant, for example the error message that is displayed if there aren't any folders in /language.

PHPBB3-9975
2013-04-23 09:55:36 -07:00
Joas Schilling
16e70fa086 [ticket/11362] Use container when available instead of creating a new instance
PHPBB3-11362
2013-04-22 00:49:41 +02:00
Joas Schilling
10781ce9ae [ticket/10844] Increase prefix to not match template/ in finder test
PHPBB3-10844
2013-04-22 00:24:30 +02:00
Joas Schilling
12c432c523 [ticket/10844] Add extension template file to locate
PHPBB3-10844
2013-04-22 00:23:49 +02:00
Gaëtan Muller
802fbbb444 [ticket/9975] Translate missing style error message
The error message about missing style data was not
translated

PHPBB3-9975
2013-04-21 17:38:49 +02:00