summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* initial version of a local storage implementation which will use unique ↵Thomas Mueller2013-02-066-4/+614
| | | | | | slugified filename on the local filesystem. This implementation will only be enabled on windows based system to solve the issues around UTF-8 file names with php on windows.
* Merge pull request #1500 from chriskoch/patch-1Frank Karlitschek2013-02-061-2/+2
|\ | | | | Update lib/public/util.php
| * Update lib/public/util.phpChristian Koch2013-02-061-2/+2
| | | | | | The call of \OC_MAIL::send() overrides all optional parameters. This is not necessary. But if you want to have html mail templates (what I'm thinking about) it is a real problem
* | Merge pull request #1509 from owncloud/correct-public-contacts-testsLukas Reschke2013-02-062-6/+6
|\ \ | | | | | | Correct lib/public/contacts.php tests
| * | Correct lib/public/contacts.php testsBart Visscher2013-02-062-6/+6
| | |
* | | Merge pull request #1443 from owncloud/use-module-file-info-masterLukas Reschke2013-02-063-1/+23
|\ \ \ | | | | | | | | we get best results regarding mime type detection if we use fileinfo - l...
| * | | we get best results regarding mime type detection if we use fileinfo - let's ↵Thomas Mueller2013-02-043-1/+23
| | | | | | | | | | | | | | | | tell the admin about that
* | | | Merge pull request #1506 from owncloud/files_encryptionLukas Reschke2013-02-066-42/+32
|\ \ \ \ | | | | | | | | | | Files encryption
| * | | | Reverted fix temporarily; another fix by LukasReschke is awaiting mergeSam Tuke2013-02-061-1/+3
| | | | |
| * | | | Merge branch 'master' into files_encryptionSam Tuke2013-02-0615-24/+497
| |\ \ \ \
| * | | | | Added commentSam Tuke2013-02-062-1/+2
| | | | | |
| * | | | | Removed debugging codeSam Tuke2013-02-062-2/+2
| | | | | |
| * | | | | Added commentsSam Tuke2013-02-061-7/+15
| | | | | |
| * | | | | Fixed bug causing password change related hooks to not be called due to ajaxSam Tuke2013-02-061-0/+2
| | | | | |
| * | | | | Fixed syntax bugSam Tuke2013-02-061-2/+2
| | | | | |
| * | | | | Merge branch 'master' into files_encryptionSam Tuke2013-02-065-6/+20
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Removed call to depreciated isUserVerified()Sam Tuke2013-02-061-3/+1
| | | | | |
| * | | | | Merge branch 'master' into files_encryptionSam Tuke2013-02-06168-2697/+1390
| |\ \ \ \ \
| * | | | | | 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 #1363 from owncloud/FixPasswordChangeLukas Reschke2013-02-061-8/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Fix password change
| * | | | | | | Fix indentationLukas Reschke2013-01-301-1/+1
| | | | | | | |
| * | | | | | | Remove the no longer existing function "isUserVerified"Lukas Reschke2013-01-301-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thx @eMerzh
* | | | | | | | Merge pull request #1502 from owncloud/gitignore-cloud9Thomas Müller2013-02-061-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | gitignore Cloud9IDE system folder
| * | | | | | | | gitignore Cloud9IDE system folderJan-Christoph Borchardt2013-02-061-0/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #1501 from owncloud/fix-shorttagJan-Christoph Borchardt2013-02-061-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | fix shorttag issue mentioned in #1357
| * | | | | | | | fix shorttag issue mentioned in #1357Jan-Christoph Borchardt2013-02-061-2/+2
|/ / / / / / / /
* | | | | | | | 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 #1438 from owncloud/phpunit-tests-win32-masterFrank Karlitschek2013-02-062-0/+464
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | PHPUnit support for Windows added
| * | | | | | | | | PHPUnit support for Windows addedThomas Mueller2013-02-042-0/+464
| | | | | | | | | |
* | | | | | | | | | Merge pull request #1459 from owncloud/infield-detailJan-Christoph Borchardt2013-02-061-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | shift infield labels just a tiny bit to the right so the cursor doesn't ...
| * | | | | | | | | shift infield labels just a tiny bit to the right so the cursor doesn't overlapJan-Christoph Borchardt2013-02-051-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #1428 from owncloud/content_positioningThomas Tanghus2013-02-066-11/+18
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | Fix leftcontent positioning. Ref #1255
| * | | | | | | | | Reduce top position for content below controls.Thomas Tanghus2013-02-061-1/+1
| | | | | | | | | |
| * | | | | | | | | Add 'hascontrols' class for content with fixed topbar.Thomas Tanghus2013-02-045-14/+22
| | | | | | | | | |
| * | | | | | | | | Remove padding hack to position users list.Thomas Tanghus2013-02-041-1/+0
| | | | | | | | | |
| * | | | | | | | | Files: fix positioning of Trash button and upload progress barRobin Appelman2013-02-042-10/+10
| | | | | | | | | |
| * | | | | | | | | Add box-sizing to controls.Thomas Tanghus2013-02-041-1/+1
| | | | | | | | | |
| * | | | | | | | | Fix leftcontent positioning. Ref #1255Thomas Tanghus2013-02-032-4/+4
| | | | | | | | | |
* | | | | | | | | | Merge pull request #1497 from owncloud/collapse-usermenuJan-Christoph Borchardt2013-02-062-2/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | collapse user menu when inside one of the settings sections
| * | | | | | | | | | collapse user menu when inside one of the settings sectionsJan-Christoph Borchardt2013-02-062-2/+5
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #1496 from owncloud/custom_clientsJan-Christoph Borchardt2013-02-063-4/+15
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | make it possible to modify the links to the clients
| * | | | | | | | | make it possible to modify the links to the clientsGeorg Ehrke2013-02-063-4/+15
| |/ / / / / / / /
* | | | | | | | | Merge pull request #1357 from owncloud/alternative-loging-masterThomas Müller2013-02-064-1/+30
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | add support for apps to register alternative login methods
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 20:23:51 +0000