summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-10-0438-378/+1293
|\
| * 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
| | * | Merge branch 'master' into encryption_improved_error_messages_4617Bjoern Schiessle2013-09-3021-32/+142
| | |\ \
| | * \ \ Merge branch 'master' into encryption_improved_error_messages_4617Bjoern Schiessle2013-09-23153-820/+2691
| | |\ \ \
| | * \ \ \ Merge branch 'master' into encryption_improved_error_messages_4617Bjoern Schiessle2013-09-16147-664/+1277
| | |\ \ \ \
| | * | | | | 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-0294-398/+656
| | |\ \ \ \ \
| | * | | | | | 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-028-77/+46
| | * | | | | | 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
| | * | | | | | | fix license header line breaksMorris Jobke2013-09-271-2/+4
| | * | | | | | | remove spacesBjoern Schiessle2013-09-191-1/+1
| | * | | | | | | remove debug outputBjoern Schiessle2013-09-181-1/+1
| | * | | | | | | let user repeat the recovery key password to prevent typosBjoern Schiessle2013-09-182-27/+37
| * | | | | | | | increase height of controls bar and elements to more clickable 44pxJan-Christoph Borchardt2013-10-042-32/+82
| * | | | | | | | remove duplicate upload CSS from files.cssJan-Christoph Borchardt2013-10-031-35/+0
* | | | | | | | | Merge branch 'master' into sharing_mail_notification_masterThomas Müller2013-10-024-14/+18
|\| | | | | | | |
| * | | | | | | | Merge pull request #5093 from owncloud/file-actionsJan-Christoph Borchardt2013-10-022-8/+13
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Takes nametext inside the anchor tag to fix the issue completely.raghunayyar2013-10-021-8/+5
| | * | | | | | | | Closes Label inside the a tag for not hiding the fileactions.raghunayyar2013-10-022-2/+4
| | * | | | | | | | File Selected on Click instead of download.raghunayyar2013-10-022-1/+7
| * | | | | | | | | simplify From Link icon in New menuJan-Christoph Borchardt2013-10-021-1/+1
| * | | | | | | | | reduce rounded corners of New dropdownJan-Christoph Borchardt2013-10-021-1/+4
| |/ / / / / / / /
| * | | | | | | | Remove require in rawlist.phpkondou2013-10-021-4/+0
| * | | | | | | | Fix require in apps/files/ajax/rawlist.phpkondou2013-10-021-1/+1