summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3788 from owncloud/more_error_messagesBjörn Schießle2013-06-202-26/+28
|\
| * always have a defined return valueBjörn Schießle2013-06-191-4/+4
| * some more error messagesBjörn Schießle2013-06-191-5/+3
| * add some more error messages, in case something went wrongBjörn Schießle2013-06-192-24/+28
* | Merge pull request #3784 from owncloud/rescan-allThomas Müller2013-06-202-15/+45
|\ \
| * | use json to encode user listRobin Appelman2013-06-192-2/+2
| * | allow scanning files for multiple usersRobin Appelman2013-06-192-15/+45
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-208-17/+36
* | | Merge pull request #3764 from owncloud/scanfolder-existingicewind19912013-06-191-1/+1
|\| | | |/ |/|
| * reuse etag when doing a forced rescanRobin Appelman2013-06-141-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-184-0/+24
* | Merge branch 'master' into fix_glob_escapingBjörn Schießle2013-06-1756-52/+121
|\ \
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-06-174-0/+8
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-06-1611-0/+54
| * | Merge pull request #3301 from bastho/fix_filestrashbin_missing-sub-folderMorris Jobke2013-06-151-2/+9
| |\ \
| | * | duplicate verificationBastien Ho2013-05-101-3/+0
| | * | Fix inexisting trashbin's sub-foldersBastien Ho2013-05-101-2/+12
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-1548-48/+42
| * | | Merge pull request #3473 from opensaucesystems/masterThomas Müller2013-06-142-3/+9
| |\ \ \ | | |_|/ | |/| |
| | * | Update settings.phpopensaucesystems2013-05-231-1/+1
| | * | Remove http:// from label and add placeholderopensaucesystems2013-05-231-1/+1
| | * | Enable https authenticationopensaucesystems2013-05-231-1/+1
| | * | Enable https authenticationopensaucesystems2013-05-231-2/+8
* | | | don't normalize absolute local pathBjörn Schießle2013-06-171-1/+1
* | | | fix indentionBjörn Schießle2013-06-141-319/+310
* | | | only escape glob patternBjörn Schießle2013-06-142-8/+11
|/ / /
* | | Merge pull request #3715 from owncloud/fixes_for_3641_3620Björn Schießle2013-06-142-9/+8
|\ \ \
| * | | fix for path_hash not unique as reported at #3641Florin Peter2013-06-131-2/+2
| * | | fix memory problems as reported at #3620Florin Peter2013-06-132-7/+6
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-1488-167/+71
|/ / /
* | | Merge pull request #3687 from owncloud/template_updatesBjörn Schießle2013-06-131-2/+6
|\ \ \
| * | | improved footerBjörn Schießle2013-06-131-2/+6
| * | | make pub link share footer aware of different owncloud editionsBjörn Schießle2013-06-121-2/+2
* | | | Merge branch 'master' into files_encryption_check_private_keyBjörn Schießle2013-06-1312-144/+161
|\ \ \ \
| * \ \ \ Merge branch 'master' into files_encryption_upgrade_fixBjörn Schießle2013-06-133-28/+74
| |\ \ \ \
| | * \ \ \ Merge pull request #3668 from owncloud/encryption_migrate_only_onceBjörn Schießle2013-06-133-28/+74
| | |\ \ \ \
| | | * | | | add comment to explain the helper functionBjörn Schießle2013-06-131-0/+8
| | | * | | | fix typo in var nameBjörn Schießle2013-06-131-1/+1
| | | * | | | adapt test to the code changesBjörn Schießle2013-06-121-3/+18
| | | * | | | use number of manipulated rows as idicator if it was possible to enter the mi...Björn Schießle2013-06-122-69/+24
| | | * | | | use constants for different migration statusBjörn Schießle2013-06-111-8/+11
| | | * | | | make sure that only one process can enter the migration modeBjörn Schießle2013-06-112-12/+77
| * | | | | | LegacyKeyRecryptKeyfileEncrypt() no longer exists, so test can be removedBjörn Schießle2013-06-131-18/+0
| * | | | | | Merge branch 'master' into files_encryption_upgrade_fixBjörn Schießle2013-06-1265-63/+599
| |\| | | | |
| | * | | | | Revert "FIX: Download of files named "true" or "false" impossible"Roland Hager2013-06-121-2/+1
| | * | | | | FIX: Download of files named "true" or "false" impossibleRoland Hager2013-06-121-1/+2
| | | |/ / / | | |/| | |
| | * | | | disable proxys during ssl root cert upload to avoid encryptionBjörn Schießle2013-06-121-0/+4
| | * | | | backport of https://github.com/owncloud/core/commit/1fa76e53dc5c515035f19e78f...Björn Schießle2013-06-121-8/+11
| | * | | | better contrast for files list, darker greys for selection and hoverJan-Christoph Borchardt2013-06-111-5/+16
| | * | | | darker low threshold color for file size and age fading, better contrastJan-Christoph Borchardt2013-06-112-3/+3
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-07 14:30:25 +0000