summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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
|\ | | | | [encryption] check if file still exists before removing encryption keys
| * 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
| | | | | | | | delete operation
* | Merge pull request #9305 from owncloud/design-share-fixesJan-Christoph Borchardt2014-06-303-4/+7
|\ \ | | | | | | Design share fixes
| * | 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
|\ \ \ | | | | | | | | Do not strict compare item source id so the dropdown is closed correctly
| * | | Use attr() instead of data() so the item ids work as intendedJoas Schilling2014-06-301-1/+1
| | | | | | | | | | | | | | | | Fix #8841
* | | | Merge pull request #9301 from owncloud/dont_check_external_stoage_appBjörn Schießle2014-06-302-7/+3
|\ \ \ \ | |_|/ / |/| | | [server2server-sharing] no longer check if the external storage app is enabled
| * | | no longer check if the external storage app is enabled, we use no the webdav ↵Bjoern Schiessle2014-06-302-7/+3
|/ / / | | | | | | | | | implementation from core
* | | Merge pull request #9207 from owncloud/prevent-default-for-mail-testJoas Schilling2014-06-302-4/+4
|\ \ \ | |/ / |/| | Fix test mail behaviour
| * | Fix test mail behaviourMorris Jobke2014-06-252-4/+4
| | | | | | | | | | | | | | | | | | | | | * ref #8854 * prevent default of "send test mail" button * drop unused form serialization * use display name of user for test mail
* | | [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 objectstore
| * | | 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
|\ \ \ \ | | | | | | | | | | shorten userid columns to 64 chars, ref #9186
| * | | | 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 defaults
| * | | | | 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 title
| * | | | | 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 Scrutinizer
| * | | | | | 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 #8094
| * | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use file_source to find matching share for nested link shares
| * | | | | | | 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 ↵Bjoern Schiessle2014-06-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | point
* | | | | | | Merge pull request #9263 from owncloud/remote-share-updateicewind19912014-06-272-15/+73
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Better detecting of remote changes for external shares
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow late registration of file actions in public page
| * | | | | | 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,...
| * | | | | | show share action of shared items darker to distinguish from non-shared, fix ↵Jan-Christoph Borchardt2014-06-271-0/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | #8898
* | | | | | Merge pull request #9259 from owncloud/fix-rename-iconMorris Jobke2014-06-271-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | fix rename icon, fix #9257
| * | | | | fix rename icon, fix #9257Jan-Christoph Borchardt2014-06-271-2/+2
| |/ / / /
* | | | | Merge pull request #8383 from owncloud/object_storageVincent Petry2014-06-27151-8096/+1100
|\ \ \ \ \ | |/ / / / |/| | | | Object storage
| * | | | 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
| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 17:37:13 +0000