Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Check result only once | Victor Dubiniuk | 2013-10-04 | 1 | -3/+5 |
* | Make mimetypes static. Jenkis will be happy | Victor Dubiniuk | 2013-10-04 | 1 | -11/+11 |
* | Load all mimetypes in one go | Victor Dubiniuk | 2013-10-04 | 1 | -17/+20 |
* | Merge pull request #5091 from guruz/webdav_connector_use_cache_for_etag | Markus Goetz | 2013-10-04 | 1 | -1/+8 |
|\ | |||||
| * | DAV: Use fileinfo_cache for ETag | Markus Goetz | 2013-10-03 | 1 | -1/+8 |
* | | Merge pull request #4689 from owncloud/sharing_mail_notification_master | Björn Schießle | 2013-10-04 | 13 | -30/+263 |
|\ \ | |||||
| * \ | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-10-04 | 50 | -413/+1455 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #5107 from owncloud/user_skeleton | Thomas Müller | 2013-10-04 | 2 | -0/+35 |
|\ \ \ | |||||
| * | | | add a real examplefile instead of an .gitignore which is a bit stupid here | Frank Karlitschek | 2013-10-04 | 2 | -4/+5 |
| * | | | ups. remove debug | Frank Karlitschek | 2013-10-04 | 1 | -2/+0 |
| * | | | use Filesystem::isIgnoredDir | Frank Karlitschek | 2013-10-04 | 1 | -1/+1 |
| * | | | fix typo | Frank Karlitschek | 2013-10-04 | 1 | -1/+1 |
| * | | | add public static | Frank Karlitschek | 2013-10-04 | 1 | -1/+1 |
| * | | | make it possible to prepopulate a new user gome with a skeleton | Frank Karlitschek | 2013-10-03 | 2 | -0/+36 |
* | | | | Merge pull request #4815 from owncloud/ldap_improve_testing | Morris Jobke | 2013-10-04 | 19 | -235/+1065 |
|\ \ \ \ | |||||
| * | | | | remove outdated (thus failing) and anyway insufficient group tests - for now | Arthur Schiwon | 2013-09-27 | 1 | -46/+0 |
| * | | | | give test file a proper name | Arthur Schiwon | 2013-09-27 | 1 | -0/+0 |
| * | | | | added user_ldap tests via public api calls | Arthur Schiwon | 2013-09-27 | 1 | -14/+112 |
| * | | | | LDAP: don't throw exceptions in the wrapper, errors are handled in the code. ... | Arthur Schiwon | 2013-09-27 | 1 | -3/+5 |
| * | | | | LDAP: coding style | Arthur Schiwon | 2013-09-27 | 9 | -18/+34 |
| * | | | | LDAP: simple tests for the user backend | Arthur Schiwon | 2013-09-27 | 1 | -0/+313 |
| * | | | | LDAP: get rid of some PHP Warnings | Arthur Schiwon | 2013-09-27 | 1 | -1/+6 |
| * | | | | LDAP: make Access be a dependency to the user and group backend instead of in... | Arthur Schiwon | 2013-09-27 | 16 | -173/+225 |
| * | | | | Whitespaces | Arthur Schiwon | 2013-09-27 | 1 | -2/+0 |
| * | | | | LDAP: don't check var type when you can specify the type in the parameter list | Arthur Schiwon | 2013-09-27 | 1 | -7/+3 |
| * | | | | LDAP: use wrapper, not direct function call | Arthur Schiwon | 2013-09-27 | 1 | -1/+1 |
| * | | | | LDAP: add phpdoc | Arthur Schiwon | 2013-09-27 | 1 | -0/+1 |
| * | | | | LDAP: establish wrapper interface to allow proper mocking | Arthur Schiwon | 2013-09-27 | 4 | -28/+275 |
| * | | | | LDAP: move is_resource check to ldap wrapper to make it mockable | Arthur Schiwon | 2013-09-27 | 3 | -8/+19 |
| * | | | | LDAP: move PHP LDAP functions calls to an LDAP Wrapper for better isolation a... | Arthur Schiwon | 2013-09-27 | 3 | -11/+147 |
| * | | | | Resolve merge conflict | Arthur Schiwon | 2013-09-27 | 1 | -11/+12 |
* | | | | | Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617 | Björn Schießle | 2013-10-04 | 15 | -50/+108 |
|\ \ \ \ \ | |||||
| * | | | | | Shortened notification message that was too long | Vincent Petry | 2013-10-04 | 1 | -1/+1 |
| * | | | | | fix hidden fieled name | Bjoern Schiessle | 2013-10-04 | 1 | -1/+1 |
| * | | | | | we don't know \OCA\Encryption\Session if the encryption app is not enabled, s... | Bjoern Schiessle | 2013-10-04 | 1 | -2/+2 |
| * | | | | | revert changes in personal template | Bjoern Schiessle | 2013-09-30 | 1 | -1/+1 |
| * | | | | | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-30 | 197 | -1755/+9331 |
| |\ \ \ \ \ | |||||
| * | | | | | | revert changes to 3rdparty submodule | Bjoern Schiessle | 2013-09-23 | 1 | -0/+0 |
| * | | | | | | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-23 | 699 | -13634/+32331 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-16 | 695 | -5049/+21693 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | remove test code | Bjoern Schiessle | 2013-09-06 | 1 | -1/+1 |
| * | | | | | | | | no longer enforce log out, but provide useful errors/warnings instead | Bjoern Schiessle | 2013-09-06 | 11 | -48/+42 |
| * | | | | | | | | re-added error.php | Bjoern Schiessle | 2013-09-06 | 1 | -0/+33 |
| * | | | | | | | | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-02 | 507 | -6361/+13845 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | error.php no longer needed | Bjoern Schiessle | 2013-09-02 | 1 | -23/+0 |
| * | | | | | | | | | improved documentation of the methods | Bjoern Schiessle | 2013-09-02 | 2 | -1/+4 |
| * | | | | | | | | | encryption error messages, distinguish between a re-enabled encryption app an... | Bjoern Schiessle | 2013-09-02 | 10 | -79/+48 |
| * | | | | | | | | | improved error messaging, initial commit | Bjoern Schiessle | 2013-08-30 | 7 | -43/+125 |
* | | | | | | | | | | Merge pull request #4902 from owncloud/repeat_recovery_password | Björn Schießle | 2013-10-04 | 2 | -27/+39 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | add/remove specific CSS class - not all classes | Morris Jobke | 2013-10-03 | 1 | -2/+2 |