1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 13:04:24 +01:00

8918 Commits

Author SHA1 Message Date
Tristan Darricau
3e31764007 [ticket/12639] Don't make a copy of $marked when deleting logs in acp_logs
PHPBB3-12639
2014-06-02 23:22:36 +02:00
Tristan Darricau
5b5f3a5d0c [ticket/12639] Send a correct IN entry when deleting marked logs
PHPBB3-12639
2014-06-02 23:15:25 +02:00
Cesar G
a090260a73 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12566] Also changed for ucp_pm_viewmessage.php
  [ticket/12566] "Private messages" should be "Send pivate message"
2014-06-02 13:48:01 -07:00
PayBas
0baf501569 [ticket/12566] Also changed for ucp_pm_viewmessage.php
PHPBB3-12566
2014-06-02 22:12:58 +02:00
Marc Alexander
6f5f0d6d8d [ticket/12352] Use custom provider collection for auth providers
Using this custom provider collection, we can properly check whether the
configured auth provider does exist. The method get_provider() has been added
for returning the default auth provider or the standard db auth provider if
the specified one does not exist.
Additionally, the method get_provider() will throw an RuntimeException if
none of the above exist.

PHPBB3-12352
2014-06-01 21:31:06 +02:00
Marc Alexander
4698f6928e [ticket/12352] Remove usages of user_pass_convert column
PHPBB3-12352
2014-06-01 21:31:05 +02:00
Marc Alexander
ed1d4fe4a0 [ticket/12352] Revert to db auth provider if default does not exist
This will make sure that we will not encounter a non-existing auth provider.
We will revert to the default db auth provider if the one set in the config
does not exist in our auth provider collection.

PHPBB3-12352
2014-06-01 21:31:04 +02:00
Tristan Darricau
36071ded9d [ticket/12639] Delete entry in admin-log leads to mysql-error
PHPBB3-12639
2014-05-31 12:56:44 +02:00
Joas Schilling
51b9ea3e86 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/10899] Update doc block
  [ticket/10899] Use isset($field_value['IN'])
  [ticket/10899] Add event core.delete_log
  [ticket/10899] Remove trailing ;
  [ticket/10899] Fix typo in the class name
  [ticket/10899] Add unit tests
  [ticket/10899] Get $phpbb_log from the container
  [ticket/10899] Remove extra ';'
  [ticket/10899] Typo
  [ticket/10899] Refactoring in \phpbb\log\log_interface
  [ticket/10899] Using Delete All in log viewer with keyword search
2014-05-30 23:13:09 +02:00
Joas Schilling
40218ba5e6 Merge pull request #2433 from Nicofuma/ticket/10899
[ticket/10899] Using Delete All in log viewer with keyword search

* Nicofuma/ticket/10899:
  [ticket/10899] Update doc block
  [ticket/10899] Use isset($field_value['IN'])
  [ticket/10899] Add event core.delete_log
  [ticket/10899] Remove trailing ;
  [ticket/10899] Fix typo in the class name
  [ticket/10899] Add unit tests
  [ticket/10899] Get $phpbb_log from the container
  [ticket/10899] Remove extra ';'
  [ticket/10899] Typo
  [ticket/10899] Refactoring in \phpbb\log\log_interface
  [ticket/10899] Using Delete All in log viewer with keyword search
2014-05-30 23:13:00 +02:00
Joas Schilling
dc5878352c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11942] Don't change the reason to '' when hard deleting
  [ticket/11942] Don't show the checkbox if the post is already soft-deleted
  [ticket/11942] Remove useless IF in templates
  [ticket/11942] Apply the modifications to subsilver
  [ticket/11942] Always display delete reason
  [ticket/11942] Edits messages
  [ticket/11942] Change the formulation
  [ticket/11942] Adding the reason to hard deleted topic/post
  [ticket/11942] Delete post/topic reason should be added to logs
2014-05-30 23:04:10 +02:00
Joas Schilling
be52ea882a Merge pull request #2357 from Nicofuma/ticket/11942
[ticket/11942] Delete post/topic reason should be added to logs

