aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add a explicit interface for the home storageBjoern Schiessle2014-07-013-2/+6
* 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
* | | Merge pull request #9292 from owncloud/issue/9161Morris Jobke2014-07-011-2/+2
|\ \ \
| * | | Use get random bytes as uniqeid() is not unique in some casesJoas Schilling2014-06-301-2/+2
| |/ /
* | | Merge pull request #9307 from Gomez/masterSteffen Lindner2014-07-011-1/+1
|\ \ \
| * | | Fixes typo with sendmail detection - fixes #9203Steffen Lindner2014-06-301-1/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-0146-278/+427
* | | | 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-303-4/+7
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | make expiration message grey, less present in dropdownJan-Christoph Borchardt2014-06-301-1/+1
| * | | | fix expire message going out of box, fix #9280Jan-Christoph Borchardt2014-06-301-1/+2
| * | | | 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
| | |_|/ | |/| |
* | | | Merge pull request #9301 from owncloud/dont_check_external_stoage_appBjörn Schießle2014-06-302-7/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | no longer check if the external storage app is enabled, we use no the webdav ...Bjoern Schiessle2014-06-302-7/+3
|/ / /
* | | Merge pull request #9207 from owncloud/prevent-default-for-mail-testJoas Schilling2014-06-302-4/+4
|\ \ \ | |/ / |/| |
| * | Fix test mail behaviourMorris Jobke2014-06-252-4/+4
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-30115-956/+1498
* | | Merge pull request #9266 from owncloud/fix_objectstore_etag_updateThomas Müller2014-06-291-1/+1
|\ \ \
| * | | always regenerate etag when writing back file to objectstoreJörn Friedrich Dreyer2014-06-271-1/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-29465-11164/+33397
* | | | Merge pull request #9261 from owncloud/shorten_userid_columnsMorris Jobke2014-06-282-3/+3
|\ \ \ \
| * | | | trigger db updateMorris Jobke2014-06-281-1/+1
| * | | | shorten userid columns to 64 chars, ref #9186Jörn Friedrich Dreyer2014-06-271-2/+2
* | | | | Merge pull request #8777 from owncloud/l10n-utils-and-defaultsMorris Jobke2014-06-283-60/+72
|\ \ \ \ \
| * | | | | more strings to translate in utils also some fixes in defaultsVolkan Gezer2014-06-283-60/+72
* | | | | | 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-28137-850/+926
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #9264 from owncloud/share-linkshareusefilesourceBjörn Schießle2014-06-272-2/+148
|\ \ \ \ \ \ \
| * | | | | | | Unit tests for share dropdown with nested link shareVincent Petry2014-06-272-1/+147
| * | | | | | | Use file_source to find matching share for nested link sharesVincent Petry2014-06-271-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | 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-272-15/+73
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Improve commentRobin Appelman2014-06-271-1/+2
| * | | | | | Fix parsing of webdav permissionsRobin Appelman2014-06-271-1/+2
| * | | | | | Also check for updated permissions for webdav storagesRobin Appelman2014-06-272-17/+54
| * | | | | | Use the etag to check for updates in webdav storages where availableRobin Appelman2014-06-271-0/+19
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #9260 from owncloud/fileactions-lateregisterinpublicpageVincent Petry2014-06-272-1/+4
|\ \ \ \ \ \