aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #5966 from owncloud/fixing-fileid-webdav-masterblizzz2013-11-201-0/+2
|\ \ \ \ \ \ \
| * | | | | | | always get the right node for the given file pathThomas Müller2013-11-201-0/+2
| |/ / / / / /
* | | | | | | Merge pull request #5959 from owncloud/encryption_check_if_file_is_encryptedVincent Petry2013-11-204-24/+20
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'master' into encryption_check_if_file_is_encryptedBjoern Schiessle2013-11-201-3/+5
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #5961 from owncloud/core-fixgetfiletempfileconditionVincent Petry2013-11-201-3/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fixed getLocalFile() condition for x-send-fileVincent Petry2013-11-201-3/+5
|/ / / / / /
| * | | | | check if it is a cached file or a version to resolve the correct path to the ...Bjoern Schiessle2013-11-201-1/+5
| * | | | | only check if the key file exists to decide if it is an encrypted file or not.Bjoern Schiessle2013-11-204-25/+17
|/ / / / /
* | | | | Merge pull request #5926 from owncloud/less-boldFrank Karlitschek2013-11-191-2/+0
|\ \ \ \ \
| * | | | | remove bold from legend, table header, label - less obtrusiveJan-Christoph Borchardt2013-11-181-2/+0
* | | | | | Merge pull request #5951 from owncloud/ldap_encryption_fixblizzz2013-11-191-0/+4
|\ \ \ \ \ \
| * | | | | | make sure that the owners home is mounted correctlyBjoern Schiessle2013-11-191-0/+4
|/ / / / / /
* | | | | | Merge pull request #5878 from owncloud/extstorage-smbVincent Petry2013-11-194-4/+84
|\ \ \ \ \ \
| * | | | | | Fixed SMB file deletion success detectionVincent Petry2013-11-192-2/+26
| * | | | | | Removing trailing dot in path that samba doesn't seem to likeVincent Petry2013-11-192-1/+47
| * | | | | | Fixed delete action to show error message as notificationVincent Petry2013-11-191-1/+11
|/ / / / / /
* | | | | | Merge pull request #5916 from owncloud/extstorage-smb-ignorenetbioserrorMorris Jobke2013-11-181-1/+8
|\ \ \ \ \ \
| * | | | | | SMB ignore connection errors when NetBIOS is disabledVincent Petry2013-11-181-1/+8
* | | | | | | Merge pull request #5927 from owncloud/quota-excludeextstorageMorris Jobke2013-11-185-7/+17
|\ \ \ \ \ \ \
| * | | | | | | External storage space is now not counted in total spaceVincent Petry2013-11-185-7/+17
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #5928 from owncloud/quota-totalsizeoffilesMorris Jobke2013-11-182-0/+39
|\ \ \ \ \ \ \
| * | | | | | | Root size for home storage is now size of "files" subdirVincent Petry2013-11-182-0/+39
| |/ / / / / /
* | | | | | | Merge pull request #5923 from owncloud/font-weightJan-Christoph Borchardt2013-11-181-0/+1
|\ \ \ \ \ \ \
| * | | | | | | change bold 'deleted files' button to normal for less focusJan-Christoph Borchardt2013-11-181-0/+1
| |/ / / / / /
* | | | | | | fix filtering number like filenames in filelistJörn Friedrich Dreyer2013-11-181-1/+1
* | | | | | | Merge pull request #5922 from owncloud/fix-time-inputsThomas Müller2013-11-181-6/+36
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | adjust input CSS to multiline, coding guidelinesJan-Christoph Borchardt2013-11-181-6/+29
| * | | | | | fix input type time fields, have them use the default stylesJan-Christoph Borchardt2013-11-181-3/+10
* | | | | | | Merge pull request #5915 from owncloud/fix_apps_versioncheckVincent Petry2013-11-181-1/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | one tab lessFrank Karlitschek2013-11-181-1/+1
| * | | | | | fix the version check for downloaded apps. Fixes https://github.com/owncloud/...Frank Karlitschek2013-11-181-2/+9
| |/ / / / /
* | | | | | Merge pull request #5908 from owncloud/fix_errorpage_callVincent Petry2013-11-181-1/+1
|\ \ \ \ \ \
| * | | | | | call error page with session as parameterBjoern Schiessle2013-11-171-1/+1
* | | | | | | Merge pull request #5914 from owncloud/fix_5832Morris Jobke2013-11-181-1/+16
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Check which permissions are possible to re-share a fileBjoern Schiessle2013-11-181-1/+16
|/ / / / / /
* | / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-11-15363-6923/+8214
| |/ / / / |/| | | |
* | | | | Merge pull request #5894 from owncloud/readd_sharing_tokenVincent Petry2013-11-152-0/+2
|\ \ \ \ \
| * | | | | readd sharing token to public templateJörn Friedrich Dreyer2013-11-152-0/+2
| |/ / / /
* | | | | Merge pull request #5772 from owncloud/fix5741blizzz2013-11-153-22/+92
|\ \ \ \ \
| * | | | | LDAP Wizard: make 'Configuration OK' and 'Help' texts grey so they don't take...Arthur Schiwon2013-11-132-0/+7
| * | | | | LDAP Wizard: move status indicator in one line with back and continue buttonsArthur Schiwon2013-11-131-3/+2
| * | | | | LDAP Wizard: introduce configuration status indicator, fixes #5741Arthur Schiwon2013-11-133-22/+86
* | | | | | Merge pull request #5833 from owncloud/encryption_fixesBjörn Schießle2013-11-153-22/+83
|\ \ \ \ \ \
| * | | | | | remove debug outputBjoern Schiessle2013-11-141-6/+0
| * | | | | | test encryptAll() and decryptAll() to make sure that mtime and etag stay the ...Bjoern Schiessle2013-11-141-0/+64
| * | | | | | Merge branch 'master' into encryption_fixesBjoern Schiessle2013-11-1310-75/+138
| |\ \ \ \ \ \
| * | | | | | | fixPartialFilePath() is now stripPartialFileExtension()Bjoern Schiessle2013-11-121-1/+1
| * | | | | | | only update file cache if the file is already indexed to avoid that we create...Bjoern Schiessle2013-11-121-11/+14
| * | | | | | | make sure that we keep the correct timestamp and etag after encryoption/decry...Bjoern Schiessle2013-11-121-11/+11
* | | | | | | | Merge pull request #5880 from owncloud/replace_etmp_filesVincent Petry2013-11-154-16/+64
|\ \ \ \ \ \ \ \