* Nicofuma/ticket/11942:
  [ticket/11942] Don't change the reason to '' when hard deleting
  [ticket/11942] Don't show the checkbox if the post is already soft-deleted
  [ticket/11942] Remove useless IF in templates
  [ticket/11942] Apply the modifications to subsilver
  [ticket/11942] Always display delete reason
  [ticket/11942] Edits messages
  [ticket/11942] Change the formulation
  [ticket/11942] Adding the reason to hard deleted topic/post
  [ticket/11942] Delete post/topic reason should be added to logs
2014-05-30 23:04:02 +02:00
Joas Schilling
e8af120037 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11467] Add user object to extension manager for tests
  [ticket/11467] Add language variables to tests
  [ticket/11467] Add language variables for extension exception messages
2014-05-30 23:01:57 +02:00
Joas Schilling
9f87c497fe Merge pull request #2447 from n-aleha/ticket/11467
[ticket/11467] Add language variables for extension exception messages

* n-aleha/ticket/11467:
  [ticket/11467] Add user object to extension manager for tests
  [ticket/11467] Add language variables to tests
  [ticket/11467] Add language variables for extension exception messages
2014-05-30 23:01:19 +02:00
Joas Schilling
be8770532c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11266] Better message for when composer dependencies are missing.
2014-05-30 22:58:17 +02:00
Joas Schilling
669a6c3e3d Merge pull request #2512 from bantu/ticket/11266
[ticket/11266] Better message for when composer dependencies are missing...

* bantu/ticket/11266:
  [ticket/11266] Better message for when composer dependencies are missing.
2014-05-30 22:57:43 +02:00
Joas Schilling
a84bb5f6a1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [prep-release-3.1.0-b4] Update phpBB Version for b5 development
  [prep-release-3.1.0-b4] Add changelog for 3.1.0-b4
  [prep-release-3.1.0-b4] Prepare Changelog
  [prep-release-3.1.0-b4] Add migration for 3.1.0-b4
  [prep-release-3.1.0-b4] Update version to 3.1.0-b4
2014-05-30 17:53:16 +02:00
Joas Schilling
da48b7df22 [prep-release-3.1.0-b4] Update phpBB Version for b5 development 2014-05-30 17:52:38 +02:00
Joas Schilling
b6135d3d02 [prep-release-3.1.0-b4] Update version to 3.1.0-b4 2014-05-30 16:23:44 +02:00
Andreas Fischer
505b26ed86 [ticket/11266] Better message for when composer dependencies are missing.
PHPBB3-11266
2014-05-29 16:13:29 +02:00
Joas Schilling
6a9fd06b73 [ticket/10073] Store values with config_text in the ACP
PHPBB3-10073
2014-05-29 02:14:48 +02:00
Joas Schilling
1c0036f118 [ticket/10073] Fix request usage
PHPBB3-10073
2014-05-29 02:14:47 +02:00
Joas Schilling
975afa9048 [ticket/10073] Deduplicate template variable names
PHPBB3-10073
2014-05-29 02:14:46 +02:00
Joas Schilling
81f22a1c8e [ticket/10073] Get service from container
PHPBB3-10073
2014-05-29 02:14:46 +02:00
Joas Schilling
3e0f8d7f1e [ticket/10073] Move template code into the template
PHPBB3-10073
2014-05-29 02:14:45 +02:00
Joas Schilling
911725a581 [ticket/10073] Split email validation from email ban and taken checks
PHPBB3-10073
2014-05-29 02:14:41 +02:00
Joas Schilling
f01e0a2eef [ticket/10073] Deduplicate the if statement
PHPBB3-10073
2014-05-29 02:14:40 +02:00
Joas Schilling
ed8c16bf0d [ticket/10073] Fallback to board_contact when contact page is disabled
PHPBB3-10073
2014-05-29 02:14:39 +02:00
Joas Schilling
d3f65cd66e [ticket/10073] Add ACP module to add bbcode text for contact admin info
PHPBB3-10073
2014-05-29 02:14:38 +02:00
Joas Schilling
35b88624f5 [ticket/10073] Remove unneccessary todos he config switch is enough
PHPBB3-10073
2014-05-29 02:14:32 +02:00
Joas Schilling
fffb07fd91 [ticket/10073] Use namespaces and fix all class names
PHPBB3-10073
2014-05-29 02:14:29 +02:00
Nils Adermann
389bc0b8dd [ticket/10073] Replace board_contact mail with links to contact page
Error pages still contain the email address.

