aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | [ticket/11010] adding type="number" in ACP; adding type="email" in installSenky2013-05-204-60/+74
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] changing email and url input types in php filesSenky2013-05-203-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] adding new input types into build_cfg_template()Senky2013-05-201-0/+2
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-11010
* | | | | [ticket/11279] Log error in consoleVjacheslav Trushkin2013-05-201-0/+3
| | | | | | | | | | | | | | | | | | | | PHPBB-11279
* | | | | [ticket/11279] Clearer AJAX errorsVjacheslav Trushkin2013-05-204-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display clearer AJAX errors rather than generic error PHPBB3-11279
* | | | | Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' ↵Nathan Guse2013-05-201-0/+99
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into develop # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/feature/editor-code-tabs: [feature/editor-code-tabs] Adjust code style to match guidelines [feature/editor-code-tabs] Correctly calculate end tag location [feature/editor-code-tabs] Allow tabs when typing code
| * | | | | [feature/editor-code-tabs] Adjust code style to match guidelinesVjacheslav Trushkin2013-05-201-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11557
| * | | | | [feature/editor-code-tabs] Correctly calculate end tag locationVjacheslav Trushkin2013-05-201-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11557
| * | | | | [feature/editor-code-tabs] Allow tabs when typing codeVjacheslav Trushkin2013-05-191-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow tabs when typing code in textarea Keep indentation when typing code in textarea PHPBB3-11557
* | | | | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathan Guse2013-05-202-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | | | | | | | | | | | # By David King # Via David King (1) and Nathan Guse (1) * remotes/upstream/develop-olympus: [ticket/11551] Fix error in system tab if get_remote_file returns empty string
| * | | | [ticket/11551] Fix error in system tab if get_remote_file returns empty stringDavid King2013-05-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently a debug error is thrown. With this patch, it fails without keeping the admin from being able to access the rest of the System modules by showing a nicer error "Failed to obtain latest version information." PHPBB3-11551
* | | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11558' into developNathan Guse2013-05-202-2/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11558: [ticket/11558] Adjustments for notification link [ticket/11558] Fix styling for notifications link
| * | | | | [ticket/11558] Adjustments for notification linkVjacheslav Trushkin2013-05-203-12/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11558
| * | | | | [ticket/11558] Fix styling for notifications linkVjacheslav Trushkin2013-05-193-1/+21
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-11558
* | | | | Merge remote-tracking branch 'EXreaction/ticket/11413' into developDavid King2013-05-2018-158/+394
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11413: (23 commits) [ticket/11413] Revert some cache service related changes from earlier [ticket/11413] Use phpbb_user in test [ticket/11413] $user should have been $this->user [ticket/11413] Fix unit tests [ticket/11413] Translate the error [ticket/11413] Rename file to something more helpful [ticket/11413] Remove remaining irrelevant code to this PR [ticket/11413] Remove mock sql_insert_buffer.php (not relevant to PR) [ticket/11413] Remove conversion of user_notifications [ticket/11413] Correct copyright year [ticket/11413] Remove changes for ticket 11420 from this branch [ticket/11413] Include mock class [ticket/11413] Don't use the database for the convert test [ticket/11413] Test get_notification_type_id and _ids functions [ticket/11413] Use sql_insert_buffer [ticket/11413] Create test for notification conversion [ticket/11413] Fix test fixtures and tests [ticket/11413] Fix some more tests [ticket/11413] Fix notification tests [ticket/11413] Prevent recursive function calls ...
| * | | | | [ticket/11413] Revert some cache service related changes from earlierNathaniel Guse2013-05-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11413
| * | | | | [ticket/11413] $user should have been $this->userNathaniel Guse2013-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11413
| * | | | | [ticket/11413] Translate the errorNathan Guse2013-05-102-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11413
| * | | | | [ticket/11413] Rename file to something more helpfulNathan Guse2013-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11413
| * | | | | [ticket/11413] Remove remaining irrelevant code to this PRNathaniel Guse2013-05-032-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11413
| * | | | | [ticket/11413] Remove conversion of user_notificationsNathaniel Guse2013-05-021-90/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11413
| * | | | | [ticket/11413] Correct copyright yearNathaniel Guse2013-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11413
| * | | | | [ticket/11413] Remove changes for ticket 11420 from this branchNathaniel Guse2013-05-021-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11413
| * | | | | [ticket/11413] Don't use the database for the convert testNathaniel Guse2013-04-301-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Different databases seem to work slightly differently here and are causing errors PHPBB3-11413
| * | | | | [ticket/11413] Use sql_insert_bufferNathaniel Guse2013-04-301-19/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11413
| * | | | | [ticket/11413] Fix notification testsNathaniel Guse2013-04-294-21/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 remote-tracking branch 'remotes/cyberalien/ticket/11482' into developNathan Guse2013-05-201-0/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11482: [ticket/11482] Use double quotes for code [ticket/11482] Unit tests for advanced DEFINE [ticket/11482] Implementation of advanced DEFINE tag
| * | | | | | [ticket/11482] Use double quotes for codeVjacheslav Trushkin2013-04-101-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use double quotes for code to avoid excessive escaping PHPBB3-11482
| * | | | | | [ticket/11482] Implementation of advanced DEFINE tagVjacheslav Trushkin2013-04-071-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implementation of advanced DEFINE tag and ENDDEFINE PHPBB3-11482
* | | | | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11489' into developNathan Guse2013-05-2020-283/+395
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11489: [ticket/11489] IE7 adjustments [ticket/11489] Template changes for new topiclist layout [ticket/11489] CSS changes for topiclist lists
| * | | | | | | [ticket/11489] IE7 adjustmentsVjacheslav Trushkin2013-05-202-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11489
| * | | | | | | [ticket/11489] Template changes for new topiclist layoutVjacheslav Trushkin2013-05-1416-207/+267
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11489
| * | | | | | | [ticket/11489] CSS changes for topiclist listsVjacheslav Trushkin2013-05-143-75/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11489
* | | | | | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11556' into developNathan Guse2013-05-203-42/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11556: [ticket/11556] Load apply_onkeypress_event() correctly [ticket/11556] Remove fallback JS
| * | | | | | | | [ticket/11556] Load apply_onkeypress_event() correctlyVjacheslav Trushkin2013-05-203-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11556
| * | | | | | | | [ticket/11556] Remove fallback JSVjacheslav Trushkin2013-05-191-32/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11556
* | | | | | | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11554' into developNathaniel Guse2013-05-195-11/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11554: [ticket/11554] Move forum_fn.js to footer
| * | | | | | | | [ticket/11554] Move forum_fn.js to footerVjacheslav Trushkin2013-05-195-11/+10
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move forum_fn.js to footer, move find_username to forum_fn.js PHPBB3-11554
* | | | | | | | Merge remote-tracking branch 'marc1706/ticket/11535' into developAndreas Fischer2013-05-192-4/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/11535: [ticket/11535] Correctly merge avatar_errors array into primary error array
| * | | | | | | | [ticket/11535] Correctly merge avatar_errors array into primary error arrayMarc Alexander2013-05-132-4/+16
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The $avatar_errors array needs to be merged into the primary $error array before the group settings get applied. This is currently not the case. Functional tests for this will be provided by PR #1401. PHPBB3-11535
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-191-9/+8
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11537] Adjust error message on ucp group manage to fit rest of ucp Conflicts: phpBB/styles/prosilver/template/ucp_groups_manage.html
| * | | | | | | Merge remote-tracking branch 'marc1706/ticket/11537' into develop-olympusAndreas Fischer2013-05-191-9/+8
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/11537: [ticket/11537] Adjust error message on ucp group manage to fit rest of ucp
| | * | | | | | [ticket/11537] Adjust error message on ucp group manage to fit rest of ucpMarc Alexander2013-05-141-9/+8
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current look highly differed from the rest of the UCP. Additionally, this caused the error message to be hardly noticeable at all. PHPBB3-11537
* | | | | | | [ticket/11555] Fix page comparisonVjacheslav Trushkin2013-05-191-1/+1
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Strict comparison should not be used to compare string and number PHPBB3-11555
* | | | | | Merge remote-tracking branch 'EXreaction/ticket/11415' into developDavid King2013-05-185-104/+138
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11415: [ticket/11415] Add test for find_from_extension() [ticket/11415] Send the extension base the finder rather than the manager [ticket/11415] Create function in finder find_from_extension [ticket/11415] Fix ext.manager constructor in tests [ticket/11415] Make migrator/ext.manager dependencies of the base ext class [ticket/11415] Remove migrator dependency from extension manager [ticket/11415] Move migrator to base extension class from ext.manager [ticket/11415] Move while loop from ext manager to acp_extensions.php
| * | | | | | [ticket/11415] Send the extension base the finder rather than the managerNathan Guse2013-05-102-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11415