summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Fix folder name for storage rootRobin Appelman2014-06-062-2/+2
| * | | | | don't allow to share single files with delete permissions, user should only b...Bjoern Schiessle2014-06-068-130/+413
| * | | | | Fix the removeMount for personal mountsRobin Appelman2014-06-062-1/+4
| * | | | | Add the removing logic for mountsRobin Appelman2014-06-061-5/+9
| * | | | | Move shared mount moving from the storage to the mountRobin Appelman2014-06-062-122/+157
| * | | | | Make personal external mount points (re)movable from the files appRobin Appelman2014-06-062-1/+72
| * | | | | Don't do rename hooks for cache when moving the mountpointRobin Appelman2014-06-061-0/+4
| * | | | | Add a system for (re)movable mount pointsRobin Appelman2014-06-064-28/+64
* | | | | | Merge pull request #8900 from guruz/webdav_permission_moveable_renameableVincent Petry2014-06-061-1/+1
|\ \ \ \ \ \
| * | | | | | WebDAV Permissions: Distinguish between renameing and movingMarkus Goetz2014-06-051-1/+1
* | | | | | | Merge pull request #8905 from owncloud/update-cli-skipcheckmigrateVincent Petry2014-06-062-20/+93
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Added CLI arguments for upgrade simulation stepsVincent Petry2014-06-062-20/+93
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #8159 from owncloud/mobile-sidebar-swipeThomas Müller2014-06-0614-20/+778
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fixed viewer mode for sidebar swipeVincent Petry2014-06-062-2/+8
| * | | | | Fixed Snap mockVincent Petry2014-06-061-5/+10
| * | | | | Added debounce on resizeVincent Petry2014-06-061-1/+1
| * | | | | prevent scrollbar when sidebar is openJan-Christoph Borchardt2014-06-061-1/+6
| * | | | | Disable snapper on bigger screens and on public/login pageMorris Jobke2014-06-061-33/+52
| * | | | | slightly widen sidebar to 250px, works better with apps and on mobileJan-Christoph Borchardt2014-06-055-6/+6
| * | | | | remove prevention of scrollbar, breaks some pagesJan-Christoph Borchardt2014-06-051-3/+0
| * | | | | prevent horizontal scrollbarJan-Christoph Borchardt2014-06-051-0/+4
| * | | | | fix position of sidebar toggle, fix Files controls position problemsJan-Christoph Borchardt2014-06-052-5/+13
| * | | | | close sidebar when switching navigation entry, except on add or change settingsJan-Christoph Borchardt2014-06-052-0/+23
| * | | | | add app sidebar toggle and swipe on mobileJan-Christoph Borchardt2014-06-052-0/+81
| * | | | | adjust CSS to styleguide, remove left padding, prevent user-selectionJan-Christoph Borchardt2014-06-053-8/+33
| * | | | | add snap.js scriptJan-Christoph Borchardt2014-06-052-0/+569
| * | | | | add menu iconJan-Christoph Borchardt2014-06-053-0/+16
* | | | | | Merge pull request #8783 from owncloud/remove-serializersThomas Müller2014-06-063-68/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | remove controller serializersBernhard Posselt2014-06-053-68/+4
* | | | | | Merge pull request #8909 from owncloud/fix-temporary-storage-rmdirr-masterThomas Müller2014-06-062-1/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | use system function to recursive remove the directory used by temporary storageThomas Müller2014-06-062-1/+7
| | |_|_|/ | |/| | |
* | | | | Merge pull request #8877 from owncloud/getpath-storage-checkThomas Müller2014-06-061-8/+12
|\ \ \ \ \
| * | | | | Update PHPDocThomas Müller2014-06-061-1/+1
| * | | | | Verify that we have a valid storage in View->getPathRobin Appelman2014-06-051-7/+11
* | | | | | Merge pull request #8911 from owncloud/common-langJan-Christoph Borchardt2014-06-061-1/+1
|\ \ \ \ \ \
| * | | | | | Add Turkish to common languagesVolkan Gezer2014-06-051-1/+1
| | |/ / / / | |/| | | |
* / | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-06823-11672/+11384
|/ / / / /
* | | | | Merge pull request #8483 from owncloud/encryption_use_oc_preferencesThomas Müller2014-06-0514-183/+318
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | adding unit tests for encryption data migrationThomas Müller2014-06-054-14/+224
| * | | | use oc_preferences instead of oc_encryption to store encyption settingsBjoern Schiessle2014-06-059-184/+69
| * | | | allow to set pre-condition for setValueBjoern Schiessle2014-06-053-31/+71
* | | | | Merge pull request #8865 from owncloud/improve_share_settingsVincent Petry2014-06-057-28/+38
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | unify share settingsBjoern Schiessle2014-06-056-18/+32
| * | | | This settings doesn't belong togetherBjoern Schiessle2014-06-052-11/+10
| * | | | improve share settings workingBjoern Schiessle2014-06-051-5/+2
| |/ / /
* | | | Merge pull request #8893 from owncloud/feature/get-users-by-preferenceThomas Müller2014-06-052-0/+48
|\ \ \ \
| * | | | Sort the result before comparingJoas Schilling2014-06-051-1/+3
| * | | | Hack around oracle for CLOB fieldsJoas Schilling2014-06-051-1/+9
| * | | | Add method to get users by their preferenceJoas Schilling2014-06-052-0/+38
* | | | | Merge pull request #8902 from owncloud/fix_ldap_typo_2Thomas Müller2014-06-051-1/+1
|\ \ \ \ \