PHPBB3-10073
2014-05-29 02:14:28 +02:00
Nils Adermann
d52f34f5ec [ticket/10073] Add a contact administrators page and refactor email forms.
The message to be displayed on top of the email form cannot be configured yet.

PHPBB3-10073
2014-05-29 02:14:27 +02:00
Tristan Darricau
70f313eb4f [ticket/11942] Don't change the reason to '' when hard deleting
PHPBB3-11942
2014-05-29 00:49:12 +02:00
Joas Schilling
3ea17f1d14 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11226] Explicity set file_moved to false
  [ticket/11226] Add tests
  [ticket/11226] Use $user->lang()
  [ticket/11226] filespec::move_file() should error correctly
2014-05-29 00:15:32 +02:00
Joas Schilling
cae8448fe4 Merge pull request #2432 from Nicofuma/ticket/11226
[ticket/11226] filespec::move_file() should error correctly

* Nicofuma/ticket/11226:
  [ticket/11226] Explicity set file_moved to false
  [ticket/11226] Add tests
  [ticket/11226] Use $user->lang()
  [ticket/11226] filespec::move_file() should error correctly
2014-05-29 00:15:10 +02:00
n-aleha
031273de72 [ticket/11467] Add language variables for extension exception messages
Remove hard-coded messages and add language variables for extension
exception messages.

PHPBB3-11467
2014-05-29 01:07:44 +03:00
Joas Schilling
953ca27728 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (29 commits)
  [ticket/11366] Fix headings css in list page
  [ticket/11366] Add config value in schema_data.sql
  [ticket/11366] Fix HTML
  [ticket/11366] Exchange links and settings' form
  [ticket/11366] Remove the extra {S_FORM_TOKEN}
  [ticket/11366] Move the links to the top of the page
  [ticket/11366] Hide the version check settings by default
  [ticket/11366] Versions, options and actions heading should be centered
  [ticket/11366] Better language string for "recheck all"
  [ticket/11366] Move "recheck all" link
  [ticket/11366] Add $config['extension_force_unstable']
  [ticket/11366] Use force_cache on the list page
  [ticket/11366] Add recheck-all link
  [ticket/11366] Force the use of the cache on the list page
  [ticket/11366] Update FILE_NOT_FOUND language string
  [ticket/11366] Fix whitespaces
  [ticket/11366] Update FILE_NOT_FOUND language string
  [ticket/11366] Update var names
  [ticket/11366] Align language strings
  [ticket/11366] Fix detailed view
  ...
2014-05-28 23:46:15 +02:00
Tristan Darricau
b75fb96bab [ticket/11226] Explicity set file_moved to false
PHPBB3-11226
2014-05-28 22:34:10 +02:00
Tristan Darricau
8dc10d6971 [ticket/11366] Add $config['extension_force_unstable']
PHPBB3-11366
2014-05-28 22:19:03 +02:00
Tristan Darricau
f4d598559f [ticket/11366] Use force_cache on the list page
PHPBB3-11366
2014-05-28 22:19:02 +02:00
Tristan Darricau
13ecddf85b [ticket/11366] Add recheck-all link
PHPBB3-11366
2014-05-28 22:19:00 +02:00
Tristan Darricau
521fe2b8e2 [ticket/11366] Force the use of the cache on the list page
PHPBB3-11366
2014-05-28 22:18:54 +02:00
Tristan Darricau
64467f50db [ticket/11366] Update FILE_NOT_FOUND language string
PHPBB3-11366
2014-05-28 22:17:00 +02:00
Tristan Darricau
537d8b3c16 [ticket/11366] Fix whitespaces
PHPBB3-11366
2014-05-28 22:16:59 +02:00
Tristan Darricau
492c1952c1 [ticket/11366] Update var names
PHPBB3-11366
2014-05-28 22:16:55 +02:00
Tristan Darricau
bee6c6baea [ticket/11366] Fix detailed view
PHPBB3-11366
2014-05-28 22:16:51 +02:00
Tristan Darricau
29244c29d1 [ticket/11366] Remove the double spaces
PHPBB3-11366
2014-05-28 22:16:50 +02:00
Tristan Darricau
5e29ea77d8 [ticket/11366] Coding style
PHPBB3-11366
2014-05-28 22:16:48 +02:00
Nicofuma
f5da195a03 [ticket/11366] Adding a missing commit
PHPBB3-11366
2014-05-28 22:16:41 +02:00