summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
...
| * | Fix the removeMount for personal mountsRobin Appelman2014-06-062-1/+4
| * | 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
* | | Merge pull request #8159 from owncloud/mobile-sidebar-swipeThomas Müller2014-06-062-4/+2
|\ \ \ | |/ / |/| |
| * | Fixed viewer mode for sidebar swipeVincent Petry2014-06-061-1/+0
| * | slightly widen sidebar to 250px, works better with apps and on mobileJan-Christoph Borchardt2014-06-051-1/+1
| * | fix position of sidebar toggle, fix Files controls position problemsJan-Christoph Borchardt2014-06-051-2/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-0694-75/+330
| |/ |/|
* | 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
* | fix typo in var nameArthur Schiwon2014-06-051-1/+1
* | fix files multiselect bar now that the app list is goneJan-Christoph Borchardt2014-06-051-1/+1
* | Merge pull request #8894 from owncloud/public-share-js-overwriteThomas Müller2014-06-051-1/+3
|\ \
| * | Dont overwrite OCA.SharingRobin Appelman2014-06-051-1/+3
* | | Merge pull request #8890 from owncloud/cleanup-trashsizes-table-masterThomas Müller2014-06-052-33/+2
|\ \ \ | |/ / |/| |
| * | table files_trashsizes was still used in some locations -> removedThomas Müller2014-06-052-33/+2
* | | Merge pull request #8880 from owncloud/webdav-read-permissionsThomas Müller2014-06-051-0/+24
|\ \ \ | |_|/ |/| |
| * | Use the permissions exposed by ownCloud for webdav external storagesRobin Appelman2014-06-041-0/+24
* | | use slide toggle for files appBernhard Posselt2014-06-052-8/+2
* | | Merge pull request #8861 from owncloud/share-overview-linklistVincent Petry2014-06-054-2/+146
|\ \ \
| * | | Fixed wording to "Shared by link"Vincent Petry2014-06-042-3/+3
| * | | Added "Shared with link" sidebar section in files appVincent Petry2014-06-044-2/+146
* | | | Merge pull request #8620 from owncloud/design-navigation-twoThomas Müller2014-06-051-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | adjust controls bar position for removed nav barJan-Christoph Borchardt2014-06-041-1/+1
| | |/ | |/|
* | | Merge pull request #8862 from owncloud/share-overview-fixmimetypeicewind19912014-06-051-4/+2
|\ \ \
| * | | Fix mime type returning for "shared with others" filesVincent Petry2014-06-041-4/+2
| | |/ | |/|
* | | Merge pull request #8852 from owncloud/kill-permissions-masterThomas Müller2014-06-055-120/+3
|\ \ \
| * | | - drop permissions table and related codeThomas Müller2014-06-055-120/+3
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-05103-48/+204
* | | Merge pull request #8724 from owncloud/update-sabre-2.0Thomas Müller2014-06-046-14/+15
|\ \ \
| * | | Upgrade SabreDAV to 1.8.10Thomas Müller2014-06-046-14/+15
| |/ /
* | | Merge pull request #8824 from owncloud/mail_template_editing_in_webuiMorris Jobke2014-06-0410-0/+457
|\ \ \
| * | | fixes during testThomas Müller2014-06-043-21/+32
| * | | convert mail template editor to app framework for a restful apiJörn Friedrich Dreyer2014-06-0313-141/+204
| * | | minimal mail template editor for administrators, refs #7177Jörn Friedrich Dreyer2014-06-0210-0/+383
* | | | Merge pull request #8471 from owncloud/versioning_no_longer_track_the_sizeThomas Müller2014-06-046-117/+11
|\ \ \ \
| * | | | Fix merge conflictThomas Müller2014-06-031-31/+0
| * | | | use OC_DB::dropTable()Thomas Müller2014-06-022-4/+2
| * | | | return size '0' if the trashbin folder doesn't exists yetBjoern Schiessle2014-06-021-2/+2
| * | | | let file cache handle the versions sizeBjoern Schiessle2014-06-024-86/+13
| |/ / /
* | | | Merge pull request #8791 from owncloud/share-overview-sharewithstatusMorris Jobke2014-06-046-110/+640
|\ \ \ \
| * | | | Do not update action icon recipients for file listVincent Petry2014-06-041-0/+5
| * | | | Use recipient display names when updating shares in the UIVincent Petry2014-06-042-25/+33
| * | | | Multiple fixes to sharing overviewVincent Petry2014-06-033-36/+145
| * | | | Now using shareOwner for the share ownerVincent Petry2014-06-023-6/+12
| * | | | More unit tests and fixes for shareVincent Petry2014-06-022-125/+255
| * | | | Added unit tests for share.js and share iconVincent Petry2014-06-023-21/+229
| * | | | Update share action text to display owner/recipientsVincent Petry2014-06-023-99/+163
* | | | | remove obsolete position rule from files appJan-Christoph Borchardt2014-06-041-4/+0
| |_|/ / |/| | |
* | | | Merge pull request #8662 from owncloud/f-lockThomas Müller2014-06-044-13/+21
|\ \ \ \