Commit Graph

10912 Commits (4ab3614248df4834aa6e1a684760e89c641d4818)
 

Author SHA1 Message Date
FlorinPeter 4ab3614248 Merge pull request #3156 from owncloud/trashbin_for_encryption_keys_against_master 12 years ago
FlorinPeter b464970142 Merge pull request #3169 from owncloud/fix_infinite_loop_for_file_cache 12 years ago
Jenkins for ownCloud 5764bf088e [tx-robot] updated from transifex 12 years ago
Florin Peter f55aaad858 fix for infinite loop causing on files_encryption branch when testing "apps/files_encryption/test/crypt.php" on Method testSymmetricStreamEncryptShortFileContent 12 years ago
Jan-Christoph Borchardt a5c72f1ad2 Merge pull request #3159 from owncloud/reword 12 years ago
Morris Jobke cc9933be1c Merge pull request #3160 from owncloud/remove-onclick 12 years ago
Jenkins for ownCloud 2b36ad292d [tx-robot] updated from transifex 12 years ago
Lukas Reschke 3a6e39b990 It's a class 12 years ago
Lukas Reschke 003e6adb3f Remove uneeded onclick handler 12 years ago
Lukas Reschke 6cf6103ed2 Move onclick handler 12 years ago
Lukas Reschke e3c9554856 Reword sentence and move HTML out of translation 12 years ago
Florin Peter 7a3ecd0429 delete and restore of versions and share-keys now works 12 years ago
Florin Peter 5e11948598 added handling for share-keys 12 years ago
Florin Peter 26e5ef193d restore fixed 12 years ago
Florin Peter 228c501515 fixed some problems and broken code 12 years ago
Björn Schießle 680ba4bea1 restore encryption keys from trash bin (development snapshot) 12 years ago
Björn Schießle cb65b7ca9d move encryption keys to trash bin 12 years ago
Frank Karlitschek 1f194b7bdc Merge pull request #3154 from owncloud/fix_3153 12 years ago
Jenkins for ownCloud 901e0c598d [tx-robot] updated from transifex 12 years ago
Lukas Reschke 51a1f41225 Merge pull request #3121 from owncloud/ocs_fix_api_response 12 years ago
Tom Needham 1e1a8b2f3c Fix typo 12 years ago
Tom Needham 66053693f8 Code style for ocs/routes.php 12 years ago
Tom Needham 59db762dfa Change app identifier for core api routes 12 years ago
Tom Needham d33f6b9af6 Use correct variable when checking auth 12 years ago
Morris Jobke 0e5eccbdbc Merge pull request #3146 from owncloud/restart-hint 12 years ago
Morris Jobke 86455d6ac3 Merge pull request #3145 from owncloud/magic_quotes_gpc-check 12 years ago
Raghu Nayyar 2bcb64e781 Merge pull request #3114 from owncloud/update-notification 12 years ago
Jenkins for ownCloud 7b2c64236c [tx-robot] updated from transifex 12 years ago
Robin Appelman 8a838e0e03 Code style 12 years ago
Bart Visscher 7db5ec30c3 Add check for Magic Quotes 12 years ago
Bart Visscher f5b0d904fb web_server_restart needs to be true to display the hint 12 years ago
icewind1991 5474fea1f6 Merge pull request #3136 from owncloud/mount-cleanup 12 years ago
Bart Visscher d825669265 Merge pull request #3002 from owncloud/priorize_common_languages 12 years ago
Bart Visscher 686f836736 Merge pull request #3026 from owncloud/cli-no-session 12 years ago
Bart Visscher 948e3d5b7c Merge pull request #3028 from owncloud/simplyfy-resource-locating 12 years ago
Robin Appelman 172499d5f3 Don't start the session when in cli mode 12 years ago
Bart Visscher 7e89a017bf Merge pull request #2955 from owncloud/displaynames-numeric 12 years ago
Bart Visscher 67b6ee661d Merge pull request #2783 from Kondou-ger/improve_passwordresetscreen 12 years ago
Bart Visscher b46f6e4f97 Simplify app js locating for layout pages 12 years ago
Bart Visscher ea4ae857a1 Simplify app css locating for layout pages 12 years ago
Bart Visscher 710acde9a1 Merge pull request #1872 from herbrechtsmeier/forcessl-with-ssl-proxy 12 years ago
Bart Visscher 26e2672a5a Merge pull request #2787 from owncloud/fix-password-autocomplete-2632 12 years ago
Jenkins for ownCloud d6978d0c45 [tx-robot] updated from transifex 12 years ago
Thomas Mueller 9fe3022c93 adding resource type 12 years ago
Jenkins for ownCloud 7ea2f785f4 [tx-robot] updated from transifex 12 years ago
Robin Appelman 809b5f81f6 Further seperation of mount management logic 12 years ago
Robin Appelman bcd9a69033 Cache: seperate handing of numeric storage id's to it's own class 12 years ago
Morris Jobke e6f84397aa Merge pull request #3098 from jerrac/displaynamesaveontimeout 12 years ago
icewind1991 80e91e1ac6 Merge pull request #3132 from owncloud/mount-setupfs 12 years ago
Robin Appelman cea56df59e Have the filecache updater testcase clean the filesystem properly 12 years ago