Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | the path need to be normalized before putting it into resolvePath() | Thomas Müller | 2013-10-10 | 2 | -1/+37 |
* | Merge pull request #5114 from owncloud/ldap_uuid_attr_groups | blizzz | 2013-10-10 | 6 | -152/+107 |
|\ | |||||
| * | LDAP: allow different UUID attributes for groups and users | Arthur Schiwon | 2013-10-04 | 6 | -152/+107 |
* | | Merge pull request #5221 from owncloud/fixing-5217-master | VicDeo | 2013-10-10 | 4 | -314/+11 |
|\ \ | |||||
| * | | php 5.3 compatibility for \OC\AppFramework\DependencyInjection\DIContainer | Thomas Müller | 2013-10-08 | 1 | -2/+3 |
| * | | php 5.3 compatibility for Test_Files_Sharing_Api | Thomas Müller | 2013-10-08 | 1 | -2/+4 |
| * | | php 5.3 compatibility for \OC\Files\Storage | Thomas Müller | 2013-10-08 | 1 | -279/+0 |
| * | | fixing php 5.3 compatibility | Thomas Müller | 2013-10-08 | 1 | -31/+4 |
* | | | Merge pull request #5210 from owncloud/sharing_search_users_fix | Björn Schießle | 2013-10-10 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | find users which are in the same group | Bjoern Schiessle | 2013-10-08 | 2 | -2/+2 |
* | | | | Merge pull request #5232 from owncloud/fixing-webdav-touch-master | Frank Karlitschek | 2013-10-10 | 1 | -6/+0 |
|\ \ \ \ | |||||
| * | | | | due to internal implementations touch will always be successful - $mtime will... | Thomas Müller | 2013-10-09 | 1 | -6/+0 |
* | | | | | Merge pull request #5245 from owncloud/file_put_contents-no-create | Frank Karlitschek | 2013-10-10 | 2 | -1/+27 |
|\ \ \ \ \ | |||||
| * | | | | | don't trigger the create hooks when if the file already exists for file_put_c... | Robin Appelman | 2013-10-09 | 2 | -1/+27 |
|/ / / / / | |||||
* | | | | | Merge pull request #5134 from owncloud/trashbin-homeiconbroken | Vincent Petry | 2013-10-09 | 1 | -3/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Do not call changeDirectory() when no dir set on breadcrumb | Vincent Petry | 2013-10-04 | 1 | -3/+6 |
* | | | | | | Merge pull request #5230 from owncloud/trashbin_fixes | Björn Schießle | 2013-10-09 | 3 | -149/+128 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | update file summary after group delete/restore | Bjoern Schiessle | 2013-10-09 | 1 | -0/+2 |
| * | | | | | fix checkbox | Bjoern Schiessle | 2013-10-09 | 1 | -37/+15 |
| * | | | | | fix indention | Bjoern Schiessle | 2013-10-09 | 1 | -99/+99 |
| * | | | | | fix group delete/restore | Bjoern Schiessle | 2013-10-09 | 2 | -19/+18 |
| * | | | | | fix delete/restore individual files | Bjoern Schiessle | 2013-10-09 | 1 | -26/+23 |
| * | | | | | fix trashbin layout | Bjoern Schiessle | 2013-10-09 | 1 | -0/+3 |
* | | | | | | 6.0 alpha 1 | Frank Karlitschek | 2013-10-09 | 1 | -2/+2 |
* | | | | | | Merge pull request #5183 from owncloud/login-warningstyle | Vincent Petry | 2013-10-09 | 1 | -2/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fixed login warning style #5065 | Vincent Petry | 2013-10-09 | 1 | -2/+1 |
* | | | | | | | Merge pull request #5070 from owncloud/smb-streamwrapper-fixes | Thomas Müller | 2013-10-09 | 3 | -15/+40 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | extend test case | Robin Appelman | 2013-10-02 | 1 | -0/+1 |
| * | | | | | | fix recursive delete for smb | Robin Appelman | 2013-10-01 | 1 | -0/+8 |
| * | | | | | | fix using touch to create a file for smb | Robin Appelman | 2013-10-01 | 1 | -12/+16 |
| * | | | | | | return the correct result when doing an smb rename | Robin Appelman | 2013-10-01 | 2 | -2/+9 |
| * | | | | | | fix smb streamwrapper on non existing files | Robin Appelman | 2013-10-01 | 1 | -1/+6 |
* | | | | | | | Merge pull request #5219 from owncloud/catch_wrong_timezone | Björn Schießle | 2013-10-09 | 1 | -2/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | changed default time format to ISO8601 | Bjoern Schiessle | 2013-10-09 | 1 | -1/+1 |
| * | | | | | | | catch unknown timezone and fall-back to UTC | Bjoern Schiessle | 2013-10-08 | 1 | -1/+5 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge pull request #5213 from owncloud/files-filesappdetectionhint | Morris Jobke | 2013-10-08 | 2 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Added filesApp flag as input field for files app detection | Vincent Petry | 2013-10-08 | 2 | -0/+2 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge pull request #5032 from owncloud/fixing-5006-master | Andreas Fischer | 2013-10-08 | 3 | -13/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use strict comparison === instead of ==. | Andreas Fischer | 2013-10-08 | 1 | -1/+1 |
| * | | | | | | | Adjust return value tests for checkPassword() to what OC_User_Example says. | Andreas Fischer | 2013-10-08 | 1 | -3/+3 |
| * | | | | | | | Make OC_User_Dummy::checkPassword() compatible with OC_User_Example. | Andreas Fischer | 2013-10-08 | 1 | -2/+2 |
| * | | | | | | | Use parent:: in Test_User_Database::getUser(). | Andreas Fischer | 2013-10-08 | 1 | -6/+1 |
| * | | | | | | | Test_User_Backend::getUser() does not return an array, it returns a string. | Andreas Fischer | 2013-10-08 | 1 | -1/+1 |
| * | | | | | | | Test OC_User_Database in Test_User_Database instead of OC_User_Dummy. | Andreas Fischer | 2013-10-08 | 1 | -1/+1 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #5188 from owncloud/master-delete-user | Thomas Müller | 2013-10-08 | 2 | -11/+45 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Add unit tests | Victor Dubiniuk | 2013-10-08 | 1 | -11/+41 |
| * | | | | | | User::delete should return bool | Victor Dubiniuk | 2013-10-07 | 1 | -0/+4 |
* | | | | | | | Merge pull request #5173 from owncloud/set_timezone_for_log | Björn Schießle | 2013-10-08 | 2 | -3/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | let admin specify timezone for log file entries | Bjoern Schiessle | 2013-10-07 | 2 | -3/+8 |
* | | | | | | | | Merge pull request #5146 from guruz/cache_enabled_apps_list | Frank Karlitschek | 2013-10-08 | 1 | -3/+10 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | |