Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #5230 from owncloud/trashbin_fixes | Björn Schießle | 2013-10-09 | 3 | -149/+128 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | Trashbin fixes | |||||
| * | | | | | | | | | | | | | | | 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 | |||||
| * | | | | | | | | | | | | | | | Fixed login warning style #5065 | Vincent Petry | 2013-10-09 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed bold so it takes less space and set alignment to left. | |||||
* | | | | | | | | | | | | | | | | Merge pull request #5070 from owncloud/smb-streamwrapper-fixes | Thomas Müller | 2013-10-09 | 3 | -15/+40 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | Various fixes for the streamwrapper based SMB backend | |||||
| * | | | | | | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | catch unknown timezone and fall-back to UTC | |||||
| * | | | | | | | | | | | | | | | | 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 | |||||
| * | | | | | | | | | | | | | | | | Added filesApp flag as input field for files app detection | Vincent Petry | 2013-10-08 | 2 | -0/+2 | |
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the files app can be reached under multiple URLs, either root, files.php or public.php, a flag has been added to the DOM to help apps (like file viewers) to detect whether they are currently in the files app. | |||||
* | | | | | | | | | | | | | | | | Merge pull request #5032 from owncloud/fixing-5006-master | Andreas Fischer | 2013-10-08 | 3 | -13/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test OC_User_Database in Test_User_Database instead of OC_User_Dummy. * owncloud/fixing-5006-master: Use strict comparison === instead of ==. Adjust return value tests for checkPassword() to what OC_User_Example says. Make OC_User_Dummy::checkPassword() compatible with OC_User_Example. Use parent:: in Test_User_Database::getUser(). Test_User_Backend::getUser() does not return an array, it returns a string. Test OC_User_Database in Test_User_Database instead of OC_User_Dummy. | |||||
| * | | | | | | | | | | | | | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user id has to be returned. | |||||
| * | | | | | | | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | User::delete should return bool | |||||
| * | | | | | | | | | | | | | | | 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 | |||||
| * | | | | | | | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | OC_App: Cache list of enabled apps | |||||
| * | | | | | | | | | | | | | | | | OC_App: Cache list of enabled apps | Markus Goetz | 2013-10-05 | 1 | -3/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In my test here 1 SELECT instead of 5 (when doing a DAV request, probably similar for other requests) | |||||
* | | | | | | | | | | | | | | | | | fix escaping | Morris Jobke | 2013-10-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | make sure that we only remove file/folder shares | Bjoern Schiessle | 2013-10-08 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge pull request #5194 from owncloud/fixing-5172-master | Thomas Müller | 2013-10-08 | 2 | -13/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adding check isDeletable() on $sourcePath | |||||
| * | | | | | | | | | | | | | | | | | adding check isDeletable() on $sourcePath | Thomas Müller | 2013-10-08 | 2 | -13/+22 | |
| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge pull request #5193 from owncloud/fix_5126_2 | Björn Schießle | 2013-10-08 | 2 | -2/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix upload to /Shared | |||||
| * | | | | | | | | | | | | | | | | | | part file needs to have .part extension | Bjoern Schiessle | 2013-10-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | updating a existing large file creates new file chunks. Therefore ↵ | Bjoern Schiessle | 2013-10-08 | 1 | -2/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | createFile() needs to check not only if we can write to the parent folder but also if we can update the existing file" | |||||
| * | | | | | | | | | | | | | | | | | | If a existing file in Shared/ with update permissions gets updated we need ↵ | Bjoern Schiessle | 2013-10-08 | 1 | -0/+11 | |
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to write the .part file to a different place because we can't create new files in the Shared folder | |||||
* / / / / / / / / / / / / / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-08 | 34 | -113/+176 | |
|/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | Merge pull request #5181 from owncloud/fixing-chunked-upload-master | Morris Jobke | 2013-10-07 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | Fixing broken chunked upload due to #4974 | |||||
| * | | | | | | | | | | | | | | | | the path for reassembling was created the wrong way | Thomas Müller | 2013-10-07 | 1 | -2/+2 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #4796 from owncloud/config-no-catch | Bart Visscher | 2013-10-07 | 1 | -10/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the exception catch in OC_Config, this should be handled by a higher layer | |||||
| * | | | | | | | | | | | | | | | | Remove the exception catch, this should be handled by a higher layer | Bart Visscher | 2013-10-07 | 1 | -10/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And is when using index.php as entry point | |||||
* | | | | | | | | | | | | | | | | | Merge pull request #5184 from owncloud/fix-trash-bin-button | VicDeo | 2013-10-07 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix trash bin button | |||||
| * | | | | | | | | | | | | | | | | | Fix trash bin button | Morris Jobke | 2013-10-07 | 1 | -2/+4 | |
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |