summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | php 5.3 compatibility for Test_Files_Sharing_ApiThomas Müller2013-10-081-2/+4
| * | | | | | | | | php 5.3 compatibility for \OC\Files\StorageThomas Müller2013-10-081-279/+0
| * | | | | | | | | fixing php 5.3 compatibilityThomas Müller2013-10-081-31/+4
* | | | | | | | | | Merge pull request #5210 from owncloud/sharing_search_users_fixBjörn Schießle2013-10-102-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | find users which are in the same groupBjoern Schiessle2013-10-082-2/+2
* | | | | | | | | | | Merge pull request #5232 from owncloud/fixing-webdav-touch-masterFrank Karlitschek2013-10-101-6/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | due to internal implementations touch will always be successful - $mtime will...Thomas Müller2013-10-091-6/+0
* | | | | | | | | | | | Merge pull request #5245 from owncloud/file_put_contents-no-createFrank Karlitschek2013-10-102-1/+27
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | don't trigger the create hooks when if the file already exists for file_put_c...Robin Appelman2013-10-092-1/+27
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #5134 from owncloud/trashbin-homeiconbrokenVincent Petry2013-10-091-3/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Do not call changeDirectory() when no dir set on breadcrumbVincent Petry2013-10-041-3/+6
* | | | | | | | | | | | Merge pull request #5230 from owncloud/trashbin_fixesBjörn Schießle2013-10-093-149/+128
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | update file summary after group delete/restoreBjoern Schiessle2013-10-091-0/+2
| * | | | | | | | | | | fix checkboxBjoern Schiessle2013-10-091-37/+15
| * | | | | | | | | | | fix indentionBjoern Schiessle2013-10-091-99/+99
| * | | | | | | | | | | fix group delete/restoreBjoern Schiessle2013-10-092-19/+18
| * | | | | | | | | | | fix delete/restore individual filesBjoern Schiessle2013-10-091-26/+23
| * | | | | | | | | | | fix trashbin layoutBjoern Schiessle2013-10-091-0/+3
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | 6.0 alpha 1Frank Karlitschek2013-10-091-2/+2
* | | | | | | | | | | Merge pull request #5183 from owncloud/login-warningstyleVincent Petry2013-10-091-2/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed login warning style #5065Vincent Petry2013-10-091-2/+1
* | | | | | | | | | | | Merge pull request #5070 from owncloud/smb-streamwrapper-fixesThomas Müller2013-10-093-15/+40
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | extend test caseRobin Appelman2013-10-021-0/+1
| * | | | | | | | | | | fix recursive delete for smbRobin Appelman2013-10-011-0/+8
| * | | | | | | | | | | fix using touch to create a file for smbRobin Appelman2013-10-011-12/+16
| * | | | | | | | | | | return the correct result when doing an smb renameRobin Appelman2013-10-012-2/+9
| * | | | | | | | | | | fix smb streamwrapper on non existing filesRobin Appelman2013-10-011-1/+6
* | | | | | | | | | | | Merge pull request #5219 from owncloud/catch_wrong_timezoneBjörn Schießle2013-10-091-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | changed default time format to ISO8601Bjoern Schiessle2013-10-091-1/+1
| * | | | | | | | | | | | catch unknown timezone and fall-back to UTCBjoern Schiessle2013-10-081-1/+5
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #5213 from owncloud/files-filesappdetectionhintMorris Jobke2013-10-082-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Added filesApp flag as input field for files app detectionVincent Petry2013-10-082-0/+2
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #5032 from owncloud/fixing-5006-masterAndreas Fischer2013-10-083-13/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use strict comparison === instead of ==.Andreas Fischer2013-10-081-1/+1
| * | | | | | | | | | | | Adjust return value tests for checkPassword() to what OC_User_Example says.Andreas Fischer2013-10-081-3/+3
| * | | | | | | | | | | | Make OC_User_Dummy::checkPassword() compatible with OC_User_Example.Andreas Fischer2013-10-081-2/+2
| * | | | | | | | | | | | Use parent:: in Test_User_Database::getUser().Andreas Fischer2013-10-081-6/+1
| * | | | | | | | | | | | Test_User_Backend::getUser() does not return an array, it returns a string.Andreas Fischer2013-10-081-1/+1
| * | | | | | | | | | | | Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.Andreas Fischer2013-10-081-1/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #5188 from owncloud/master-delete-userThomas Müller2013-10-082-11/+45
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add unit testsVictor Dubiniuk2013-10-081-11/+41
| * | | | | | | | | | | User::delete should return boolVictor Dubiniuk2013-10-071-0/+4
* | | | | | | | | | | | Merge pull request #5173 from owncloud/set_timezone_for_logBjörn Schießle2013-10-082-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | let admin specify timezone for log file entriesBjoern Schiessle2013-10-072-3/+8
* | | | | | | | | | | | | Merge pull request #5146 from guruz/cache_enabled_apps_listFrank Karlitschek2013-10-081-3/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | OC_App: Cache list of enabled appsMarkus Goetz2013-10-051-3/+10
* | | | | | | | | | | | | fix escapingMorris Jobke2013-10-081-1/+1
* | | | | | | | | | | | | make sure that we only remove file/folder sharesBjoern Schiessle2013-10-082-3/+3
* | | | | | | | | | | | | Merge pull request #5194 from owncloud/fixing-5172-masterThomas Müller2013-10-082-13/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | adding check isDeletable() on $sourcePathThomas Müller2013-10-082-13/+22