summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 5.0.0 beta 1v5.0.0beta1Frank Karlitschek2013-02-201-2/+2
|
* Merge pull request #1738 from owncloud/fix_multiselect_in_settingsFrank Karlitschek2013-02-201-2/+3
|\ | | | | Extra position check for multiselect dropdown. Fix app/issues/575
| * Extra position check for multiselect dropdown. Fix app/issues/575Thomas Tanghus2013-02-161-2/+3
| |
* | Merge pull request #1753 from owncloud/Extra_infoFrank Karlitschek2013-02-201-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 fileVicDeo2013-02-181-3/+4
| | |
* | | Merge pull request #1787 from maelzx/patch-1Frank Karlitschek2013-02-201-1/+9
|\ \ \ | | | | | | | | Update apps/files_versions/js/versions.js
| * | | Update apps/files_versions/js/versions.jsmaelzx2013-02-201-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_apiBjörn Schießle2013-02-203-55/+35
|\ \ \ \ | | | | | | | | | | Versioning app use new filesystem api
| * | | | fix getUidAndFilename() functionBjörn Schießle2013-02-182-46/+23
| | | | |
| * | | | make store function staticBjörn Schießle2013-02-141-1/+1
| | | | |
| * | | | use new filesystem to mount users homeBjörn Schießle2013-02-141-3/+13
| | | | |
| * | | | don't use OC_FilesystemView()Björn Schießle2013-02-101-16/+9
| | | | |
* | | | | Merge pull request #1790 from owncloud/update_office_iconsJan-Christoph Borchardt2013-02-205-0/+0
|\ \ \ \ \ | |_|/ / / |/| | | | Update office icons
| * | | | Update office iconsJörn Friedrich Dreyer2013-02-205-0/+0
|/ / / /
* | | | Merge pull request #1731 from owncloud/unknown-freespaceFrank Karlitschek2013-02-1910-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 spaceRobin Appelman2013-02-171-6/+9
| | | | |
| * | | | Give storage backends the option to define having no known free spaceRobin Appelman2013-02-169-21/+19
| | | | | | | | | | | | | | | | | | | | When this is the case only the configured max upload size is taking into account for uploading
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-2028-110/+182
| | | | |
* | | | | Merge pull request #1720 from owncloud/usermenu-cssFrank Karlitschek2013-02-191-2/+2
|\ \ \ \ \ | | | | | | | | | | | | fix erroneous CSS, remove obsolete selectors
| * | | | | fix erroneous CSS, remove obsolete selectorsJan-Christoph Borchardt2013-02-151-2/+2
| |/ / / /
* | | | | Merge pull request #1740 from houqp/issue#1688Björn Schießle2013-02-192-3/+24
|\ \ \ \ \ | | | | | | | | | | | | Bug fix for Issue#1688
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of checking delted file size, we do a real check. this fixes #1688
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix for Undelete directory action
| * | | | | | Calculate size for existing directories onlyVictor Dubiniuk2013-02-181-0/+3
| | | | | | |
* | | | | | | Merge pull request #1771 from owncloud/mountconfigThomas Müller2013-02-181-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | JSON mount config: no pretty print
| * | | | | | | 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
|\| | | | | | | | | | | | | | | | | | | | | | | Use json for new mount configuration files
| * | | | | | | 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
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | files
* | | | | | | | 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...
| * | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix changing user password at 'Personal' page. Ref #1693
| * | | | | | | 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 database
| * | | | | | | 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 routing
| * | | | | | fix redirect, use the new routingBjörn Schießle2013-02-181-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #1751 from owncloud/sanitizeHTMLFrank Karlitschek2013-02-182-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Sanitize html
| * | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Style cleanup files_external