summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Check result only onceVictor Dubiniuk2013-10-041-3/+5
* Make mimetypes static. Jenkis will be happyVictor Dubiniuk2013-10-041-11/+11
* Load all mimetypes in one goVictor Dubiniuk2013-10-041-17/+20
* Merge pull request #5091 from guruz/webdav_connector_use_cache_for_etagMarkus Goetz2013-10-041-1/+8
|\
| * DAV: Use fileinfo_cache for ETagMarkus Goetz2013-10-031-1/+8
* | Merge pull request #4689 from owncloud/sharing_mail_notification_masterBjörn Schießle2013-10-0413-30/+263
|\ \
| * \ Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-10-0450-413/+1455
| |\ \ | |/ / |/| |
* | | Merge pull request #5107 from owncloud/user_skeletonThomas Müller2013-10-042-0/+35
|\ \ \
| * | | add a real examplefile instead of an .gitignore which is a bit stupid hereFrank Karlitschek2013-10-042-4/+5
| * | | ups. remove debugFrank Karlitschek2013-10-041-2/+0
| * | | use Filesystem::isIgnoredDirFrank Karlitschek2013-10-041-1/+1
| * | | fix typoFrank Karlitschek2013-10-041-1/+1
| * | | add public staticFrank Karlitschek2013-10-041-1/+1
| * | | make it possible to prepopulate a new user gome with a skeletonFrank Karlitschek2013-10-032-0/+36
* | | | Merge pull request #4815 from owncloud/ldap_improve_testingMorris Jobke2013-10-0419-235/+1065
|\ \ \ \
| * | | | remove outdated (thus failing) and anyway insufficient group tests - for nowArthur Schiwon2013-09-271-46/+0
| * | | | give test file a proper nameArthur Schiwon2013-09-271-0/+0
| * | | | added user_ldap tests via public api callsArthur Schiwon2013-09-271-14/+112
| * | | | LDAP: don't throw exceptions in the wrapper, errors are handled in the code. ...Arthur Schiwon2013-09-271-3/+5
| * | | | LDAP: coding styleArthur Schiwon2013-09-279-18/+34
| * | | | LDAP: simple tests for the user backendArthur Schiwon2013-09-271-0/+313
| * | | | LDAP: get rid of some PHP WarningsArthur Schiwon2013-09-271-1/+6
| * | | | LDAP: make Access be a dependency to the user and group backend instead of in...Arthur Schiwon2013-09-2716-173/+225
| * | | | WhitespacesArthur Schiwon2013-09-271-2/+0
| * | | | LDAP: don't check var type when you can specify the type in the parameter listArthur Schiwon2013-09-271-7/+3
| * | | | LDAP: use wrapper, not direct function callArthur Schiwon2013-09-271-1/+1
| * | | | LDAP: add phpdocArthur Schiwon2013-09-271-0/+1
| * | | | LDAP: establish wrapper interface to allow proper mockingArthur Schiwon2013-09-274-28/+275
| * | | | LDAP: move is_resource check to ldap wrapper to make it mockableArthur Schiwon2013-09-273-8/+19
| * | | | LDAP: move PHP LDAP functions calls to an LDAP Wrapper for better isolation a...Arthur Schiwon2013-09-273-11/+147
| * | | | Resolve merge conflictArthur Schiwon2013-09-271-11/+12
* | | | | Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617Björn Schießle2013-10-0415-50/+108
|\ \ \ \ \
| * | | | | Shortened notification message that was too longVincent Petry2013-10-041-1/+1
| * | | | | fix hidden fieled nameBjoern Schiessle2013-10-041-1/+1
| * | | | | we don't know \OCA\Encryption\Session if the encryption app is not enabled, s...Bjoern Schiessle2013-10-041-2/+2
| * | | | | revert changes in personal templateBjoern Schiessle2013-09-301-1/+1
| * | | | | Merge branch 'master' into encryption_improved_error_messages_4617Bjoern Schiessle2013-09-30197-1755/+9331
| |\ \ \ \ \
| * | | | | | revert changes to 3rdparty submoduleBjoern Schiessle2013-09-231-0/+0
| * | | | | | Merge branch 'master' into encryption_improved_error_messages_4617Bjoern Schiessle2013-09-23699-13634/+32331
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into encryption_improved_error_messages_4617Bjoern Schiessle2013-09-16695-5049/+21693
| |\ \ \ \ \ \ \
| * | | | | | | | remove test codeBjoern Schiessle2013-09-061-1/+1
| * | | | | | | | no longer enforce log out, but provide useful errors/warnings insteadBjoern Schiessle2013-09-0611-48/+42
| * | | | | | | | re-added error.phpBjoern Schiessle2013-09-061-0/+33
| * | | | | | | | Merge branch 'master' into encryption_improved_error_messages_4617Bjoern Schiessle2013-09-02507-6361/+13845
| |\ \ \ \ \ \ \ \
| * | | | | | | | | error.php no longer neededBjoern Schiessle2013-09-021-23/+0
| * | | | | | | | | improved documentation of the methodsBjoern Schiessle2013-09-022-1/+4
| * | | | | | | | | encryption error messages, distinguish between a re-enabled encryption app an...Bjoern Schiessle2013-09-0210-79/+48
| * | | | | | | | | improved error messaging, initial commitBjoern Schiessle2013-08-307-43/+125
* | | | | | | | | | Merge pull request #4902 from owncloud/repeat_recovery_passwordBjörn Schießle2013-10-042-27/+39
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add/remove specific CSS class - not all classesMorris Jobke2013-10-031-2/+2