summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-12-191-0/+1
|
* Merge pull request #6295 from owncloud/files-fromlinkerrormessagefixesThomas Müller2013-12-182-9/+26
|\ | | | | Fixed download file from URL error messages
| * Fixed download file from URL error messagesVincent Petry2013-12-122-9/+26
| | | | | | | | | | | | | | | | - L10N now converted to string to make them work with json_encode - Added specific error message when server doesn't allow fopen on URLs - Fixed client side to correctly show error message in a notification - Added OCP\JSON::encode() method to encode JSON with support for the OC_L10N_String values
* | Merge pull request #6469 from owncloud/enc_cleanupThomas Müller2013-12-182-47/+1
|\ \ | | | | | | remove duplicated code
| * | remove unused method tail()Bjoern Schiessle2013-12-171-43/+0
| | |
| * | remove duplicated codeBjoern Schiessle2013-12-171-4/+1
| | |
* | | Merge pull request #6366 from owncloud/fix-6335Jan-Christoph Borchardt2013-12-171-1/+1
|\ \ \ | | | | | | | | Bump the footer down 20px to avoid overlap.
| * | | Bump the footer down 20px to avoid overlap.ringmaster2013-12-121-1/+1
| | | | | | | | | | | | | | | | Fixes #6335.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-173-2/+11
| | | |
* | | | Merge pull request #6474 from owncloud/enc_detect_encrypted_filesBjörn Schießle2013-12-171-10/+12
|\ \ \ \ | | | | | | | | | | reliable detect encrypted files
| * | | | reliable detect encrypted filesBjoern Schiessle2013-12-171-10/+12
| | |/ / | |/| |
* | | | clarifying licenseFrank Karlitschek2013-12-171-0/+4
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-175-1/+18
|/ / /
* | | Merge pull request #6386 from ↵Frank Karlitschek2013-12-172-11/+9
|\ \ \ | | | | | | | | | | | | | | | | owncloud/trash_always_show_deleted_files_breadcrumb always show 'Deleted Files' breadcrumb
| * | | always show home breadcrumb in files viewBjoern Schiessle2013-12-161-7/+5
| | | |
| * | | always show 'Deleted Files' breadcrumbBjoern Schiessle2013-12-131-4/+4
| | | |
* | | | Merge pull request #6183 from owncloud/enc_testsBjörn Schießle2013-12-163-20/+92
|\ \ \ \ | | | | | | | | | | enable more encryption tests
| * | | | update file cache for target fileBjoern Schiessle2013-12-161-0/+9
| | | | |
| * | | | only remove encryption keys if a real file gets deleted, skip this method if ↵Bjoern Schiessle2013-12-162-9/+67
| | | | | | | | | | | | | | | | | | | | a file outside of /data/user/files was deleted
| * | | | call set password hook because it doesn't get triggered during test ↵Bjoern Schiessle2013-12-161-3/+12
| | | | | | | | | | | | | | | | | | | | execution and fix paths
| * | | | enable more testsBjoern Schiessle2013-12-041-8/+4
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-135-4/+40
| | | | |
* | | | | Merge pull request #6321 from sevoku/masterVincent Petry2013-12-131-1/+1
|\ \ \ \ \ | | | | | | | | | | | | fix smbclient directory listing parser
| * | | | | fix smbclient directory listing parserVsevolod Kukol2013-12-111-1/+1
| | |_|_|/ | |/| | |
* | | | | LDAP: fix method behind save button on advancend and expert tabs, fixes at ↵Arthur Schiwon2013-12-131-5/+6
| |_|/ / |/| | | | | | | | | | | least Home Folder setinng
* | | | toggle select all checkboxBjoern Schiessle2013-12-121-0/+8
| |_|/ |/| |
* | | LDAP: the browser shall not autofill userdn and password, usually login ↵Arthur Schiwon2013-12-121-2/+2
| | | | | | | | | | | | credentials are inserted. fixes #6283
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-114-1/+21
| | |
* | | Merge pull request #6270 from owncloud/sharing-mixeduppermissionsfixVincent Petry2013-12-112-1/+124
|\ \ \ | |/ / |/| | Fixed sharing results to include the correct permissions
| * | Added unit test for sharing permissionsVincent Petry2013-12-101-0/+110
| | |
| * | Fixed sharing results to include the correct permissionsVincent Petry2013-12-091-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing $includeCollections would return more than one entry which gives mixed up file permissions. Added a method getFile() that doesn't set $includeCollections to make sure we only get one result which is the file itself. Fixes #6265
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-094-1/+37
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2013-12-0765-81/+62
| |
* | Merge pull request #6220 from owncloud/debug_oracle_errorsBjörn Schießle2013-12-061-18/+21
|\ \ | | | | | | cherry-picks from #5884, just for debugging purpose
| * | Don't try to encrypt a file when the temp file isn't createdBart Visscher2013-12-061-18/+21
| | |
* | | Merge pull request #6218 from leo-b/fix_ldap_setOption_returncodeblizzz2013-12-061-1/+1
|\ \ \ | | | | | | | | correctly propagate the return value of ldap_set_option
| * | | correctly propagate the return value of ldap_set_optionroot2013-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | otherwise LDAP_OPT_REFERRALS won't be set to 0 and in turn active directory paging will stop working (Operations error on ldap_control_paged_result_response)
* | | | set unencrypted_size to 0 after decryption... so that the unencrypted_size ↵Bjoern Schiessle2013-12-061-1/+1
| |/ / |/| | | | | | | | gets re-calculated if encryption was enabled again
* | | Merge pull request #6206 from owncloud/sharing_etag_propagation_on_expireBjörn Schießle2013-12-061-2/+6
|\ \ \ | | | | | | | | Sharing etag propagation on expire
| * | | get owner from share item, if we expire a share while the user updates his ↵Bjoern Schiessle2013-12-051-2/+6
| | |/ | |/| | | | | | | /Shared folder than the owner is different from the currently logged in user
* | | it is not possible to unshare filesBjoern Schiessle2013-12-061-14/+5
| | |
* | | fix typoBjoern Schiessle2013-12-061-1/+1
| | |
* | | only create new key on password change if a recovery key exists or if the ↵Bjoern Schiessle2013-12-061-23/+28
| | | | | | | | | | | | user don't have any private/public keys
* | | show change password form if key couldn't be decryptedBjoern Schiessle2013-12-061-1/+1
| | |
* | | add method to check if users private/public key existsBjoern Schiessle2013-12-061-4/+13
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-051-0/+3
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-045-0/+8
| | |
* | | LDAP Wizard: don't generate filter when not allowedArthur Schiwon2013-12-041-1/+3
| | |
* | | some equals are more equal than other equalsArthur Schiwon2013-12-041-2/+2
| | |
* | | LDAP Wizard: return correct varArthur Schiwon2013-12-041-1/+1
| | |