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

16511 commits

This branch
This branch
All branches
Author SHA1 Message Date
marc1706
cb13add269 [ticket/11442] Use correct button class for ajaxified confirm_box 
In commit 001572f the HTML code for the ajaxified confirm_box was moved
from overall_footer.html to confirm_body.html. While copying, the CSS
class of the "Yes" button was changed from button1 to button2. Due to the
fact that the phpbb.confirm() method uses the class button1 to check if
"Yes" was clicked, this broke the ajaxified confirm box in the ACP. With
this small patch the confirm boxes in the ACP should work properly again.

PHPBB3-11442
 2013-04-28 22:54:48 +02:00
Oleg Pudeyev
c182ab0e7b Merge PR #1371 branch 'EXreaction/ticket/11236' into develop 
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11236:
  [ticket/11236] Change PRUNE_USERS_GROUP_EXPLAIN language
  [ticket/11236] Do not require group selection in prune users
  [ticket/11236] Correct HTML
 2013-04-26 22:35:13 -04:00
Oleg Pudeyev
efd9e331bc Merge PR #1370 branch 'EXreaction/ticket/11237' into develop 
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11237:
  [ticket/11237] Fix PHP error in acp_prune.php
 2013-04-26 22:34:55 -04:00
Joas Schilling
2afa673023 [ticket/11495] Fix doc blocks once more 
PHPBB3-11495
 2013-04-26 08:42:44 +02:00
Joas Schilling
a9f02d1efa [ticket/11495] Make method names for add/remove more descriptive 
PHPBB3-11495
 2013-04-26 00:04:58 +02:00
Nathaniel Guse
c057141ea6 Merge remote-tracking branch 'remotes/cyberalien/ticket/11275' into develop 2013-04-25 16:33:30 -05:00
Nathaniel Guse
ad1a4919d6 Merge remote-tracking branch 'remotes/cyberalien/ticket/4412' into develop 2013-04-25 16:21:14 -05:00
Joas Schilling
baff4287e5 [ticket/11495] Fix comments and package docs 
PHPBB3-11495
 2013-04-25 22:39:24 +02:00
Nathan Guse
ab87fe7982 [ticket/11435] Create test to make sure template/event output is equal 
PHPBB3-11435
 2013-04-25 15:26:59 -05:00
Nathan Guse
6801e36def [ticket/11435] Fix comments in events test 
PHPBB3-11435
 2013-04-25 15:26:59 -05:00
Dhruv
27aa5e7b71 [ticket/10325] functional tests for forgot password functionality 
PHPBB3-10325
 2013-04-25 22:58:03 +05:30
Dhruv
2fa5f9591e [ticket/10325] add logout function in functional_test_case 
PHPBB3-10325
 2013-04-25 22:52:40 +05:30
Nathaniel Guse
e7cb0f687d [ticket/11236] Change PRUNE_USERS_GROUP_EXPLAIN language 
PHPBB3-11236
 2013-04-25 11:23:09 -05:00
Nathaniel Guse
1a16ee4cb2 [ticket/11236] Do not require group selection in prune users 
PHPBB3-11236
 2013-04-25 11:20:13 -05:00
Nathaniel Guse
ee457e584c [ticket/11236] Correct HTML 
PHPBB3-11236
 2013-04-25 11:16:00 -05:00
Joas Schilling
0def8b7d9c [ticket/11495] Use constructor arguments over properties in implementation 
PHPBB3-11495
 2013-04-25 18:09:21 +02:00
Nathaniel Guse
42cfb7264d [ticket/11237] Fix PHP error in acp_prune.php 
Also making the code a bit more efficient (removing one SQL query)

PHPBB3-11237
 2013-04-25 10:58:48 -05:00
Dhruv
d242b7a1a5 [ticket/10325] fix language in acp and ucp 
PHPBB3-10325
 2013-04-25 21:05:02 +05:30
Dhruv
419aaa402f [ticket/10325] improve acp option language 
PHPBB3-10325
 2013-04-25 21:01:22 +05:30
Dhruv
c048067bbd [ticket/10325] fix language key 
PHPBB3-10325
 2013-04-25 21:01:21 +05:30
Dhruv
f1e615c429 [ticket/10325] fix language variable 
PHPBB3-10325
 2013-04-25 21:01:19 +05:30
Dhruv
1a51abcca2 [ticket/10325] change language var 
PHPBB3-10325
 2013-04-25 21:01:14 +05:30
Dhruv
f8012cc239 [ticket/10325] fix language 
PHPBB3-10325
 2013-04-25 21:00:14 +05:30
Dhruv
2dbe3b3c97 [ticket/10325] add new config value to database 
PHPBB3-10325
 2013-04-25 21:00:07 +05:30
Joas Schilling
ce07b27765 [ticket/11495] Fix failing unit tests 
PHPBB3-11495
 2013-04-25 17:27:33 +02:00
Joas Schilling
abfb7bc51f [ticket/11495] Remove add/remove from the interface 
PHPBB3-11495
 2013-04-25 17:24:18 +02:00
Joas Schilling
73d8735484 [ticket/11495] Remove fixing function from tree interface 
The fixing function is implementation dependent.

PHPBB3-11495
 2013-04-25 17:19:52 +02:00
Joas Schilling
d4b7708d4b [ticket/11495] Remove tests for add/remove we make them protected later 
PHPBB3-11495
 2013-04-25 17:19:21 +02:00
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