summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add timestamp to function call; fix trash.js to handle multiple delete operat...Björn Schießle2013-02-192-5/+5
* initialize $resultBjörn Schießle2013-02-191-0/+1
* rebase to masterBjörn Schießle2013-02-1974-614/+1048
|\
| * Merge pull request #1740 from houqp/issue#1688Björn Schießle2013-02-192-3/+24
| |\
| | * check filename and timestamp in Trashbin's file_exists methodQingping Hou2013-02-181-3/+11
| | * Properly delete empty directories in TrashbinQingping Hou2013-02-161-1/+3
| | * add file_exists method to files_trashbin appQingping Hou2013-02-161-2/+13
| * | Merge pull request #1764 from owncloud/Undelete_directory_fixLukas Reschke2013-02-191-0/+3
| |\ \
| | * | Calculate size for existing directories onlyVictor Dubiniuk2013-02-181-0/+3
| * | | Merge pull request #1771 from owncloud/mountconfigThomas Müller2013-02-181-1/+1
| |\ \ \
| | * | | no pretty printThomas Mueller2013-02-191-1/+1
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-1962-559/+752
| * | | | Merge pull request #1728 from owncloud/mountconfigThomas Müller2013-02-183-44/+223
| |\| | |
| | * | | Merge branch 'mountconfig' of github.com:owncloud/core into mountconfigRobin Appelman2013-02-181-1/+1
| | |\ \ \
| | | * | | look where you are typing ...Jörn Friedrich Dreyer2013-02-161-1/+1
| | | * | | pretty print jsonJörn Friedrich Dreyer2013-02-161-1/+1
| | * | | | merge master into mountconfigRobin Appelman2013-02-18127-965/+1378
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Create new mountconfig files in jsonRobin Appelman2013-02-162-35/+26
| | * | | | Use a parser to read custom mount configuration instead of including the php ...Robin Appelman2013-02-163-8/+200
| * | | | | Merge pull request #1767 from owncloud/fixing-1766-masterLukas Reschke2013-02-181-1/+0
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | files_versions no longer contains a personal settings page -> remove the callThomas Mueller2013-02-181-1/+0
| |/ / / /
| * | | | Merge pull request #1762 from owncloud/user_password_fixThomas Müller2013-02-182-3/+3
| |\ \ \ \
| | * | | | Do not set password if it has't providedVictor Dubiniuk2013-02-181-2/+2
| | * | | | Correct new password input nameVictor Dubiniuk2013-02-181-1/+1
| |/ / / /
| * | | | Merge pull request #1724 from owncloud/long-storage-idFrank Karlitschek2013-02-184-4/+45
| |\ \ \ \
| | * | | | Cache: hash long storage ids to ensure they fit in the databaseRobin Appelman2013-02-154-4/+45
| | |/ / /
| * | | | Merge pull request #1759 from owncloud/redirect_fix_1737Thomas Müller2013-02-181-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | fix redirect, use the new routingBjörn Schießle2013-02-181-1/+1
* | | | | change $_REQUEST to $_POST; fix check if file was successfully deletedBjörn Schießle2013-02-191-5/+6
* | | | | add missing paramenter to post requestBjörn Schießle2013-02-191-1/+1
* | | | | use instead ofBjörn Schießle2013-02-191-2/+2
* | | | | allow user to delete selected files from the trash bin permanentlyBjörn Schießle2013-02-193-17/+72
* | | | | remove obsolete variablesBjörn Schießle2013-02-191-5/+1
* | | | | close file handler after readdir()Björn Schießle2013-02-181-1/+1
|/ / / /
* | | | Merge pull request #1751 from owncloud/sanitizeHTMLFrank Karlitschek2013-02-182-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Sanitize HTMLLukas Reschke2013-02-181-1/+1
| * | | Sanitize user inputLukas Reschke2013-02-181-1/+1
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-1855-551/+649
* | | Merge pull request #1709 from owncloud/style-cleanup-files_externalThomas Müller2013-02-172-6/+15
|\ \ \
| * | | Join split translated stringsBart Visscher2013-02-151-6/+2
| * | | Style cleanup files_externalBart Visscher2013-02-152-6/+19
* | | | Merge pull request #1719 from owncloud/fixing-1659-masterThomas Müller2013-02-174-15/+73
|\ \ \ \
| * | | | class Mapper no respects an unchanged physical root which will be excluded fr...Thomas Mueller2013-02-151-12/+12
| * | | | fix error in recursive searchThomas Mueller2013-02-151-3/+3
| * | | | new test cases added to search in sub foldersThomas Mueller2013-02-151-0/+16
| * | | | folder should be created :-(Thomas Mueller2013-02-151-0/+2
| * | | | adding a new test class for mapped local using a dot in the datadir - reflect...Thomas Mueller2013-02-151-0/+40
* | | | | Merge pull request #1708 from owncloud/style-cleanup-user_ldapBernhard Posselt2013-02-179-69/+206
|\ \ \ \ \
| * | | | | Join split translated stringsBart Visscher2013-02-152-13/+6
| * | | | | Join short comment linesBart Visscher2013-02-151-4/+2