aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1534 from owncloud/files_l10nThomas Müller2013-02-083-6/+10
|\ | | | | Add translation support back to move/rename
| * Files: explicitly defineRobin Appelman2013-02-082-0/+4
| |
| * Files: rename 'space' to 'storage' in upload.phpRobin Appelman2013-02-071-1/+1
| |
| * Files: add translation support back to move/renameRobin Appelman2013-02-072-5/+5
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-02-0862-42/+101
| |
* | Merge pull request #1507 from tripflex/masterBart Visscher2013-02-071-1/+1
|\ \ | | | | | | | | | | | | remove float left from actions div class fixes #1504
| * | Remove left float from actions div classMyles McNamara2013-02-061-1/+1
| | |
* | | Merge pull request #1526 from owncloud/l10n-support-masterLukas Reschke2013-02-075-11/+22
|\ \ \ | |_|/ |/| | L10n support master
| * | l10n support enhanced in files_versionsThomas Mueller2013-02-071-1/+1
| | |
| * | l10n support enhanced in files_trashbinThomas Mueller2013-02-072-3/+6
| | |
| * | l10n support enhanced in files_versionThomas Mueller2013-02-073-8/+16
| | |
* | | Merge pull request #1524 from owncloud/fix_ldaps_tls_settingblizzz2013-02-072-4/+16
|\ \ \ | |/ / |/| | LDAP: don't try to put TLS on top of already secure connection (will fail).
| * | TypoArthur Schiwon2013-02-071-1/+1
| | |
| * | LDAP: better detect timeouts. do not try to reconnect. do not try to bind ↵Arthur Schiwon2013-02-061-3/+10
| | | | | | | | | | | | when connection failed. makes ownCloud more responsive, esp. with multiple server connections configured
| * | LDAP: when ldaps and tls are configured, disable the latter one - they do ↵Arthur Schiwon2013-02-061-0/+5
| | | | | | | | | | | | not work together. ldaps already creates a secure connection.
| * | LDAP: info string improvedArthur Schiwon2013-02-061-1/+1
| | |
* | | Merge pull request #1518 from schiesbn/trash_layout_fixblizzz2013-02-071-1/+1
|\ \ \ | | | | | | | | add class hascontrols to trash bin file table
| * | | add class hascontrols to trash bin file tableBjörn Schießle2013-02-071-1/+1
| | | |
* | | | remove debug outputBjörn Schießle2013-02-071-1/+0
| | | |
* | | | rename OCA_Trash to OCA\Files_TrashbinBjörn Schießle2013-02-075-7/+7
| | | |
* | | | OCA_Versions is now known as OCA\Files_VersionsBjörn Schießle2013-02-071-1/+1
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-0711-3/+47
| | |
* | | Merge pull request #1506 from owncloud/files_encryptionLukas Reschke2013-02-064-35/+14
|\ \ \ | | | | | | | | Files encryption
| * \ \ Merge branch 'master' into files_encryptionSam Tuke2013-02-068-17/+18
| |\ \ \ | | | |/ | | |/|
| * | | Added commentSam Tuke2013-02-061-1/+1
| | | |
| * | | Removed debugging codeSam Tuke2013-02-062-2/+2
| | | |
| * | | Merge branch 'master' into files_encryptionSam Tuke2013-02-0660-189/+79
| |\ \ \
| * | | | Development snapshotSam Tuke2013-02-063-21/+5
| | | | |
| * | | | Fixed bug causing encrypted files to be doubly encrypted at loginSam Tuke2013-02-063-14/+9
| | | | | | | | | | | | | | | | | | | | Added comments and docblocks
* | | | | Merge pull request #1498 from schiesbn/delete_trashLukas Reschke2013-02-065-0/+91
|\ \ \ \ \ | |_|_|/ / |/| | | | delete files from trash bin permanently
| * | | | copy&paste bug, no fetchAll() needed hereBjörn Schießle2013-02-061-1/+1
| | | | |
| * | | | delete debug codeBjörn Schießle2013-02-061-1/+1
| | | | |
| * | | | allow to delete single files from the trash bin permanentlyBjörn Schießle2013-02-065-0/+91
| | |_|/ | |/| |
* | | | Merge pull request #1472 from owncloud/files_versions-cleanupThomas Müller2013-02-066-12/+13
|\ \ \ \ | | | | | | | | | | files_versions cleanup
| * | | | Only calculate md5 of local file onceBart Visscher2013-02-051-1/+2
| | | | |
| * | | | Change files_versions namespace to OCA\Files_VersionsBart Visscher2013-02-056-11/+11
| | | | |
* | | | | Merge pull request #1428 from owncloud/content_positioningThomas Tanghus2013-02-062-5/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix leftcontent positioning. Ref #1255
| * | | | Add 'hascontrols' class for content with fixed topbar.Thomas Tanghus2013-02-042-11/+11
| | | | |
| * | | | Files: fix positioning of Trash button and upload progress barRobin Appelman2013-02-042-10/+10
| | | | |
| * | | | Fix leftcontent positioning. Ref #1255Thomas Tanghus2013-02-031-1/+1
| | | | |
* | | | | Merge pull request #1487 from owncloud/fix-1420-masterThomas Müller2013-02-061-1/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | Replace OC_FileCache usage in files_versions
| * | | | Replace OC_FileCache usage in files_versionsBart Visscher2013-02-061-1/+2
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-0658-187/+76
| | | |
* | | | Merge pull request #1474 from samtuke/masterLukas Reschke2013-02-0516-489/+783
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| Improvements to files_encryption
| * | Fixed comment typo, wrapped return value conditional on var assignment in ↵Sam Tuke2013-02-052-3/+5
| | | | | | | | | | | | session{}
| * | Added missing translation wrappingSam Tuke2013-02-051-1/+3
| | |
| * | Added notice to personal settings indicating what filetypes are not encryptedSam Tuke2013-02-053-48/+23
| | |
| * | Removed debugging outputSam Tuke2013-02-052-12/+0
| | |
| * | Fixed bug relating to Filesystem{} that prevented webdav logins with ↵Sam Tuke2013-02-051-50/+52
| | | | | | | | | | | | files_encryption
| * | Cleaned up path formatting with new method stripUserFilesPath()Sam Tuke2013-02-052-20/+22
| | |