Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #5966 from owncloud/fixing-fileid-webdav-master | blizzz | 2013-11-20 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | always get the right node for the given file path | Thomas Müller | 2013-11-20 | 1 | -0/+2 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #5959 from owncloud/encryption_check_if_file_is_encrypted | Vincent Petry | 2013-11-20 | 4 | -24/+20 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Merge branch 'master' into encryption_check_if_file_is_encrypted | Bjoern Schiessle | 2013-11-20 | 1 | -3/+5 | |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #5961 from owncloud/core-fixgetfiletempfilecondition | Vincent Petry | 2013-11-20 | 1 | -3/+5 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Fixed getLocalFile() condition for x-send-file | Vincent Petry | 2013-11-20 | 1 | -3/+5 | |
|/ / / / / / | ||||||
| * | | | | | check if it is a cached file or a version to resolve the correct path to the ... | Bjoern Schiessle | 2013-11-20 | 1 | -1/+5 | |
| * | | | | | only check if the key file exists to decide if it is an encrypted file or not. | Bjoern Schiessle | 2013-11-20 | 4 | -25/+17 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #5926 from owncloud/less-bold | Frank Karlitschek | 2013-11-19 | 1 | -2/+0 | |
|\ \ \ \ \ | ||||||
| * | | | | | remove bold from legend, table header, label - less obtrusive | Jan-Christoph Borchardt | 2013-11-18 | 1 | -2/+0 | |
* | | | | | | Merge pull request #5951 from owncloud/ldap_encryption_fix | blizzz | 2013-11-19 | 1 | -0/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | make sure that the owners home is mounted correctly | Bjoern Schiessle | 2013-11-19 | 1 | -0/+4 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #5878 from owncloud/extstorage-smb | Vincent Petry | 2013-11-19 | 4 | -4/+84 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fixed SMB file deletion success detection | Vincent Petry | 2013-11-19 | 2 | -2/+26 | |
| * | | | | | | Removing trailing dot in path that samba doesn't seem to like | Vincent Petry | 2013-11-19 | 2 | -1/+47 | |
| * | | | | | | Fixed delete action to show error message as notification | Vincent Petry | 2013-11-19 | 1 | -1/+11 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #5916 from owncloud/extstorage-smb-ignorenetbioserror | Morris Jobke | 2013-11-18 | 1 | -1/+8 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | SMB ignore connection errors when NetBIOS is disabled | Vincent Petry | 2013-11-18 | 1 | -1/+8 | |
* | | | | | | | Merge pull request #5927 from owncloud/quota-excludeextstorage | Morris Jobke | 2013-11-18 | 5 | -7/+17 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | External storage space is now not counted in total space | Vincent Petry | 2013-11-18 | 5 | -7/+17 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #5928 from owncloud/quota-totalsizeoffiles | Morris Jobke | 2013-11-18 | 2 | -0/+39 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Root size for home storage is now size of "files" subdir | Vincent Petry | 2013-11-18 | 2 | -0/+39 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #5923 from owncloud/font-weight | Jan-Christoph Borchardt | 2013-11-18 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | change bold 'deleted files' button to normal for less focus | Jan-Christoph Borchardt | 2013-11-18 | 1 | -0/+1 | |
| |/ / / / / / | ||||||
* | | | | | | | fix filtering number like filenames in filelist | Jörn Friedrich Dreyer | 2013-11-18 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #5922 from owncloud/fix-time-inputs | Thomas Müller | 2013-11-18 | 1 | -6/+36 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | adjust input CSS to multiline, coding guidelines | Jan-Christoph Borchardt | 2013-11-18 | 1 | -6/+29 | |
| * | | | | | | fix input type time fields, have them use the default styles | Jan-Christoph Borchardt | 2013-11-18 | 1 | -3/+10 | |
* | | | | | | | Merge pull request #5915 from owncloud/fix_apps_versioncheck | Vincent Petry | 2013-11-18 | 1 | -1/+8 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | one tab less | Frank Karlitschek | 2013-11-18 | 1 | -1/+1 | |
| * | | | | | | fix the version check for downloaded apps. Fixes https://github.com/owncloud/... | Frank Karlitschek | 2013-11-18 | 1 | -2/+9 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #5908 from owncloud/fix_errorpage_call | Vincent Petry | 2013-11-18 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | call error page with session as parameter | Bjoern Schiessle | 2013-11-17 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #5914 from owncloud/fix_5832 | Morris Jobke | 2013-11-18 | 1 | -1/+16 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Check which permissions are possible to re-share a file | Bjoern Schiessle | 2013-11-18 | 1 | -1/+16 | |
|/ / / / / / | ||||||
* | / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-15 | 363 | -6923/+8214 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #5894 from owncloud/readd_sharing_token | Vincent Petry | 2013-11-15 | 2 | -0/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | readd sharing token to public template | Jörn Friedrich Dreyer | 2013-11-15 | 2 | -0/+2 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #5772 from owncloud/fix5741 | blizzz | 2013-11-15 | 3 | -22/+92 | |
|\ \ \ \ \ | ||||||
| * | | | | | LDAP Wizard: make 'Configuration OK' and 'Help' texts grey so they don't take... | Arthur Schiwon | 2013-11-13 | 2 | -0/+7 | |
| * | | | | | LDAP Wizard: move status indicator in one line with back and continue buttons | Arthur Schiwon | 2013-11-13 | 1 | -3/+2 | |
| * | | | | | LDAP Wizard: introduce configuration status indicator, fixes #5741 | Arthur Schiwon | 2013-11-13 | 3 | -22/+86 | |
* | | | | | | Merge pull request #5833 from owncloud/encryption_fixes | Björn Schießle | 2013-11-15 | 3 | -22/+83 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | remove debug output | Bjoern Schiessle | 2013-11-14 | 1 | -6/+0 | |
| * | | | | | | test encryptAll() and decryptAll() to make sure that mtime and etag stay the ... | Bjoern Schiessle | 2013-11-14 | 1 | -0/+64 | |
| * | | | | | | Merge branch 'master' into encryption_fixes | Bjoern Schiessle | 2013-11-13 | 10 | -75/+138 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | fixPartialFilePath() is now stripPartialFileExtension() | Bjoern Schiessle | 2013-11-12 | 1 | -1/+1 | |
| * | | | | | | | only update file cache if the file is already indexed to avoid that we create... | Bjoern Schiessle | 2013-11-12 | 1 | -11/+14 | |
| * | | | | | | | make sure that we keep the correct timestamp and etag after encryoption/decry... | Bjoern Schiessle | 2013-11-12 | 1 | -11/+11 | |
* | | | | | | | | Merge pull request #5880 from owncloud/replace_etmp_files | Vincent Petry | 2013-11-15 | 4 | -16/+64 | |
|\ \ \ \ \ \ \ \ |