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

16299 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nathaniel Guse
07c972f5d7 [ticket/11413] Remove changes for ticket 11420 from this branch 
PHPBB3-11413
 2013-05-02 15:39:26 -05:00
Nathaniel Guse
9004676810 [ticket/11413] Include mock class 
PHPBB3-11413
 2013-04-30 22:02:10 -05:00
Nathaniel Guse
2f2feaa4e8 [ticket/11413] Don't use the database for the convert test 
Different databases seem to work slightly differently here and are causing
errors

PHPBB3-11413
 2013-04-30 21:38:40 -05:00
Nathaniel Guse
f2e618a05d [ticket/11413] Test get_notification_type_id and _ids functions 
PHPBB3-11413
 2013-04-30 21:10:04 -05:00
Nathaniel Guse
81b2ad158c [ticket/11413] Use sql_insert_buffer 
PHPBB3-11413
 2013-04-30 21:01:46 -05:00
Nathaniel Guse
00ea297b61 [ticket/11413] Create test for notification conversion 
PHPBB3-11413
 2013-04-30 20:54:01 -05:00
Nathaniel Guse
878df5f280 [ticket/11413] Fix test fixtures and tests 
PHPBB3-11413
 2013-04-29 23:10:38 -05:00
Nathaniel Guse
78c22248fa [ticket/11413] Fix some more tests 
PHPBB3-11413
 2013-04-29 22:41:08 -05:00
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
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
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
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
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
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
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
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