Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.0.0 beta 1v5.0.0beta1 | Frank Karlitschek | 2013-02-20 | 1 | -2/+2 |
| | |||||
* | Merge pull request #1738 from owncloud/fix_multiselect_in_settings | Frank Karlitschek | 2013-02-20 | 1 | -2/+3 |
|\ | | | | | Extra position check for multiselect dropdown. Fix app/issues/575 | ||||
| * | Extra position check for multiselect dropdown. Fix app/issues/575 | Thomas Tanghus | 2013-02-16 | 1 | -2/+3 |
| | | |||||
* | | Merge pull request #1753 from owncloud/Extra_info | Frank Karlitschek | 2013-02-20 | 1 | -3/+4 |
|\ \ | | | | | | | Ability for the action handler to get more info on the current file | ||||
| * | | Add Ability to the app to detect more details on the file | VicDeo | 2013-02-18 | 1 | -3/+4 |
| | | | |||||
* | | | Merge pull request #1787 from maelzx/patch-1 | Frank Karlitschek | 2013-02-20 | 1 | -1/+9 |
|\ \ \ | | | | | | | | | Update apps/files_versions/js/versions.js | ||||
| * | | | Update apps/files_versions/js/versions.js | maelzx | 2013-02-20 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | Fix "All version..." button not clickable. Reason is Google Chrome blocking inline javascript execution. | ||||
* | | | | Merge pull request #1752 from schiesbn/versioning_use_new_filesystem_api | Björn Schießle | 2013-02-20 | 3 | -55/+35 |
|\ \ \ \ | | | | | | | | | | | Versioning app use new filesystem api | ||||
| * | | | | fix getUidAndFilename() function | Björn Schießle | 2013-02-18 | 2 | -46/+23 |
| | | | | | |||||
| * | | | | make store function static | Björn Schießle | 2013-02-14 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | use new filesystem to mount users home | Björn Schießle | 2013-02-14 | 1 | -3/+13 |
| | | | | | |||||
| * | | | | don't use OC_FilesystemView() | Björn Schießle | 2013-02-10 | 1 | -16/+9 |
| | | | | | |||||
* | | | | | Merge pull request #1790 from owncloud/update_office_icons | Jan-Christoph Borchardt | 2013-02-20 | 5 | -0/+0 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Update office icons | ||||
| * | | | | Update office icons | Jörn Friedrich Dreyer | 2013-02-20 | 5 | -0/+0 |
|/ / / / | |||||
* | | | | Merge pull request #1731 from owncloud/unknown-freespace | Frank Karlitschek | 2013-02-19 | 10 | -27/+28 |
|\ \ \ \ | | | | | | | | | | | Give storage backends the option to define having no known free space | ||||
| * | | | | Keep user quota into account when the storage backend has unkown free space | Robin Appelman | 2013-02-17 | 1 | -6/+9 |
| | | | | | |||||
| * | | | | Give storage backends the option to define having no known free space | Robin Appelman | 2013-02-16 | 9 | -21/+19 |
| | | | | | | | | | | | | | | | | | | | | When this is the case only the configured max upload size is taking into account for uploading | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-20 | 28 | -110/+182 |
| | | | | | |||||
* | | | | | Merge pull request #1720 from owncloud/usermenu-css | Frank Karlitschek | 2013-02-19 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | fix erroneous CSS, remove obsolete selectors | ||||
| * | | | | | fix erroneous CSS, remove obsolete selectors | Jan-Christoph Borchardt | 2013-02-15 | 1 | -2/+2 |
| |/ / / / | |||||
* | | | | | Merge pull request #1740 from houqp/issue#1688 | Björn Schießle | 2013-02-19 | 2 | -3/+24 |
|\ \ \ \ \ | | | | | | | | | | | | | Bug fix for Issue#1688 | ||||
| * | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of checking delted file size, we do a real check. this fixes #1688 | ||||
| * | | | | | 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 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix for Undelete directory action | ||||
| * | | | | | | 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 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | JSON mount config: no pretty print | ||||
| * | | | | | | | 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 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Use json for new mount configuration files | ||||
| * | | | | | | | 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 |
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | files | ||||
* | | | | | | | | 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... | ||||
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix changing user password at 'Personal' page. Ref #1693 | ||||
| * | | | | | | | 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 | ||||
| * | | | | | | | 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 | ||||
| * | | | | | | fix redirect, use the new routing | 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 | ||||
| * | | | | | 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 |
|\ \ \ \ \ | | | | | | | | | | | | | Style cleanup files_external |