summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | 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
* | | | | | | | | | | | Merge pull request #5193 from owncloud/fix_5126_2Björn Schießle2013-10-082-2/+27
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | part file needs to have .part extensionBjoern Schiessle2013-10-081-1/+1
| * | | | | | | | | | | | updating a existing large file creates new file chunks. Therefore createFile(...Bjoern Schiessle2013-10-081-2/+16
| * | | | | | | | | | | | If a existing file in Shared/ with update permissions gets updated we need to...Bjoern Schiessle2013-10-081-0/+11
| |/ / / / / / / / / / /
* / / / / / / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-10-0834-113/+176
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #5181 from owncloud/fixing-chunked-upload-masterMorris Jobke2013-10-071-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | the path for reassembling was created the wrong wayThomas Müller2013-10-071-2/+2
* | | | | | | | | | | Merge pull request #4796 from owncloud/config-no-catchBart Visscher2013-10-071-10/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove the exception catch, this should be handled by a higher layerBart Visscher2013-10-071-10/+2
* | | | | | | | | | | | Merge pull request #5184 from owncloud/fix-trash-bin-buttonVicDeo2013-10-071-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix trash bin buttonMorris Jobke2013-10-071-2/+4
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-07121-1456/+5189
| |_|_|_|_|/ / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #5179 from owncloud/userlist-avatarMorris Jobke2013-10-071-0/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix new user avatar. Ref#5166Victor Dubiniuk2013-10-071-0/+6
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5178 from owncloud/sharing-ispublicflagintemplateVincent Petry2013-10-071-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added isPublic flag in files_sharing templateVincent Petry2013-10-071-0/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #4921 from owncloud/file_conflicts_dialog_fixesVicDeo2013-10-076-42/+7
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | remove double uri encodingJörn Friedrich Dreyer2013-10-071-4/+4
| * | | | | | | | | canceling individual uploads is currently impossible because there is no plac...Jörn Friedrich Dreyer2013-10-072-34/+1