| Commit message (Expand) | Author | Age | Files | Lines |
* | drop unneeded var_dump - fixes #9997 | Morris Jobke | 2014-11-18 | 1 | -1/+0 |
* | Merge pull request #12261 from oparoz/patch-1 | Morris Jobke | 2014-11-18 | 1 | -1/+1 |
|\ |
|
| * | Replace deprecated switches | Olivier Paroz | 2014-11-18 | 1 | -1/+1 |
* | | Merge pull request #12224 from owncloud/fix_12211 | Björn Schießle | 2014-11-18 | 1 | -9/+22 |
|\ \
| |/
|/| |
|
| * | only users can have a display name different from the id | Bjoern Schiessle | 2014-11-18 | 1 | -1/+4 |
| * | make sure that we only find the shares from the correct share type if users a... | Bjoern Schiessle | 2014-11-18 | 1 | -2/+8 |
| * | make sure that we don't find the wrong shares if a user and a group have the ... | Bjoern Schiessle | 2014-11-18 | 1 | -6/+10 |
* | | Merge pull request #12259 from owncloud/app-enabled-plugin-appmanager | Lukas Reschke | 2014-11-18 | 1 | -4/+4 |
|\ \ |
|
| * | | Fix type hinting for app manager | Robin Appelman | 2014-11-18 | 1 | -4/+4 |
| |/ |
|
* | | Merge pull request #12242 from owncloud/fix-undefined-size | Lukas Reschke | 2014-11-18 | 1 | -1/+1 |
|\ \
| |/
|/| |
|
| * | Check if the size field is available | Lukas Reschke | 2014-11-17 | 1 | -1/+1 |
* | | Merge pull request #12237 from owncloud/fix-12236 | Morris Jobke | 2014-11-18 | 1 | -5/+5 |
|\ \ |
|
| * | | Make declaration compatible | Lukas Reschke | 2014-11-17 | 1 | -5/+5 |
| |/ |
|
* | | Merge pull request #9962 from owncloud/app-group-enable-remote | Lukas Reschke | 2014-11-18 | 1 | -0/+75 |
|\ \ |
|
| * | | Add sabredav plugin to check if a user has access to an app | Robin Appelman | 2014-11-17 | 1 | -0/+75 |
* | | | Merge pull request #11727 from owncloud/moveCallCheckRegisterToSomeWhereElse | Lukas Reschke | 2014-11-17 | 1 | -0/+3 |
|\ \ \
| |_|/
|/| | |
|
| * | | Move CSRF check | Lukas Reschke | 2014-11-17 | 1 | -0/+3 |
* | | | Merge pull request #11741 from owncloud/delete_all_children_preview_2 | Vincent Petry | 2014-11-17 | 1 | -16/+94 |
|\ \ \ |
|
| * | | | delete all children's previews when deleting a folder | Georg Ehrke | 2014-10-30 | 1 | -16/+94 |
* | | | | Merge pull request #12218 from owncloud/issue/10991-fixes | Morris Jobke | 2014-11-17 | 2 | -2/+12 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | Make it possible to cleanPath() absolute Windows paths | Joas Schilling | 2014-11-17 | 1 | -2/+11 |
| * | | | Correctly close handle of directory when listing certificates | Joas Schilling | 2014-11-17 | 1 | -0/+1 |
* | | | | Merge pull request #12031 from owncloud/app-manager | Robin Appelman | 2014-11-17 | 2 | -0/+153 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | Add \OC\App\Manager to handle enabling/disabling apps | Robin Appelman | 2014-11-10 | 2 | -0/+153 |
* | | | | Merge pull request #12186 from owncloud/fix-12182 | Morris Jobke | 2014-11-15 | 3 | -13/+31 |
|\ \ \ \ |
|
| * | | | | do not output DB information, and do not set header | Arthur Schiwon | 2014-11-14 | 3 | -7/+28 |
| * | | | | errors are already logged | Arthur Schiwon | 2014-11-14 | 2 | -3/+0 |
| * | | | | eliminate OC_Template::printErrorPage in database classes, fixes #12182 | Arthur Schiwon | 2014-11-14 | 3 | -7/+7 |
* | | | | | Check if app is enabled for user | Lukas Reschke | 2014-11-15 | 1 | -0/+11 |
|/ / / / |
|
* | | | | Merge pull request #11479 from owncloud/cleanup-group-admin-on-deleteGroup | Morris Jobke | 2014-11-13 | 1 | -0/+4 |
|\ \ \ \ |
|
| * | | | | cleanup group admin(s) on deleteGroup | michag86 | 2014-10-08 | 1 | -0/+4 |
* | | | | | Merge pull request #11956 from owncloud/remove-check-for-allow_user_to_change... | Morris Jobke | 2014-11-13 | 1 | -1/+1 |
|\ \ \ \ \ |
|
| * | | | | | removal of wrong/double implemented check | michag86 | 2014-11-13 | 1 | -1/+1 |
* | | | | | | Run preupdate before an update | Lukas Reschke | 2014-11-13 | 2 | -5/+17 |
|/ / / / / |
|
* | | | | | Merge pull request #12141 from owncloud/kill-dav-client | Morris Jobke | 2014-11-12 | 1 | -59/+0 |
|\ \ \ \ \ |
|
| * | | | | | OC_DAVClient is not longer used - no need to carry it around anymore | Thomas Müller | 2014-11-12 | 1 | -59/+0 |
* | | | | | | Merge pull request #12139 from owncloud/DoNotTouchMe | Thomas Müller | 2014-11-12 | 1 | -3/+3 |
|\ \ \ \ \ \ |
|
| * | | | | | | Try to read the file only instead of trying to touch | Lukas Reschke | 2014-11-12 | 1 | -3/+3 |
| |/ / / / / |
|
* | | | | | | Merge pull request #12128 from owncloud/drop-formfactor | Jan-Christoph Borchardt | 2014-11-12 | 6 | -109/+13 |
|\ \ \ \ \ \ |
|
| * | | | | | | Drop form_factor that is appended to JS, CSS and template filenames | Morris Jobke | 2014-11-12 | 6 | -109/+13 |
| |/ / / / / |
|
* / / / / / | Remove debug statement | Lukas Reschke | 2014-11-12 | 1 | -4/+0 |
|/ / / / / |
|
* | | | | | Merge pull request #12105 from owncloud/dav-fixcleanpath | Thomas Müller | 2014-11-12 | 1 | -0/+2 |
|\ \ \ \ \ |
|
| * | | | | | Fix root path handling for WebDAV ext storage | Vincent Petry | 2014-11-11 | 1 | -0/+2 |
| | |/ / /
| |/| | | |
|
* | | | | | Merge pull request #12107 from owncloud/dav-propfindmimetype | Thomas Müller | 2014-11-12 | 1 | -0/+4 |
|\ \ \ \ \ |
|
| * | | | | | Return real mime type on PROPFIND | Vincent Petry | 2014-11-11 | 1 | -0/+4 |
| |/ / / / |
|
* / / / / | Fix Pimple unset | Bernhard Posselt | 2014-11-11 | 1 | -1/+1 |
|/ / / / |
|
* | | | | Merge pull request #12072 from owncloud/sabre-convertstoragenotavailableexcep... | Vincent Petry | 2014-11-10 | 4 | -114/+156 |
|\ \ \ \ |
|
| * | | | | Convert StorageNotAvailableException to SabreDAV exception | Vincent Petry | 2014-11-10 | 4 | -114/+156 |
* | | | | | Merge pull request #12027 from owncloud/cleanup_exceptions | Vincent Petry | 2014-11-10 | 1 | -2/+2 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | clean up encryption exceptions | Bjoern Schiessle | 2014-11-07 | 1 | -2/+2 |