summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9328 from owncloud/extstorage-annoyingwarningsVincent Petry2014-07-011-1/+1
|\
| * Fix warnings when personal is not setVincent Petry2014-07-011-1/+1
* | Merge pull request #9006 from owncloud/ldap_fix_bgjobblizzz2014-07-012-3/+8
|\ \
| * | also adapt result check from readAttributeArthur Schiwon2014-06-271-2/+1
| * | fix instantiation of Access classArthur Schiwon2014-06-271-1/+7
| * | specify no attribute for group exists check, as done with usersArthur Schiwon2014-06-271-1/+1
* | | add missing backticksJörn Friedrich Dreyer2014-07-011-7/+21
| |/ |/|
* | Merge pull request #9313 from owncloud/design-icon-cancelMorris Jobke2014-07-011-3/+2
|\ \
| * | change 'Cancel upload' text to x icon for more space in breadcrumbs barJan-Christoph Borchardt2014-06-301-3/+2
* | | Merge pull request #9300 from owncloud/extstorage-listfilterfixVincent Petry2014-07-012-16/+20
|\ \ \
| * | | Use filtered list for ext storage list mounts APIVincent Petry2014-06-302-16/+20
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-019-0/+24
* | | Merge pull request #9240 from owncloud/enc_check_if_file_existsBjörn Schießle2014-06-302-38/+237
|\ \ \
| * | | improved error messageBjoern Schiessle2014-06-301-7/+8
| * | | unit testsBjoern Schiessle2014-06-271-19/+192
| * | | check if file exists before deleting keys, and add debug output for everyBjoern Schiessle2014-06-271-15/+40
* | | | Merge pull request #9305 from owncloud/design-share-fixesJan-Christoph Borchardt2014-06-301-2/+4
|\ \ \ \
| * | | | remove obsolete CSS, fix visual bug in share dialog #9255Jan-Christoph Borchardt2014-06-301-2/+4
| | |/ / | |/| |
* | | | Merge pull request #9303 from owncloud/issue/8841Jörn Friedrich Dreyer2014-06-301-1/+1
|\ \ \ \
| * | | | Use attr() instead of data() so the item ids work as intendedJoas Schilling2014-06-301-1/+1
| |/ / /
* / / / no longer check if the external storage app is enabled, we use no the webdav ...Bjoern Schiessle2014-06-302-7/+3
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-3031-46/+163
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-29109-109/+131
* | | Merge pull request #9278 from owncloud/l10n-servershare-dialogVolkan Gezer2014-06-281-2/+2
|\ \ \
| * | | fix server share dialog titleVolkan Gezer2014-06-281-2/+2
* | | | Merge pull request #9265 from owncloud/fix-whitespaceMorris Jobke2014-06-282-5/+5
|\ \ \ \
| * | | | fix trailing whitespace noted by ScrutinizerJan-Christoph Borchardt2014-06-272-5/+5
| | |_|/ | |/| |
* | | | Merge pull request #9020 from owncloud/l10n-external-errors-fixMorris Jobke2014-06-282-5/+7
|\ \ \ \
| * | | | some strings to localize external mount api responses. fix #8094Volkan Gezer2014-06-122-5/+7
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-2814-20/+45
| |_|/ / |/| | |
* | | | normalize path before comparison to make sure that we always find the mount p...Bjoern Schiessle2014-06-271-1/+2
* | | | Merge pull request #9263 from owncloud/remote-share-updateicewind19912014-06-271-0/+19
|\ \ \ \ | |_|/ / |/| | |
| * | | Improve commentRobin Appelman2014-06-271-1/+2
| * | | Also check for updated permissions for webdav storagesRobin Appelman2014-06-271-0/+18
* | | | Merge pull request #9260 from owncloud/fileactions-lateregisterinpublicpageVincent Petry2014-06-272-1/+4
|\ \ \ \
| * | | | Remove missed console.log in file listVincent Petry2014-06-271-1/+0
| * | | | Allow late registration of file actions in public pageVincent Petry2014-06-271-0/+4
| |/ / /
* | | | Merge pull request #9256 from owncloud/design-mobile-sharedJan-Christoph Borchardt2014-06-271-0/+6
|\ \ \ \
| * | | | show share action of shared items darker to distinguish from non-shared, fix ...Jan-Christoph Borchardt2014-06-271-0/+6
| |/ / /
* | | | Merge pull request #9259 from owncloud/fix-rename-iconMorris Jobke2014-06-271-2/+2
|\ \ \ \
| * | | | fix rename icon, fix #9257Jan-Christoph Borchardt2014-06-271-2/+2
| |/ / /
* | | | Merge pull request #8383 from owncloud/object_storageVincent Petry2014-06-27139-8074/+117
|\ \ \ \ | |/ / / |/| | |
| * | | update files_external swift to php-opencloud v1.9.2Jörn Friedrich Dreyer2014-06-252-116/+113
| * | | remove rackspace opencloud libs from files_external 3rdpartyJörn Friedrich Dreyer2014-06-25136-7958/+0
| * | | Allow adding object stores with the files_external mount configRobin Appelman2014-06-241-0/+4
* | | | Merge pull request #9254 from owncloud/fileactions-deferredMorris Jobke2014-06-2711-6/+168
|\ \ \ \
| * | | | Sync file list with file actionsVincent Petry2014-06-2711-6/+168
* | | | | Merge pull request #9174 from owncloud/breadcrumbfixJan-Christoph Borchardt2014-06-275-128/+155
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Breadcrumb width calculation fixVincent Petry2014-06-275-128/+155
* | | | | Merge pull request #9247 from owncloud/move-webdav-class-to-core-masterThomas Müller2014-06-273-456/+0
|\ \ \ \ \