aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/cyberalien/ticket/11558' into developNathan Guse2013-05-202-2/+15
|\
| * [ticket/11558] Adjustments for notification linkVjacheslav Trushkin2013-05-203-12/+5
| * [ticket/11558] Fix styling for notifications linkVjacheslav Trushkin2013-05-193-1/+21
* | Merge remote-tracking branch 'EXreaction/ticket/11413' into developDavid King2013-05-2025-210/+516
|\ \
| * | [ticket/11413] Revert some cache service related changes from earlierNathaniel Guse2013-05-131-3/+3
| * | [ticket/11413] Use phpbb_user in testNathaniel Guse2013-05-131-1/+1
| * | [ticket/11413] $user should have been $this->userNathaniel Guse2013-05-131-1/+1
| * | Merge branch 'ticket/11413' of github.com:EXreaction/phpbb3 into ticket/11413Nathaniel Guse2013-05-133-2/+3
| |\ \
| | * | [ticket/11413] Translate the errorNathan Guse2013-05-102-1/+2
| | * | [ticket/11413] Rename file to something more helpfulNathan Guse2013-05-101-1/+1
| * | | [ticket/11413] Fix unit testsNathaniel Guse2013-05-131-1/+1
| |/ /
| * | [ticket/11413] Remove remaining irrelevant code to this PRNathaniel Guse2013-05-035-28/+26
| * | [ticket/11413] Remove mock sql_insert_buffer.php (not relevant to PR)Nathaniel Guse2013-05-031-21/+0
| * | [ticket/11413] Remove conversion of user_notificationsNathaniel Guse2013-05-021-90/+0
| * | [ticket/11413] Correct copyright yearNathaniel Guse2013-05-021-1/+1
| * | [ticket/11413] Remove changes for ticket 11420 from this branchNathaniel Guse2013-05-023-162/+64
| * | [ticket/11413] Include mock classNathaniel Guse2013-04-302-0/+22
| * | [ticket/11413] Don't use the database for the convert testNathaniel Guse2013-04-302-22/+26
| * | [ticket/11413] Test get_notification_type_id and _ids functionsNathaniel Guse2013-04-301-0/+29
| * | [ticket/11413] Use sql_insert_bufferNathaniel Guse2013-04-301-19/+8
| * | [ticket/11413] Create test for notification conversionNathaniel Guse2013-04-302-0/+166
| * | [ticket/11413] Fix test fixtures and testsNathaniel Guse2013-04-295-28/+46
| * | [ticket/11413] Fix some more testsNathaniel Guse2013-04-291-4/+6
| * | [ticket/11413] Fix notification testsNathaniel Guse2013-04-296-34/+86
| * | [ticket/11413] Prevent recursive function callsNathaniel Guse2013-04-291-1/+4
| * | [ticket/11413] Undo editing the user_notifications tableNathaniel Guse2013-04-2914-82/+69
| * | [ticket/11413] Rename columns in notification/manager.phpNathaniel Guse2013-04-282-111/+166
| * | [ticket/11413] Schema changes and migration fileNathaniel Guse2013-04-2810-115/+304
* | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11482' into developNathan Guse2013-05-206-2/+67
|\ \ \
| * | | [ticket/11482] Use double quotes for codeVjacheslav Trushkin2013-04-101-7/+7
| * | | [ticket/11482] Unit tests for advanced DEFINEVjacheslav Trushkin2013-04-105-2/+39
| * | | [ticket/11482] Implementation of advanced DEFINE tagVjacheslav Trushkin2013-04-071-0/+28
* | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11489' into developNathan Guse2013-05-2020-283/+395
|\ \ \ \
| * | | | [ticket/11489] IE7 adjustmentsVjacheslav Trushkin2013-05-202-5/+18
| * | | | [ticket/11489] Template changes for new topiclist layoutVjacheslav Trushkin2013-05-1416-207/+267
| * | | | [ticket/11489] CSS changes for topiclist listsVjacheslav Trushkin2013-05-143-75/+114
* | | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11556' into developNathan Guse2013-05-203-42/+14
|\ \ \ \ \
| * | | | | [ticket/11556] Load apply_onkeypress_event() correctlyVjacheslav Trushkin2013-05-203-11/+2
| * | | | | [ticket/11556] Remove fallback JSVjacheslav Trushkin2013-05-191-32/+13
* | | | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11554' into developNathaniel Guse2013-05-195-11/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/11554] Move forum_fn.js to footerVjacheslav Trushkin2013-05-195-11/+10
| | |_|_|/ | |/| | |
* | | | | Merge remote-tracking branch 'marc1706/ticket/11535' into developAndreas Fischer2013-05-192-4/+16
|\ \ \ \ \
| * | | | | [ticket/11535] Correctly merge avatar_errors array into primary error arrayMarc Alexander2013-05-132-4/+16
| | |/ / / | |/| | |
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-191-9/+8
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'marc1706/ticket/11537' into develop-olympusAndreas Fischer2013-05-191-9/+8
| |\ \ \ \ \
| | * | | | | [ticket/11537] Adjust error message on ucp group manage to fit rest of ucpMarc Alexander2013-05-141-9/+8
* | | | | | | Merge remote-tracking branch 'cyberalien/ticket/11555' into developAndreas Fischer2013-05-191-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | [ticket/11555] Fix page comparisonVjacheslav Trushkin2013-05-191-1/+1
|/ / / / / /
* | | | | | Merge remote-tracking branch 'EXreaction/ticket/11415' into developDavid King2013-05-1810-112/+172
|\ \ \ \ \ \
| * | | | | | [ticket/11415] Add test for find_from_extension()Nathan Guse2013-05-141-0/+17