summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* hides table header while users load.raghunayyar2014-07-011-0/+2
* 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
|\ \ \ \ \
| * | | | | 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-27151-8096/+1100
|\ \ \ \ | |/ / / |/| | |
| * | | use normalize path to convert '.' to '' in objectstorestorageJörn Friedrich Dreyer2014-06-271-9/+11
| * | | update hasUpdated description, overwrtie testStat for objectstore testJörn Friedrich Dreyer2014-06-273-3/+31
| * | | fix objectstore test executionJörn Friedrich Dreyer2014-06-261-1/+1
| * | | 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
| * | | delete object without downloading it firstJörn Friedrich Dreyer2014-06-251-2/+2