| Commit message (Expand) | Author | Age | Files | Lines |
* | add timestamp to function call; fix trash.js to handle multiple delete operat... | Björn Schießle | 2013-02-19 | 2 | -5/+5 |
* | initialize $result | Björn Schießle | 2013-02-19 | 1 | -0/+1 |
* | rebase to master | Björn Schießle | 2013-02-19 | 74 | -614/+1048 |
|\ |
|
| * | Merge pull request #1740 from houqp/issue#1688 | Björn Schießle | 2013-02-19 | 2 | -3/+24 |
| |\ |
|
| | * | check filename and timestamp in Trashbin's file_exists method | Qingping Hou | 2013-02-18 | 1 | -3/+11 |
| | * | Properly delete empty directories in Trashbin | Qingping Hou | 2013-02-16 | 1 | -1/+3 |
| | * | add file_exists method to files_trashbin app | Qingping Hou | 2013-02-16 | 1 | -2/+13 |
| * | | Merge pull request #1764 from owncloud/Undelete_directory_fix | Lukas Reschke | 2013-02-19 | 1 | -0/+3 |
| |\ \ |
|
| | * | | Calculate size for existing directories only | Victor Dubiniuk | 2013-02-18 | 1 | -0/+3 |
| * | | | Merge pull request #1771 from owncloud/mountconfig | Thomas Müller | 2013-02-18 | 1 | -1/+1 |
| |\ \ \ |
|
| | * | | | no pretty print | Thomas Mueller | 2013-02-19 | 1 | -1/+1 |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-19 | 62 | -559/+752 |
| * | | | | Merge pull request #1728 from owncloud/mountconfig | Thomas Müller | 2013-02-18 | 3 | -44/+223 |
| |\| | | |
|
| | * | | | Merge branch 'mountconfig' of github.com:owncloud/core into mountconfig | Robin Appelman | 2013-02-18 | 1 | -1/+1 |
| | |\ \ \ |
|
| | | * | | | look where you are typing ... | Jörn Friedrich Dreyer | 2013-02-16 | 1 | -1/+1 |
| | | * | | | pretty print json | Jörn Friedrich Dreyer | 2013-02-16 | 1 | -1/+1 |
| | * | | | | merge master into mountconfig | Robin Appelman | 2013-02-18 | 127 | -965/+1378 |
| | |\ \ \ \
| | | |/ / /
| | |/| | | |
|
| | * | | | | Create new mountconfig files in json | Robin Appelman | 2013-02-16 | 2 | -35/+26 |
| | * | | | | Use a parser to read custom mount configuration instead of including the php ... | Robin Appelman | 2013-02-16 | 3 | -8/+200 |
| * | | | | | Merge pull request #1767 from owncloud/fixing-1766-master | Lukas Reschke | 2013-02-18 | 1 | -1/+0 |
| |\ \ \ \ \
| | |_|_|/ /
| |/| | | | |
|
| | * | | | | files_versions no longer contains a personal settings page -> remove the call | Thomas Mueller | 2013-02-18 | 1 | -1/+0 |
| |/ / / / |
|
| * | | | | Merge pull request #1762 from owncloud/user_password_fix | Thomas Müller | 2013-02-18 | 2 | -3/+3 |
| |\ \ \ \ |
|
| | * | | | | Do not set password if it has't provided | Victor Dubiniuk | 2013-02-18 | 1 | -2/+2 |
| | * | | | | Correct new password input name | Victor Dubiniuk | 2013-02-18 | 1 | -1/+1 |
| |/ / / / |
|
| * | | | | Merge pull request #1724 from owncloud/long-storage-id | Frank Karlitschek | 2013-02-18 | 4 | -4/+45 |
| |\ \ \ \ |
|
| | * | | | | Cache: hash long storage ids to ensure they fit in the database | Robin Appelman | 2013-02-15 | 4 | -4/+45 |
| | |/ / / |
|
| * | | | | Merge pull request #1759 from owncloud/redirect_fix_1737 | Thomas Müller | 2013-02-18 | 1 | -1/+1 |
| |\ \ \ \
| | |_|/ /
| |/| | | |
|
| | * | | | fix redirect, use the new routing | Björn Schießle | 2013-02-18 | 1 | -1/+1 |
* | | | | | change $_REQUEST to $_POST; fix check if file was successfully deleted | Björn Schießle | 2013-02-19 | 1 | -5/+6 |
* | | | | | add missing paramenter to post request | Björn Schießle | 2013-02-19 | 1 | -1/+1 |
* | | | | | use instead of | Björn Schießle | 2013-02-19 | 1 | -2/+2 |
* | | | | | allow user to delete selected files from the trash bin permanently | Björn Schießle | 2013-02-19 | 3 | -17/+72 |
* | | | | | remove obsolete variables | Björn Schießle | 2013-02-19 | 1 | -5/+1 |
* | | | | | close file handler after readdir() | Björn Schießle | 2013-02-18 | 1 | -1/+1 |
|/ / / / |
|
* | | | | Merge pull request #1751 from owncloud/sanitizeHTML | Frank Karlitschek | 2013-02-18 | 2 | -2/+2 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Sanitize HTML | Lukas Reschke | 2013-02-18 | 1 | -1/+1 |
| * | | | Sanitize user input | Lukas Reschke | 2013-02-18 | 1 | -1/+1 |
|/ / / |
|
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-18 | 55 | -551/+649 |
* | | | Merge pull request #1709 from owncloud/style-cleanup-files_external | Thomas Müller | 2013-02-17 | 2 | -6/+15 |
|\ \ \ |
|
| * | | | Join split translated strings | Bart Visscher | 2013-02-15 | 1 | -6/+2 |
| * | | | Style cleanup files_external | Bart Visscher | 2013-02-15 | 2 | -6/+19 |
* | | | | Merge pull request #1719 from owncloud/fixing-1659-master | Thomas Müller | 2013-02-17 | 4 | -15/+73 |
|\ \ \ \ |
|
| * | | | | class Mapper no respects an unchanged physical root which will be excluded fr... | Thomas Mueller | 2013-02-15 | 1 | -12/+12 |
| * | | | | fix error in recursive search | Thomas Mueller | 2013-02-15 | 1 | -3/+3 |
| * | | | | new test cases added to search in sub folders | Thomas Mueller | 2013-02-15 | 1 | -0/+16 |
| * | | | | folder should be created :-( | Thomas Mueller | 2013-02-15 | 1 | -0/+2 |
| * | | | | adding a new test class for mapped local using a dot in the datadir - reflect... | Thomas Mueller | 2013-02-15 | 1 | -0/+40 |
* | | | | | Merge pull request #1708 from owncloud/style-cleanup-user_ldap | Bernhard Posselt | 2013-02-17 | 9 | -69/+206 |
|\ \ \ \ \ |
|
| * | | | | | Join split translated strings | Bart Visscher | 2013-02-15 | 2 | -13/+6 |
| * | | | | | Join short comment lines | Bart Visscher | 2013-02-15 | 1 | -4/+2 |