Commit graph

16832 commits

Author SHA1 Message Date
Nathaniel Guse
4cd0914f89 [ticket/11413] Fix notification tests
Send types/methods the cache service, not the driver (not sure why the
driver was sent before)

PHPBB3-11413
2013-04-29 22:16:46 -05:00
Nathaniel Guse
7bda5a016a [ticket/11413] Prevent recursive function calls
PHPBB3-11413
2013-04-29 21:42:14 -05:00
Nathaniel Guse
33287a7360 [ticket/11413] Undo editing the user_notifications table
item_type is not equivalent to notification_type_name, it can be a generic
string (typically used to be able to subscribe to multiple notification
types while only subscribing to one item

PHPBB3-11413
2013-04-29 21:22:07 -05:00
Nathaniel Guse
4c5e51e379 [ticket/11413] Rename columns in notification/manager.php
PHPBB3-11413
2013-04-28 23:40:48 -05:00
Nathaniel Guse
198b992dce [ticket/11413] Schema changes and migration file
Notifications tables are dropped because phpBB currently does not have
any way to make the necessary changes to the DB schema (and no release
has yet been made with these changes).

This will fix the following bugs:
PHPBB3-11411
PHPBB3-11413
PHPBB3-11414
PHPBB3-11416
PHPBB3-11420

PHPBB3-11413
2013-04-28 22:53:05 -05:00
Dhruv
679183385f [ticket/10820] add unit tests for phpbb_is_greater_ie7
PHPBB3-10820
2013-04-29 02:29:19 +05:30
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
Andreas Fischer
cba5dde0ee Merge remote-tracking branch 'dhruvgoel92/ticket/10820' into ticket/10820-develop
* dhruvgoel92/ticket/10820:
  [ticket/10820] remove unnecessary parentheses
  [ticket/10820] fix docblock
  [ticket/10820] add param and return to function
  [ticket/10820] simplify regex and escape dot
  [ticket/10820] Use singular return
  [ticket/10820] remove unnecessary condition checks
  [ticket/10820] add function docblock
  [ticket/10820] fix IE check function
  [ticket/10820] proper usage of global and local variable browser
  [ticket/10820] Image downloader recognize new version of ie

Conflicts:
	phpBB/download/file.php
2013-04-27 23:04:46 +02:00
Dhruv
b39e6e01b2 [ticket/10820] remove unnecessary parentheses
PHPBB3-10820
2013-04-27 23:24:22 +05:30
Dhruv
8c9786c504 [ticket/10820] fix docblock
PHPBB3-10820
2013-04-27 21:33:30 +05:30
Dhruv
f0f28f261c [ticket/10820] add param and return to function
Add param and return in function docblock. Rename function
parameter to $user_agent.

PHPBB3-10820
2013-04-27 20:57:51 +05:30
Dhruv
8d1bbc1e7f [ticket/10820] simplify regex and escape dot
PHPBB3-10820
2013-04-27 19:39:31 +05:30
Dhruv
0ad48d7ea1 [ticket/10820] Use singular return
PHPBB3-10820
2013-04-27 19:39:30 +05:30
Dhruv
79a740bb80 [ticket/10820] remove unnecessary condition checks
PHPBB3-10820
2013-04-27 19:39:29 +05:30
Dhruv
adb2441f22 [ticket/10820] add function docblock
PHPBB3-10820
2013-04-27 19:39:27 +05:30
Dhruv
095ac054e0 [ticket/10820] fix IE check function
Add phpbb_ prefix to function name and return boolean value.

PHPBB3-10820
2013-04-27 19:39:26 +05:30
Dhruv
ac56363351 [ticket/10820] proper usage of global and local variable browser
PHPBB3-10820
2013-04-27 19:39:25 +05:30
riadhchtara
bef96b9792 [ticket/10820] Image downloader recognize new version of ie
When a user download image attachement using ie8, the file is displayed.
However, when he uses ie version greater than 8, the image is download.
A changes are made to phpbb/download/file.php to solve the problem.
We check now if the ie version is greater or equal to 8 and not only equal
to 8

PHPBB3-10820
2013-04-27 19:39:24 +05:30
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