| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge pull request #7235 from DavidVentura/master | Jan-Christoph Borchardt | 2014-02-17 | 1 | -1/+1 |
| |\ |
|
| | * | small change for compatibility | David | 2014-02-17 | 1 | -1/+1 |
| * | | Merge pull request #7211 from mattcaron/master | Vincent Petry | 2014-02-17 | 1 | -1/+4 |
| |\ \ |
|
| | * | | Consolidate two sections, per code review. Issue #1648 | Matthew Caron | 2014-02-17 | 1 | -6/+2 |
| | * | | Fit shared videos to viewer, just like images. Issue #1648 | Matthew Caron | 2014-02-14 | 1 | -0/+7 |
| | |/ |
|
| * | | LDAP: improve wizard strings, fixes #5567 | Arthur Schiwon | 2014-02-17 | 3 | -3/+3 |
| * | | don't block login forever if we are stuck in the middle of the initial encryp... | Bjoern Schiessle | 2014-02-17 | 5 | -10/+24 |
| * | | catch errors during decryption | Bjoern Schiessle | 2014-02-17 | 2 | -16/+105 |
| * | | catch errors during initial encryption | Bjoern Schiessle | 2014-02-17 | 2 | -26/+47 |
| |/ |
|
| * | fileinfo is no longer a array | Bjoern Schiessle | 2014-02-14 | 1 | -1/+1 |
| * | Merge pull request #6748 from owncloud/fileinfo | icewind1991 | 2014-02-14 | 4 | -15/+15 |
| |\ |
|
| | * | merge master into fileinfo | Robin Appelman | 2014-01-29 | 73 | -5091/+10487 |
| | |\ |
|
| | * \ | Merge branch 'master' into fileinfo | Robin Appelman | 2014-01-17 | 13 | -35/+64 |
| | |\ \ |
|
| | * | | | remove more is_array from encryption | Robin Appelman | 2014-01-17 | 3 | -13/+13 |
| | * | | | Don't use is_array on FileInfo | Robin Appelman | 2014-01-17 | 2 | -3/+3 |
| * | | | | Merge pull request #6726 from owncloud/fix_6630 | Vincent Petry | 2014-02-14 | 4 | -4/+4 |
| |\ \ \ \ |
|
| | * | | | | Fixed double file encoding for previews | Vincent Petry | 2014-01-30 | 2 | -2/+2 |
| | * | | | | don't urldecode get var, php does this automatically | Georg Ehrke | 2014-01-30 | 2 | -2/+2 |
| * | | | | | Merge pull request #7183 from owncloud/remove-force-lowercase | Thomas Müller | 2014-02-14 | 1 | -3/+20 |
| |\ \ \ \ \ |
|
| | * | | | | | remove forced lowercase from extension, fix #4747, also coding style fixes | Jan-Christoph Borchardt | 2014-02-13 | 1 | -3/+20 |
| * | | | | | | Merge pull request #7168 from owncloud/issue/7152 | Vincent Petry | 2014-02-14 | 1 | -4/+12 |
| |\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| | * | | | | | Send correct path on file upload when using public app | Joas Schilling | 2014-02-12 | 1 | -4/+12 |
| * | | | | | | Merge pull request #7178 from owncloud/issue/6277 | Thomas Müller | 2014-02-12 | 1 | -1/+1 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | External FTP Storage should request hostname instead of URL | Joas Schilling | 2014-02-12 | 1 | -1/+1 |
| | |/ / / / / |
|
| * | | | | | | Merge pull request #6964 from owncloud/storagestatistics-reuse | icewind1991 | 2014-02-12 | 1 | -4/+4 |
| |\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| | * | | | | | Merge branch 'master' into storagestatistics-reuse | Robin Appelman | 2014-02-10 | 22 | -161/+660 |
| | |\ \ \ \ \ |
|
| | * \ \ \ \ \ | merge master into storagestatistics-reuse | Robin Appelman | 2014-02-05 | 28 | -216/+532 |
| | |\ \ \ \ \ \ |
|
| | * | | | | | | | Reuse the calculated free_space in buildFileStorageStatistics | Robin Appelman | 2014-01-27 | 1 | -4/+4 |
| * | | | | | | | | Merge pull request #7085 from owncloud/quick-fix-7019-master | Thomas Müller | 2014-02-11 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | Load authentication apps to get users from all backends - fixes #7019 | Thomas Müller | 2014-02-05 | 1 | -0/+1 |
| | | |/ / / / / /
| |/| | | | | | |
|
| * | | | | | | | | LDAP: improve debug message | Arthur Schiwon | 2014-02-10 | 1 | -1/+2 |
| * | | | | | | | | LDAP: also try MS AD's thumbnailPhoto when looking for an avatar image | Arthur Schiwon | 2014-02-10 | 1 | -6/+24 |
| * | | | | | | | | Merge pull request #7134 from owncloud/issue/5794 | Morris Jobke | 2014-02-10 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \
| |_|_|/ / / / /
|/| | | | | | | |
|
| | * | | | | | | | Make google drive client secret and dropbox api secret a password field | Joas Schilling | 2014-02-07 | 1 | -2/+2 |
| * | | | | | | | | Merge pull request #7140 from owncloud/enc_dont_login_during_encryption | Morris Jobke | 2014-02-10 | 1 | -1/+8 |
| |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | refuse login as long as the initial encryption is running | Bjoern Schiessle | 2014-02-10 | 1 | -1/+8 |
| * | | | | | | | | | LDAP: add documentation info in info.xml | Arthur Schiwon | 2014-02-10 | 1 | -0/+3 |
| * | | | | | | | | | Merge pull request #7126 from nickvergessen/issue/6683 | Vincent Petry | 2014-02-10 | 2 | -4/+6 |
| |\ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | Only add files to file list when uploading to current directory | Joas Schilling | 2014-02-07 | 2 | -4/+6 |
| * | | | | | | | | | | Rephrase and clarify log message | Arthur Schiwon | 2014-02-10 | 1 | -1/+1 |
| * | | | | | | | | | | Wizard: enable base DN for editing, if not base DN could have been detected. ... | Arthur Schiwon | 2014-02-10 | 1 | -0/+1 |
| * | | | | | | | | | | Wizard: disable LDAP referrals, fixes #6670 | Arthur Schiwon | 2014-02-10 | 1 | -0/+1 |
| * | | | | | | | | | | throw an info message, when base dn test failed | Arthur Schiwon | 2014-02-10 | 1 | -0/+4 |
| * | | | | | | | | | | LDAP: extend LDAP wrapper search method for sizelimit, improves performance i... | Arthur Schiwon | 2014-02-10 | 2 | -4/+6 |
| * | | | | | | | | | | Merge pull request #7133 from owncloud/fix-implied-eval | Thomas Müller | 2014-02-10 | 2 | -7/+5 |
| |\ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / /
|/| | | | | | | | | |
|
| | * | | | | | | | | | Fix implied evals and doubled definition of variable | Morris Jobke | 2014-02-07 | 2 | -7/+5 |
| | | |/ / / / / / /
| |/| | | | | | | |
|
| * / | | | | | | | | name users after test | Bjoern Schiessle | 2014-02-07 | 1 | -2/+2 |
| |/ / / / / / / / |
|
| * / / / / / / / | replace 'size' with 'unencrypted_size' if encryption is enabled | Bjoern Schiessle | 2014-02-07 | 2 | -3/+21 |
| |/ / / / / / / |
|
| * | | | | | | | Merge pull request #7089 from owncloud/sharing-searchbymime | Vincent Petry | 2014-02-06 | 2 | -9/+164 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | Fixed searchByMime in shared cache | Vincent Petry | 2014-02-05 | 2 | -9/+164 |
