Commit graph

16298 commits

Author SHA1 Message Date
Nathaniel Guse
fa8f62a604 [ticket/11420] Fix tests
PHPBB3-11420
2013-07-12 09:46:51 -05:00
Nathaniel Guse
9bfb567854 [ticket/11420] Fix tests
PHPBB3-11420
2013-07-11 15:58:02 -05:00
Nathaniel Guse
91165e0758 [ticket/11420] Fix tests
PHPBB3-11420
2013-07-11 15:49:32 -05:00
Nathan Guse
9f85a4d118 [ticket/11420] Use !==, === when comparing strings
PHPBB3-11420
2013-07-06 12:59:26 -05:00
Nathan Guse
bdaa40bb55 [ticket/11420] Fix comments, license link
PHPBB3-11420
2013-07-06 12:58:52 -05:00
Nathan Guse
cb13747c4b [ticket/11420] Rename migrations file to something more helpful
PHPBB3-11420
2013-05-10 13:44:38 -05:00
Nathaniel Guse
7743659563 [ticket/11420] Forgot to include mock sql_insert_buffer
PHPBB3-11420
2013-05-03 08:37:09 -05:00
Nathaniel Guse
a4fe72bd53 [ticket/11420] Fix notification options conversion
PHPBB3-11420
2013-05-02 15:40:43 -05:00
Oleg Pudeyev
954edb3eb4 Merge PR #1372 branch 'EXreaction/ticket/11435' into develop
# By Nathan Guse (2) and Nathaniel Guse (1)
# Via Nathaniel Guse
* EXreaction/ticket/11435:
  [ticket/11435] Mark extension spacing test as incomplete
  [ticket/11435] Create test to make sure template/event output is equal
  [ticket/11435] Fix comments in events test
2013-05-01 14:16:41 -04:00
Nathaniel Guse
356bc00a29 [ticket/11435] Mark extension spacing test as incomplete
This test fails until 11435 is fixed

Add newlines at EOF

PHPBB3-11435
2013-04-30 23:21:50 -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
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
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
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