Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1534 from owncloud/files_l10n | Thomas Müller | 2013-02-08 | 3 | -6/+10 |
|\ | | | | | Add translation support back to move/rename | ||||
| * | Files: explicitly define | Robin Appelman | 2013-02-08 | 2 | -0/+4 |
| | | |||||
| * | Files: rename 'space' to 'storage' in upload.php | Robin Appelman | 2013-02-07 | 1 | -1/+1 |
| | | |||||
| * | Files: add translation support back to move/rename | Robin Appelman | 2013-02-07 | 2 | -5/+5 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-08 | 62 | -42/+101 |
| | | |||||
* | | Merge pull request #1507 from tripflex/master | Bart Visscher | 2013-02-07 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | remove float left from actions div class fixes #1504 | ||||
| * | | Remove left float from actions div class | Myles McNamara | 2013-02-06 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1526 from owncloud/l10n-support-master | Lukas Reschke | 2013-02-07 | 5 | -11/+22 |
|\ \ \ | |_|/ |/| | | L10n support master | ||||
| * | | l10n support enhanced in files_versions | Thomas Mueller | 2013-02-07 | 1 | -1/+1 |
| | | | |||||
| * | | l10n support enhanced in files_trashbin | Thomas Mueller | 2013-02-07 | 2 | -3/+6 |
| | | | |||||
| * | | l10n support enhanced in files_version | Thomas Mueller | 2013-02-07 | 3 | -8/+16 |
| | | | |||||
* | | | Merge pull request #1524 from owncloud/fix_ldaps_tls_setting | blizzz | 2013-02-07 | 2 | -4/+16 |
|\ \ \ | |/ / |/| | | LDAP: don't try to put TLS on top of already secure connection (will fail). | ||||
| * | | Typo | Arthur Schiwon | 2013-02-07 | 1 | -1/+1 |
| | | | |||||
| * | | LDAP: better detect timeouts. do not try to reconnect. do not try to bind ↵ | Arthur Schiwon | 2013-02-06 | 1 | -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 Schiwon | 2013-02-06 | 1 | -0/+5 |
| | | | | | | | | | | | | not work together. ldaps already creates a secure connection. | ||||
| * | | LDAP: info string improved | Arthur Schiwon | 2013-02-06 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1518 from schiesbn/trash_layout_fix | blizzz | 2013-02-07 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | add class hascontrols to trash bin file table | ||||
| * | | | add class hascontrols to trash bin file table | Björn Schießle | 2013-02-07 | 1 | -1/+1 |
| | | | | |||||
* | | | | remove debug output | Björn Schießle | 2013-02-07 | 1 | -1/+0 |
| | | | | |||||
* | | | | rename OCA_Trash to OCA\Files_Trashbin | Björn Schießle | 2013-02-07 | 5 | -7/+7 |
| | | | | |||||
* | | | | OCA_Versions is now known as OCA\Files_Versions | Björn Schießle | 2013-02-07 | 1 | -1/+1 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-07 | 11 | -3/+47 |
| | | | |||||
* | | | Merge pull request #1506 from owncloud/files_encryption | Lukas Reschke | 2013-02-06 | 4 | -35/+14 |
|\ \ \ | | | | | | | | | Files encryption | ||||
| * \ \ | Merge branch 'master' into files_encryption | Sam Tuke | 2013-02-06 | 8 | -17/+18 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Added comment | Sam Tuke | 2013-02-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Removed debugging code | Sam Tuke | 2013-02-06 | 2 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into files_encryption | Sam Tuke | 2013-02-06 | 60 | -189/+79 |
| |\ \ \ | |||||
| * | | | | Development snapshot | Sam Tuke | 2013-02-06 | 3 | -21/+5 |
| | | | | | |||||
| * | | | | Fixed bug causing encrypted files to be doubly encrypted at login | Sam Tuke | 2013-02-06 | 3 | -14/+9 |
| | | | | | | | | | | | | | | | | | | | | Added comments and docblocks | ||||
* | | | | | Merge pull request #1498 from schiesbn/delete_trash | Lukas Reschke | 2013-02-06 | 5 | -0/+91 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | delete files from trash bin permanently | ||||
| * | | | | copy&paste bug, no fetchAll() needed here | Björn Schießle | 2013-02-06 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | delete debug code | Björn Schießle | 2013-02-06 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | allow to delete single files from the trash bin permanently | Björn Schießle | 2013-02-06 | 5 | -0/+91 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1472 from owncloud/files_versions-cleanup | Thomas Müller | 2013-02-06 | 6 | -12/+13 |
|\ \ \ \ | | | | | | | | | | | files_versions cleanup | ||||
| * | | | | Only calculate md5 of local file once | Bart Visscher | 2013-02-05 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Change files_versions namespace to OCA\Files_Versions | Bart Visscher | 2013-02-05 | 6 | -11/+11 |
| | | | | | |||||
* | | | | | Merge pull request #1428 from owncloud/content_positioning | Thomas Tanghus | 2013-02-06 | 2 | -5/+5 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Fix leftcontent positioning. Ref #1255 | ||||
| * | | | | Add 'hascontrols' class for content with fixed topbar. | Thomas Tanghus | 2013-02-04 | 2 | -11/+11 |
| | | | | | |||||
| * | | | | Files: fix positioning of Trash button and upload progress bar | Robin Appelman | 2013-02-04 | 2 | -10/+10 |
| | | | | | |||||
| * | | | | Fix leftcontent positioning. Ref #1255 | Thomas Tanghus | 2013-02-03 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #1487 from owncloud/fix-1420-master | Thomas Müller | 2013-02-06 | 1 | -1/+2 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Replace OC_FileCache usage in files_versions | ||||
| * | | | | Replace OC_FileCache usage in files_versions | Bart Visscher | 2013-02-06 | 1 | -1/+2 |
| | |/ / | |/| | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-06 | 58 | -187/+76 |
| | | | | |||||
* | | | | Merge pull request #1474 from samtuke/master | Lukas Reschke | 2013-02-05 | 16 | -489/+783 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | Improvements to files_encryption | ||||
| * | | Fixed comment typo, wrapped return value conditional on var assignment in ↵ | Sam Tuke | 2013-02-05 | 2 | -3/+5 |
| | | | | | | | | | | | | session{} | ||||
| * | | Added missing translation wrapping | Sam Tuke | 2013-02-05 | 1 | -1/+3 |
| | | | |||||
| * | | Added notice to personal settings indicating what filetypes are not encrypted | Sam Tuke | 2013-02-05 | 3 | -48/+23 |
| | | | |||||
| * | | Removed debugging output | Sam Tuke | 2013-02-05 | 2 | -12/+0 |
| | | | |||||
| * | | Fixed bug relating to Filesystem{} that prevented webdav logins with ↵ | Sam Tuke | 2013-02-05 | 1 | -50/+52 |
| | | | | | | | | | | | | files_encryption | ||||
| * | | Cleaned up path formatting with new method stripUserFilesPath() | Sam Tuke | 2013-02-05 | 2 | -20/+22 |
| | | |