Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | this hopefully fixes testRecoveryForUser(), works locally | Bjoern Schiessle | 2013-07-31 | 1 | -7/+10 | |
| * | | | | | | this test works locally, let's see what out build server says... | Bjoern Schiessle | 2013-07-31 | 1 | -3/+0 | |
| * | | | | | | fix searchUsers() call in group.php | Bjoern Schiessle | 2013-07-31 | 1 | -1/+1 | |
| * | | | | | | fixing some unit tests | Bjoern Schiessle | 2013-07-30 | 2 | -6/+6 | |
| * | | | | | | we need to use the path relative to data/ | Bjoern Schiessle | 2013-07-30 | 1 | -4/+1 | |
| * | | | | | | handle error if we can't handle the given path | Bjoern Schiessle | 2013-07-30 | 2 | -2/+7 | |
| * | | | | | | remove unused method, the right one is in util.php | Bjoern Schiessle | 2013-07-30 | 1 | -4/+0 | |
| * | | | | | | adapt unit tests to the modified stream wrapper | Bjoern Schiessle | 2013-07-30 | 5 | -35/+35 | |
| * | | | | | | only show decrypt all files option if encrypted files are available | Bjoern Schiessle | 2013-07-30 | 1 | -2/+1 | |
| * | | | | | | encrypt/decrypt file versions | Bjoern Schiessle | 2013-07-30 | 1 | -3/+124 | |
| * | | | | | | check if app is enabled | Bjoern Schiessle | 2013-07-30 | 1 | -7/+8 | |
| * | | | | | | only write keyfiles if it was a new file, otherwise nothing changed | Bjoern Schiessle | 2013-07-30 | 1 | -38/+45 | |
| * | | | | | | use path relative to data/ | Bjoern Schiessle | 2013-07-30 | 1 | -4/+1 | |
| * | | | | | | improved error handling | Bjoern Schiessle | 2013-07-30 | 2 | -14/+34 | |
| * | | | | | | working decrypt files method | Bjoern Schiessle | 2013-07-29 | 6 | -37/+173 | |
| * | | | | | | add decryptall.php | Björn Schießle | 2013-07-29 | 1 | -0/+14 | |
| * | | | | | | register decrypt all route | Björn Schießle | 2013-07-29 | 1 | -0/+2 | |
| * | | | | | | add ajax call to decrypt all files | Björn Schießle | 2013-07-29 | 3 | -1/+18 | |
| * | | | | | | user interface to allow user to decrypt all his files once the encryption app... | Björn Schießle | 2013-07-29 | 6 | -9/+68 | |
* | | | | | | | Merge pull request #4498 from owncloud/uploadprogress-near-uploadbutton | Christopher | 2013-08-18 | 1 | -4/+14 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | remove unneeded extra ID selectors | Jan-Christoph Borchardt | 2013-08-18 | 1 | -2/+2 | |
| * | | | | | | | move upload progress bar near upload button, more contextual | Jan-Christoph Borchardt | 2013-08-18 | 1 | -3/+13 | |
* | | | | | | | | Merge pull request #4497 from owncloud/newlines_at_eof_kondou | Kondou | 2013-08-18 | 75 | -75/+75 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add _many_ newlines at the end of files | kondou | 2013-08-18 | 75 | -75/+75 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | Port DAV groupMemberSet fix to master #4458 | Thomas Tanghus | 2013-08-18 | 1 | -6/+8 | |
* | | | | | | | | Merge pull request #4496 from owncloud/fixing-error-page-layout-master | Kondou | 2013-08-18 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | fixing error page layout | Thomas Müller | 2013-08-18 | 1 | -0/+1 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #4485 from guruz/class_autoloader_optimization | Markus Goetz | 2013-08-18 | 2 | -1/+54 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Class Auto Loader: Cache paths in APC | Markus Goetz | 2013-08-18 | 2 | -1/+54 | |
* | | | | | | | | | Merge pull request #4483 from owncloud/compare-true-false | Bart Visscher | 2013-08-18 | 9 | -16/+16 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Use boolean casting for bitwise and result. | Andreas Fischer | 2013-08-17 | 1 | -1/+1 | |
| * | | | | | | | | | Add trailing comma for all touched array lines. | Andreas Fischer | 2013-08-17 | 1 | -1/+1 | |
| * | | | | | | | | | Fix spacing of all touched lines. | Andreas Fischer | 2013-08-17 | 3 | -3/+3 | |
| * | | | | | | | | | Compare result are already true/false | Bart Visscher | 2013-08-17 | 9 | -16/+16 | |
* | | | | | | | | | | Merge pull request #4486 from owncloud/ldap_adjust_cache | Bart Visscher | 2013-08-18 | 1 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | LDAP: use memcache if available | Arthur Schiwon | 2013-08-17 | 1 | -1/+6 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #4493 from owncloud/fixing-initL10n-master | Owen Winkler | 2013-08-18 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Fixed inconsistent spacing. | Owen Winkler | 2013-08-18 | 1 | -1/+1 | |
| * | | | | | | | | | fixing undefined js error | Thomas Müller | 2013-08-17 | 1 | -1/+1 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #4426 from owncloud/ldap_settings_design | Jan-Christoph Borchardt | 2013-08-18 | 5 | -9/+49 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | LDAP: Update Host in configuration chooser on Save | Arthur Schiwon | 2013-08-15 | 1 | -0/+7 | |
| * | | | | | | | | LDAP: Show Host name in configuration drop down | Arthur Schiwon | 2013-08-15 | 3 | -1/+31 | |
| * | | | | | | | | LDAP: slightly smaller input fields | Arthur Schiwon | 2013-08-15 | 1 | -1/+1 | |
| * | | | | | | | | LDAP: move small info text strings into tooltips | Arthur Schiwon | 2013-08-14 | 1 | -7/+4 | |
| * | | | | | | | | LDAP: right align labels on settings page | Arthur Schiwon | 2013-08-14 | 1 | -0/+6 | |
* | | | | | | | | | Merge pull request #4339 from owncloud/mimetype-defaults | Thomas Müller | 2013-08-17 | 8 | -551/+715 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | communicate size of newly created file back and update UI | Thomas Müller | 2013-08-16 | 3 | -310/+316 | |
| * | | | | | | | | | Merge branch 'master' into mimetype-defaults | Thomas Müller | 2013-08-16 | 1402 | -11847/+19120 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | actually register html template | Robin Appelman | 2013-08-07 | 1 | -5/+9 | |
| * | | | | | | | | | | use === | Robin Appelman | 2013-08-07 | 1 | -4/+4 |