Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #17932 from owncloud/fix_move_files | Thomas Müller | 2015-08-11 | 2 | -3/+10 |
|\ | | | | | make sure that hooks are emitted properly on file move operation | ||||
| * | make sure that we emit the hooks if a file gets moved from a subfolder to ↵ | Bjoern Schiessle | 2015-07-29 | 2 | -3/+10 |
| | | | | | | | | the root folder with the nodes API | ||||
* | | Merge pull request #18171 from ↵ | Morris Jobke | 2015-08-11 | 2 | -10/+54 |
|\ \ | | | | | | | | | | | | | owncloud/fix-language-of-files-activities-in-emails Correctly make use of the languageCode argument in the files activity extension | ||||
| * | | Correctly make use of the languageCode argument in the files activity extension | Joas Schilling | 2015-08-10 | 2 | -10/+54 |
| | | | |||||
* | | | Merge pull request #16528 from owncloud/activity-302-improve-settings | Joas Schilling | 2015-08-11 | 4 | -15/+36 |
|\ \ \ | | | | | | | | | Activity 302 improve settings | ||||
| * | | | Do not use magic strings when there are constants for it | Joas Schilling | 2015-07-22 | 2 | -11/+12 |
| | | | | |||||
| * | | | Make the favorite type stream only | Joas Schilling | 2015-07-22 | 1 | -2/+9 |
| | | | | |||||
| * | | | Allow types to be method specific | Joas Schilling | 2015-07-22 | 2 | -2/+15 |
| | | | | |||||
* | | | | Merge pull request #17830 from ↵ | Joas Schilling | 2015-08-11 | 2 | -92/+147 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | owncloud/issue-17825-dont-silently-ignore-invalid-consumers-extensions Throw a InvalidArgumentException when a consumer/extension is invalid | ||||
| * | | | | Throw a InvalidArgumentException when a consumer/extension is invalid | Joas Schilling | 2015-07-23 | 2 | -92/+147 |
| | | | | | |||||
* | | | | | Merge pull request #18096 from sualko/patch-1 | Morris Jobke | 2015-08-10 | 5 | -56/+57 |
|\ \ \ \ \ | | | | | | | | | | | | | add data: to allowed image domains | ||||
| * | | | | | add more unit tests for data: as allowed image domain | sualko | 2015-08-10 | 3 | -3/+3 |
| | | | | | | |||||
| * | | | | | add unit test for data: as allowed image domain | sualko | 2015-08-07 | 1 | -53/+53 |
| | | | | | | |||||
| * | | | | | add data: to allowed image domains | sualko | 2015-08-05 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #17919 from rullzer/php_supported_check | Thomas Müller | 2015-08-10 | 4 | -0/+85 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Display warning in security & setup warnings if php version is EOL | ||||
| * | | | | | | Display warning in security & setup warnings if php version is EOL | Roeland Jago Douma | 2015-07-29 | 4 | -0/+85 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #18109 from owncloud/fix-router-app-loaded | Thomas Müller | 2015-08-10 | 2 | -0/+16 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Only load app routes if the app has already been loaded | ||||
| * | | | | | | | Only load app routes if the app has already been loaded | Robin McCorkell | 2015-08-06 | 2 | -0/+16 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #18175 from owncloud/automatic-db-prefix-query-builder | Thomas Müller | 2015-08-10 | 12 | -92/+157 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Automatic db prefix query builder | ||||
| * | | | | | | | | Remove unnecessary DB prefixes from existing query builder usages | Joas Schilling | 2015-08-10 | 9 | -50/+50 |
| | | | | | | | | | |||||
| * | | | | | | | | Automatically prefix table names with *PREFIX* unless specified | Joas Schilling | 2015-08-10 | 3 | -42/+107 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #15093 from rullzer/capabilities_manager | Roeland Douma | 2015-08-10 | 25 | -92/+542 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Capabilities manager | ||||
| * | | | | | | | | | Use DI | Roeland Jago Douma | 2015-08-10 | 12 | -93/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Register OCP\Capability\IManager at DIContainer * Add register capabilities to appframework * Register capabilities in DI way * Make unit test pass again * Remove CapabiltiesManager from OCP | ||||
| * | | | | | | | | | Move core capabilities to new class | Roeland Jago Douma | 2015-08-10 | 3 | -11/+65 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Moved core apps to the capabilities manager | Roeland Jago Douma | 2015-08-10 | 15 | -86/+179 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Files * Files_Sharing * Files_Trashbin * Files_Versions | ||||
| * | | | | | | | | | Added Capabilities Manager | Roeland Jago Douma | 2015-08-10 | 8 | -2/+354 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This should allow the capabilities to be intergrated into the appframework * Unit tests * Throw exception if closure does not return ICapability instance | ||||
* | | | | | | | | | Merge pull request #18159 from owncloud/check-appid-folder-in-archive | Thomas Müller | 2015-08-10 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | Check if archive contains a directory named like appid | ||||
| * | | | | | | | | Update installer.php | michag86 | 2015-08-10 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Check if archive contains a directory named like appid | michag86 | 2015-08-10 | 1 | -0/+3 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #17656 from owncloud/files-rightsidebar | Vincent Petry | 2015-08-10 | 24 | -27/+1194 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Basic work for right sidebar | ||||
| * | | | | | | | Fix unit test for tipsy->tooltip change | Vincent Petry | 2015-08-10 | 1 | -3/+3 |
| | | | | | | | | |||||
| * | | | | | | | replace tipsy with tooltip | Hendrik Leppelsack | 2015-08-07 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | fix tipsy gravity after rebase | Arthur Schiwon | 2015-08-07 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | fix timezone issue with unittest | Arthur Schiwon | 2015-08-07 | 1 | -1/+2 |
| | | | | | | | | |||||
| * | | | | | | | Fix sidebar mtime display unit test | Vincent Petry | 2015-08-07 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Set momentJS locale to en during unit test runs | Vincent Petry | 2015-08-07 | 1 | -0/+2 |
| | | | | | | | | |||||
| * | | | | | | | Fix app-content scrollbar when app-sidebar is open | Vincent Petry | 2015-08-07 | 4 | -16/+10 |
| | | | | | | | | |||||
| * | | | | | | | fix position of elements in right sidebar | Jan-Christoph Borchardt | 2015-08-07 | 2 | -8/+18 |
| | | | | | | | | |||||
| * | | | | | | | fix right sidebar position and first style | Jan-Christoph Borchardt | 2015-08-07 | 2 | -10/+5 |
| | | | | | | | | |||||
| * | | | | | | | Use own tabs impl in files sidebar | Vincent Petry | 2015-08-07 | 5 | -26/+123 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also change style. | ||||
| * | | | | | | | fix show/hide app sidebar functions | Arthur Schiwon | 2015-08-07 | 1 | -2/+3 |
| | | | | | | | | |||||
| * | | | | | | | rename sidebar element and use css and js utility functions to core | Arthur Schiwon | 2015-08-07 | 7 | -56/+80 |
| | | | | | | | | |||||
| * | | | | | | | sidebar shall not overlap but shrink the contnet | Arthur Schiwon | 2015-08-07 | 3 | -6/+15 |
| | | | | | | | | |||||
| * | | | | | | | extend MainFileInfoDetailView JS tests | Arthur Schiwon | 2015-08-07 | 1 | -3/+29 |
| | | | | | | | | |||||
| * | | | | | | | Main view does not commands detail and tab views to render. Fixes JS tests. | Arthur Schiwon | 2015-08-07 | 3 | -5/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For a predictive behaviour we need to determine who is allowed to call render methods on the views. Either, the main view is solely allowed to call render and views do not do anything about output until then. Or, the main view relies on the concrete views to be ready when things are about to be shown. The latter approach has the advantage that concrete views know when they have to update themselves (e.g. new data arrives or information change), but the main view has now idea of the inner workings. | ||||
| * | | | | | | | More work on right sidebar unit tests | Vincent Petry | 2015-08-07 | 1 | -3/+3 |
| | | | | | | | | |||||
| * | | | | | | | Added unit tests for right sidebar | Vincent Petry | 2015-08-07 | 7 | -7/+222 |
| | | | | | | | | |||||
| * | | | | | | | Improve layout, fix mime icon | Vincent Petry | 2015-08-07 | 4 | -17/+35 |
| | | | | | | | | |||||
| * | | | | | | | Disable right sidebar in public file list page | Vincent Petry | 2015-08-07 | 2 | -6/+14 |
| | | | | | | | | |||||
| * | | | | | | | Right sidebar now has its own scrollbar | Vincent Petry | 2015-08-07 | 3 | -5/+25 |
| | | | | | | | |