| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge conflicts ... | Georg Ehrke | 2013-07-10 | 8 | -334/+341 |
| |\ | |||||
| | * | Encode current trashbin directory | Victor Dubiniuk | 2013-07-09 | 1 | -3/+6 |
| | * | Migrate to encodePath | Victor Dubiniuk | 2013-07-09 | 2 | -6/+3 |
| | * | Merge pull request #3757 from owncloud/icon-cleanup | Jan-Christoph Borchardt | 2013-07-08 | 2 | -4/+4 |
| | |\ | |||||
| | | * | use history icon in Deleted Files template as well | Jan-Christoph Borchardt | 2013-06-17 | 2 | -2/+2 |
| | | * | remove unused loading spinners, just have one | Jan-Christoph Borchardt | 2013-06-17 | 1 | -2/+2 |
| | | * | use consistent icon for 'restore'/versions/history, also SVG | Jan-Christoph Borchardt | 2013-06-17 | 1 | -1/+1 |
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-08 | 1 | -2/+2 |
| | * | | make trash bin aware of system wide mounts with respect to encryption keys | Björn Schießle | 2013-07-05 | 1 | -7/+21 |
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-25 | 1 | -0/+1 |
| | * | | Merge branch 'master' into fix_glob_escaping | Björn Schießle | 2013-06-17 | 1 | -1/+8 |
| | |\ \ | |||||
| | * | | | fix indention | Björn Schießle | 2013-06-14 | 1 | -319/+310 |
| | * | | | only escape glob pattern | Björn Schießle | 2013-06-14 | 1 | -5/+7 |
| | | |/ | |/| | |||||
| * | | | properly encode path | Georg Ehrke | 2013-07-10 | 1 | -1/+1 |
| * | | | fix for previews in trashbin app | Georg Ehrke | 2013-07-08 | 1 | -1/+1 |
| * | | | implement use of preview icons in thrashbin app | Georg Ehrke | 2013-07-08 | 2 | -1/+5 |
| | |/ |/| | |||||
| * | | Merge pull request #3301 from bastho/fix_filestrashbin_missing-sub-folder | Morris Jobke | 2013-06-15 | 1 | -2/+9 |
| |\ \ | |/ |/| | |||||
| | * | duplicate verification | Bastien Ho | 2013-05-10 | 1 | -3/+0 |
| | * | Fix inexisting trashbin's sub-folders | Bastien Ho | 2013-05-10 | 1 | -2/+12 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-07 | 2 | -9/+10 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-05 | 1 | -1/+10 |
| * | | add event.preventDefault to undelete function | Georg Ehrke | 2013-05-27 | 1 | -0/+1 |
| * | | fix https://github.com/owncloud/core/issues/3320 | Georg Ehrke | 2013-05-27 | 1 | -0/+1 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-25 | 6 | -9/+11 |
| * | | Merge pull request #3416 from owncloud/files_encryption | Thomas Müller | 2013-05-24 | 8 | -84/+143 |
| |\ \ | |||||
| | * | | added static function registerHooks() for better unit tests handling | Florin Peter | 2013-05-22 | 2 | -5/+12 |
| | * | | Merge branch 'master' into files_encryption | Björn Schießle | 2013-05-21 | 2 | -2/+16 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into files_encryption | Florin Peter | 2013-05-20 | 1 | -16/+1 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'files_encryption' of https://github.com/owncloud/core into file... | Florin Peter | 2013-05-15 | 8 | -84/+131 |
| | |\ \ \ \ | |||||
| | | * | | | | make sure to find the correct path for shared files | Björn Schießle | 2013-05-03 | 1 | -9/+19 |
| | | * | | | | remove encryption keys if a file gets deleted permanently | Björn Schießle | 2013-05-03 | 1 | -26/+46 |
| | | * | | | | disable proxys before copying files to the trash bin | Björn Schießle | 2013-05-03 | 1 | -1/+5 |
| | | * | | | | get original path in case of shared files when restoring file from trash bin | Björn Schießle | 2013-05-03 | 1 | -18/+23 |
| | | * | | | | get original path in case of shared files | Björn Schießle | 2013-05-03 | 1 | -15/+30 |
| | | * | | | | merged files_trashbin | Florin Peter | 2013-05-01 | 1 | -86/+309 |
| | | * | | | | revert changes to fbbc76f281f50afa3072d99e4e0d413df835b3d3 because master is ... | Florin Peter | 2013-05-01 | 7 | -323/+94 |
| | | * | | | | Merge branch 'master' into files_encryption to get the latest files_trashbin app | Florin Peter | 2013-04-30 | 7 | -94/+323 |
| | | |\ \ \ \ | |||||
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-24 | 1 | -1/+3 |
| | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-21 | 1 | -1/+9 |
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-20 | 1 | -1/+2 |
| | |_|_|/ / |/| | | | | |||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-18 | 1 | -16/+1 |
| |/ / / / | |||||
| * | | | | Merge branch 'master' into update_etags_on_restore | Björn Schießle | 2013-05-13 | 2 | -0/+12 |
| |\ \ \ \ | |||||
| | * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-12 | 2 | -0/+12 |
| | | |_|/ | |/| | | |||||
| * / | | | touch() needs to be performed relative to user/files otherwise ownCloud doesn... | Björn Schießle | 2013-05-10 | 1 | -1/+4 |
| |/ / / | |||||
| * | | | Use $dir instead of $fullpath | Lukas Reschke | 2013-05-06 | 1 | -2/+1 |
| * | | | Use the internal ownCloud view | Lukas Reschke | 2013-05-06 | 1 | -1/+1 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-04 | 1 | -0/+1 |
| | |/ |/| | |||||
| * | | Merge pull request #3156 from owncloud/trashbin_for_encryption_keys_against_m... | FlorinPeter | 2013-04-30 | 1 | -86/+309 |
| |\ \ | |||||
| | * | | delete and restore of versions and share-keys now works | Florin Peter | 2013-04-28 | 1 | -20/+37 |
| | * | | added handling for share-keys | Florin Peter | 2013-04-28 | 1 | -13/+88 |
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |