Skip to content

[Stable10] Backport 796 #894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LukasReschke merged 45 commits into from
Aug 17, 2016
Merged

[Stable10] Backport 796 #894

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
d016890
Initial work on Apps page split:
blizzz Aug 8, 2016
9e39c41
fix duplicated db index name
blizzz Aug 9, 2016
bbb086f
remove mistakenly added file
blizzz Aug 9, 2016
a548902
Fallback for legacy settings. They are placed into Additional Settings
blizzz Aug 9, 2016
2e9794f
more admin page splitup improvements
blizzz Aug 10, 2016
d7bbebb
fix registration of admin settings and section on app install
blizzz Aug 10, 2016
c956901
fixes, improvements, and another app:
blizzz Aug 10, 2016
e37db63
rename IAdmin to ISettings, the interface is not bound to a specific …
blizzz Aug 11, 2016
94c3d61
adjust federatedfilesharing
blizzz Aug 11, 2016
09573db
adjust files_external
blizzz Aug 11, 2016
10249f4
make sure shipped apps also setup their admin settings on a fresh ins…
blizzz Aug 11, 2016
6a35c7d
superfluous
blizzz Aug 11, 2016
3ae0a38
adjust Theming app
blizzz Aug 11, 2016
ea419a2
adjust files app, and integrate files_external into that section
blizzz Aug 11, 2016
0c86f69
superfluous
blizzz Aug 11, 2016
63efdb3
adjust federation app
blizzz Aug 11, 2016
4077856
adjust systemtags app
blizzz Aug 11, 2016
c4b35dc
Add missing since annotations
LukasReschke Aug 11, 2016
df3b708
Add since tags to class
LukasReschke Aug 11, 2016
3ad89a7
Resolve conflict
LukasReschke Aug 11, 2016
a5ba5bb
register app autoload instead of loading apps
blizzz Aug 12, 2016
4132319
rename "Tenmplate" to "ThemingDefaults" to make the auto loader happy"
schiessle Aug 12, 2016
cd08307
rename remaining occurences of OCA/Theming/Template
blizzz Aug 12, 2016
6fa34e3
added some missed diagnosis output
blizzz Aug 12, 2016
fe29483
fix theming tests
blizzz Aug 12, 2016
ef4452e
mark current section
blizzz Aug 12, 2016
d056f57
change casing in section display names
blizzz Aug 12, 2016
c93453e
make updatenotification settings appear as if it is part of the versi…
blizzz Aug 12, 2016
0c904c8
move systemstags to sharign section, drop collaboration section
blizzz Aug 12, 2016
2d66b16
change federatedfilesharing css class to followupsection to reduce wh…
blizzz Aug 12, 2016
9111b52
move mail settings and file handling to additional ones, thus files_e…
blizzz Aug 12, 2016
57295ee
simplify encryption manager fetching in DIContainer
blizzz Aug 12, 2016
1ebbcdc
satisfy dependencies for files_external
blizzz Aug 15, 2016
687f5be
Add unit tests
LukasReschke Aug 15, 2016
436e6c1
Use MockBuilder instead of createMock
LukasReschke Aug 15, 2016
1e62bd3
attempt to remove section and settings entries when an app got disabled
blizzz Aug 15, 2016
6e37a00
check registered sections and settings after an app got updated to ga…
blizzz Aug 15, 2016
eed879a
adopt to Controller constructor changes
blizzz Aug 15, 2016
e611662
final db indexes
blizzz Aug 16, 2016
4d505b7
fix missing parameters in sharing settings page
blizzz Aug 16, 2016
8ef08e4
add missing encryption modules to settings
blizzz Aug 16, 2016
c5fdee2
for new we cannot have nested settings, default module is only append…
blizzz Aug 16, 2016
f4aa676
adjust tests to latest changes
blizzz Aug 16, 2016
6ed721d
Rename class reference
LukasReschke Aug 16, 2016
1f177aa
Use getMockBuilder instead of createMock
LukasReschke Aug 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename class reference 
File has been renamed only on master
  • Loading branch information
@LukasReschke
LukasReschke committed Aug 16, 2016
commit 6ed721dde3fa4ca0ec07c623d547b00b0c2ecadd
2 changes: 1 addition & 1 deletion lib/private/Settings/Admin/Logging.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

namespace OC\Settings\Admin;

use OC\Log\File as LogFile;
use OC\Log\Owncloud as LogFile;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IConfig;
use OCP\Settings\ISettings;
Expand Down
2 changes: 1 addition & 1 deletion tests/lib/Settings/Admin/LoggingTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IConfig;
use Test\TestCase;
use OC\Log\File as LogFile;
use OC\Log\Owncloud as LogFile;

class LoggingTest extends TestCase {
/** @var Logging */
Expand Down