Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-10-04 | 38 | -378/+1293 |
|\ | |||||
| * | 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 |
| | * | | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-30 | 21 | -32/+142 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-23 | 153 | -820/+2691 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-16 | 147 | -664/+1277 |
| | |\ \ \ \ | |||||
| | * | | | | | 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 | 94 | -398/+656 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | 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 | 8 | -77/+46 |
| | * | | | | | | 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 |
| | * | | | | | | | fix license header line breaks | Morris Jobke | 2013-09-27 | 1 | -2/+4 |
| | * | | | | | | | remove spaces | Bjoern Schiessle | 2013-09-19 | 1 | -1/+1 |
| | * | | | | | | | remove debug output | Bjoern Schiessle | 2013-09-18 | 1 | -1/+1 |
| | * | | | | | | | let user repeat the recovery key password to prevent typos | Bjoern Schiessle | 2013-09-18 | 2 | -27/+37 |
| * | | | | | | | | increase height of controls bar and elements to more clickable 44px | Jan-Christoph Borchardt | 2013-10-04 | 2 | -32/+82 |
| * | | | | | | | | remove duplicate upload CSS from files.css | Jan-Christoph Borchardt | 2013-10-03 | 1 | -35/+0 |
* | | | | | | | | | Merge branch 'master' into sharing_mail_notification_master | Thomas Müller | 2013-10-02 | 4 | -14/+18 |
|\| | | | | | | | | |||||
| * | | | | | | | | Merge pull request #5093 from owncloud/file-actions | Jan-Christoph Borchardt | 2013-10-02 | 2 | -8/+13 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Takes nametext inside the anchor tag to fix the issue completely. | raghunayyar | 2013-10-02 | 1 | -8/+5 |
| | * | | | | | | | | Closes Label inside the a tag for not hiding the fileactions. | raghunayyar | 2013-10-02 | 2 | -2/+4 |
| | * | | | | | | | | File Selected on Click instead of download. | raghunayyar | 2013-10-02 | 2 | -1/+7 |
| * | | | | | | | | | simplify From Link icon in New menu | Jan-Christoph Borchardt | 2013-10-02 | 1 | -1/+1 |
| * | | | | | | | | | reduce rounded corners of New dropdown | Jan-Christoph Borchardt | 2013-10-02 | 1 | -1/+4 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Remove require in rawlist.php | kondou | 2013-10-02 | 1 | -4/+0 |
| * | | | | | | | | Fix require in apps/files/ajax/rawlist.php | kondou | 2013-10-02 | 1 | -1/+1 |