aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11413] Don't use the database for the convert testNathaniel Guse2013-04-302-22/+26
| | | | | | | Different databases seem to work slightly differently here and are causing errors PHPBB3-11413
* [ticket/11413] Test get_notification_type_id and _ids functionsNathaniel Guse2013-04-301-0/+29
| | | | PHPBB3-11413
* [ticket/11413] Use sql_insert_bufferNathaniel Guse2013-04-301-19/+8
| | | | PHPBB3-11413
* [ticket/11413] Create test for notification conversionNathaniel Guse2013-04-302-0/+166
| | | | PHPBB3-11413
* [ticket/11413] Fix test fixtures and testsNathaniel Guse2013-04-295-28/+46
| | | | PHPBB3-11413
* [ticket/11413] Fix some more testsNathaniel Guse2013-04-291-4/+6
| | | | PHPBB3-11413
* [ticket/11413] Fix notification testsNathaniel Guse2013-04-296-34/+86
| | | | | | | Send types/methods the cache service, not the driver (not sure why the driver was sent before) PHPBB3-11413
* [ticket/11413] Prevent recursive function callsNathaniel Guse2013-04-291-1/+4
| | | | PHPBB3-11413
* [ticket/11413] Undo editing the user_notifications tableNathaniel Guse2013-04-2914-82/+69
| | | | | | | | 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
* [ticket/11413] Rename columns in notification/manager.phpNathaniel Guse2013-04-282-111/+166
| | | | PHPBB3-11413
* [ticket/11413] Schema changes and migration fileNathaniel Guse2013-04-2810-115/+304
| | | | | | | | | | | | | | | 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
* Merge PR #1371 branch 'EXreaction/ticket/11236' into developOleg Pudeyev2013-04-262-3/+3
|\ | | | | | | | | | | | | | | | | # 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
| * [ticket/11236] Change PRUNE_USERS_GROUP_EXPLAIN languageNathaniel Guse2013-04-251-1/+1
| | | | | | | | PHPBB3-11236
| * [ticket/11236] Do not require group selection in prune usersNathaniel Guse2013-04-251-1/+1
| | | | | | | | PHPBB3-11236
| * [ticket/11236] Correct HTMLNathaniel Guse2013-04-251-1/+1
| | | | | | | | PHPBB3-11236
* | Merge PR #1370 branch 'EXreaction/ticket/11237' into developOleg Pudeyev2013-04-261-21/+15
|\ \ | | | | | | | | | | | | | | | | | | # By Nathaniel Guse # Via Nathaniel Guse * EXreaction/ticket/11237: [ticket/11237] Fix PHP error in acp_prune.php
| * | [ticket/11237] Fix PHP error in acp_prune.phpNathaniel Guse2013-04-251-21/+15
| |/ | | | | | | | | | | Also making the code a bit more efficient (removing one SQL query) PHPBB3-11237
* | Merge remote-tracking branch 'remotes/cyberalien/ticket/11275' into developNathaniel Guse2013-04-252-39/+44
|\ \
| * | [ticket/11275] Do not use spacer.gif in color pickerVjacheslav Trushkin2013-04-121-2/+2
| | | | | | | | | | | | PHPBB3-11275
| * | [ticket/11275] Do not use document.write() for color paletteVjacheslav Trushkin2013-04-122-39/+44
| | | | | | | | | | | | | | | | | | Replace document.write() for color palette function PHPBB3-11275
* | | Merge remote-tracking branch 'remotes/cyberalien/ticket/4412' into developNathaniel Guse2013-04-252-0/+7
|\ \ \ | |_|/ |/| |
| * | [ticket/4412] Shorten long profile fieldsVjacheslav Trushkin2013-04-112-0/+7
| | | | | | | | | | | | | | | | | | Shorten long profile fields using CSS PHPBB3-4412
* | | Merge pull request #1361 from MGaetan89/ticket/11471Nils Adermann2013-04-2520-54/+10
|\ \ \ | | | | | | | | [ticket/11471] Unrelated text in e-mail templates
| * | | [ticket/11471] Unrelated text in e-mail templatesGaƫtan Muller2013-04-2420-54/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Some e-mail templates contain text unrelated with the subject of the e-mail PHPBB3-11471
* | | | Merge pull request #1368 from EXreaction/ticket/11479Nils Adermann2013-04-251-1/+7
|\ \ \ \ | | | | | | | | | | [ticket/11479] Fix install/update (rebuild container)
| * | | | [ticket/11479] Use phpbb_create_default_containerNathan Guse2013-04-241-12/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11479
| * | | | [ticket/11479] Fix install/update (rebuild container)Nathaniel Guse2013-04-241-1/+18
| |/ / / | | | | | | | | | | | | | | | | | | | | Code copied from fix in 11305 PHPBB3-11479
* | | | Merge pull request #1369 from EXreaction/ticket/11335Nils Adermann2013-04-2527-55/+55
|\ \ \ \ | | | | | | | | | | Ticket/11335
| * | | | [ticket/11335] Replace "$phpEx" with $phpExNathaniel Guse2013-04-245-8/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-11335
| * | | | [ticket/11335] (more) Make php_ext 'php' not '.php'Nathan Guse2013-04-243-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11335
| * | | | [ticket/11335] (more tests) Make php_ext 'php' not '.php'Nathan Guse2013-04-241-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11335
| * | | | [ticket/11335] (more class loader) Make php_ext 'php' not '.php'Nathan Guse2013-04-245-10/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-11335
| * | | | [ticket/11335] (tests) Make php_ext 'php' not '.php'Nathan Guse2013-04-246-7/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-11335
| * | | | [ticket/11335] (avatars) Make php_ext 'php' not '.php'Nathan Guse2013-04-244-9/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-11335
| * | | | [ticket/11335] (kernel request subscriber) Make php_ext 'php' not '.php'Nathan Guse2013-04-242-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-11335
| * | | | [ticket/11335] (hook finder) Make php_ext 'php' not '.php'Nathan Guse2013-04-242-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11335
| * | | | [ticket/11335] (extension manager/finder) Make php_ext 'php' not '.php'Nathan Guse2013-04-244-9/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-11335
| * | | | [ticket/11335] (controller/helper.php) Make php_ext 'php' not '.php'Nathan Guse2013-04-242-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11335
| * | | | [ticket/11335] (class loader) Make php_ext 'php' not '.php'Nathan Guse2013-04-242-6/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-11335
* | | | | Merge pull request #1367 from EXreaction/ticket/11454Nils Adermann2013-04-2513-22/+39
|\ \ \ \ \ | |/ / / / |/| | | | Ticket/11454 - Jabber notifications are not working at all
| * | | | [ticket/11454] Check if the fields are setNathaniel Guse2013-04-241-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-11454
| * | | | [ticket/11454] Use set_addresses in other applicable areasNathan Guse2013-04-2410-20/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | [ticket/11454] Add messenger function set_addressesNathaniel Guse2013-04-242-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatically fills to/im from a user row Send messenger the Jabber address if using Jabber notifications PHPBB3-11454
| * | | | [ticket/11454] Correct jabber global available checkNathaniel Guse2013-04-241-1/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | Copied from msg_jabber() PBPBB3-11454
* | | | Merge pull request #1366 from asperous/ticket/11129Nils Adermann2013-04-241-2/+17
|\ \ \ \ | | | | | | | | | | [ticket/11129] Added headers to empty subscription state
| * | | | [ticket/11129] Added headers to empty subscription stateasperous2013-04-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a newline to better seperate the two headers. PHPBB3-11129
| * | | | [ticket/11129] Added headers to empty subscription stateasperous2013-04-231-2/+16
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | "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
* | | | Merge remote-tracking branch 'github-asperous/ticket/9975' into developNils Adermann2013-04-247-8/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-asperous/ticket/9975: [ticket/9975] Moved a few E_USER_ERROR errors to /language Conflicts: phpBB/includes/user.php
| * | | | [ticket/9975] Moved a few E_USER_ERROR errors to /languageasperous2013-04-238-9/+14
| |/ / / | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'develop-olympus' into developNils Adermann2013-04-242-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9975] Translate missing style error message Conflicts: phpBB/includes/session.php