Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-19 | 1 | -0/+1 |
| | |||||
* | Merge pull request #6295 from owncloud/files-fromlinkerrormessagefixes | Thomas Müller | 2013-12-18 | 2 | -9/+26 |
|\ | | | | | Fixed download file from URL error messages | ||||
| * | Fixed download file from URL error messages | Vincent Petry | 2013-12-12 | 2 | -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_cleanup | Thomas Müller | 2013-12-18 | 2 | -47/+1 |
|\ \ | | | | | | | remove duplicated code | ||||
| * | | remove unused method tail() | Bjoern Schiessle | 2013-12-17 | 1 | -43/+0 |
| | | | |||||
| * | | remove duplicated code | Bjoern Schiessle | 2013-12-17 | 1 | -4/+1 |
| | | | |||||
* | | | Merge pull request #6366 from owncloud/fix-6335 | Jan-Christoph Borchardt | 2013-12-17 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Bump the footer down 20px to avoid overlap. | ||||
| * | | | Bump the footer down 20px to avoid overlap. | ringmaster | 2013-12-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Fixes #6335. | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-17 | 3 | -2/+11 |
| | | | | |||||
* | | | | Merge pull request #6474 from owncloud/enc_detect_encrypted_files | Björn Schießle | 2013-12-17 | 1 | -10/+12 |
|\ \ \ \ | | | | | | | | | | | reliable detect encrypted files | ||||
| * | | | | reliable detect encrypted files | Bjoern Schiessle | 2013-12-17 | 1 | -10/+12 |
| | |/ / | |/| | | |||||
* | | | | clarifying license | Frank Karlitschek | 2013-12-17 | 1 | -0/+4 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-17 | 5 | -1/+18 |
|/ / / | |||||
* | | | Merge pull request #6386 from ↵ | Frank Karlitschek | 2013-12-17 | 2 | -11/+9 |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/trash_always_show_deleted_files_breadcrumb always show 'Deleted Files' breadcrumb | ||||
| * | | | always show home breadcrumb in files view | Bjoern Schiessle | 2013-12-16 | 1 | -7/+5 |
| | | | | |||||
| * | | | always show 'Deleted Files' breadcrumb | Bjoern Schiessle | 2013-12-13 | 1 | -4/+4 |
| | | | | |||||
* | | | | Merge pull request #6183 from owncloud/enc_tests | Björn Schießle | 2013-12-16 | 3 | -20/+92 |
|\ \ \ \ | | | | | | | | | | | enable more encryption tests | ||||
| * | | | | update file cache for target file | Bjoern Schiessle | 2013-12-16 | 1 | -0/+9 |
| | | | | | |||||
| * | | | | only remove encryption keys if a real file gets deleted, skip this method if ↵ | Bjoern Schiessle | 2013-12-16 | 2 | -9/+67 |
| | | | | | | | | | | | | | | | | | | | | a file outside of /data/user/files was deleted | ||||
| * | | | | call set password hook because it doesn't get triggered during test ↵ | Bjoern Schiessle | 2013-12-16 | 1 | -3/+12 |
| | | | | | | | | | | | | | | | | | | | | execution and fix paths | ||||
| * | | | | enable more tests | Bjoern Schiessle | 2013-12-04 | 1 | -8/+4 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-13 | 5 | -4/+40 |
| | | | | | |||||
* | | | | | Merge pull request #6321 from sevoku/master | Vincent Petry | 2013-12-13 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | fix smbclient directory listing parser | ||||
| * | | | | | fix smbclient directory listing parser | Vsevolod Kukol | 2013-12-11 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | LDAP: fix method behind save button on advancend and expert tabs, fixes at ↵ | Arthur Schiwon | 2013-12-13 | 1 | -5/+6 |
| |_|/ / |/| | | | | | | | | | | | least Home Folder setinng | ||||
* | | | | toggle select all checkbox | Bjoern Schiessle | 2013-12-12 | 1 | -0/+8 |
| |_|/ |/| | | |||||
* | | | LDAP: the browser shall not autofill userdn and password, usually login ↵ | Arthur Schiwon | 2013-12-12 | 1 | -2/+2 |
| | | | | | | | | | | | | credentials are inserted. fixes #6283 | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-11 | 4 | -1/+21 |
| | | | |||||
* | | | Merge pull request #6270 from owncloud/sharing-mixeduppermissionsfix | Vincent Petry | 2013-12-11 | 2 | -1/+124 |
|\ \ \ | |/ / |/| | | Fixed sharing results to include the correct permissions | ||||
| * | | Added unit test for sharing permissions | Vincent Petry | 2013-12-10 | 1 | -0/+110 |
| | | | |||||
| * | | Fixed sharing results to include the correct permissions | Vincent Petry | 2013-12-09 | 1 | -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 transifex | Jenkins for ownCloud | 2013-12-09 | 4 | -1/+37 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-07 | 65 | -81/+62 |
| | | |||||
* | | Merge pull request #6220 from owncloud/debug_oracle_errors | Björn Schießle | 2013-12-06 | 1 | -18/+21 |
|\ \ | | | | | | | cherry-picks from #5884, just for debugging purpose | ||||
| * | | Don't try to encrypt a file when the temp file isn't created | Bart Visscher | 2013-12-06 | 1 | -18/+21 |
| | | | |||||
* | | | Merge pull request #6218 from leo-b/fix_ldap_setOption_returncode | blizzz | 2013-12-06 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | correctly propagate the return value of ldap_set_option | ||||
| * | | | correctly propagate the return value of ldap_set_option | root | 2013-12-06 | 1 | -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 Schiessle | 2013-12-06 | 1 | -1/+1 |
| |/ / |/| | | | | | | | | gets re-calculated if encryption was enabled again | ||||
* | | | Merge pull request #6206 from owncloud/sharing_etag_propagation_on_expire | Björn Schießle | 2013-12-06 | 1 | -2/+6 |
|\ \ \ | | | | | | | | | Sharing etag propagation on expire | ||||
| * | | | get owner from share item, if we expire a share while the user updates his ↵ | Bjoern Schiessle | 2013-12-05 | 1 | -2/+6 |
| | |/ | |/| | | | | | | | /Shared folder than the owner is different from the currently logged in user | ||||
* | | | it is not possible to unshare files | Bjoern Schiessle | 2013-12-06 | 1 | -14/+5 |
| | | | |||||
* | | | fix typo | Bjoern Schiessle | 2013-12-06 | 1 | -1/+1 |
| | | | |||||
* | | | only create new key on password change if a recovery key exists or if the ↵ | Bjoern Schiessle | 2013-12-06 | 1 | -23/+28 |
| | | | | | | | | | | | | user don't have any private/public keys | ||||
* | | | show change password form if key couldn't be decrypted | Bjoern Schiessle | 2013-12-06 | 1 | -1/+1 |
| | | | |||||
* | | | add method to check if users private/public key exists | Bjoern Schiessle | 2013-12-06 | 1 | -4/+13 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-05 | 1 | -0/+3 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-04 | 5 | -0/+8 |
| | | | |||||
* | | | LDAP Wizard: don't generate filter when not allowed | Arthur Schiwon | 2013-12-04 | 1 | -1/+3 |
| | | | |||||
* | | | some equals are more equal than other equals | Arthur Schiwon | 2013-12-04 | 1 | -2/+2 |
| | | | |||||
* | | | LDAP Wizard: return correct var | Arthur Schiwon | 2013-12-04 | 1 | -1/+1 |
| | | |