aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-21134-1230/+4224
* Merge pull request #1773 from owncloud/trash_bin_delete_selectedBjörn Schießle2013-02-206-33/+82
|\
| * Merge branch 'master' into trash_bin_delete_selectedThomas Mueller2013-02-2054-207/+274
| |\ | |/ |/|
* | Merge pull request #1809 from owncloud/fix_ie_deletefolderBjörn Schießle2013-02-202-5/+5
|\ \
| * | replaced for in loops with normal enumerating loops to fix #1803Bernhard Posselt2013-02-202-5/+5
|/ /
* | Merge pull request #1806 from eMerzh/ref_1799Bernhard Posselt2013-02-201-1/+5
|\ \
| * | Add message when trouble sending email ref #1799Brice Maron2013-02-201-1/+5
|/ /
* | 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/575Thomas Tanghus2013-02-161-2/+3
* | | Merge pull request #1753 from owncloud/Extra_infoFrank Karlitschek2013-02-201-3/+4
|\ \ \
| * | | 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.jsmaelzx2013-02-201-1/+9
* | | | | Merge pull request #1752 from schiesbn/versioning_use_new_filesystem_apiBjörn Schießle2013-02-203-55/+35
|\ \ \ \ \
| * | | | | 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 iconsJörn Friedrich Dreyer2013-02-205-0/+0
|/ / / / /
* | | | | Merge pull request #1731 from owncloud/unknown-freespaceFrank Karlitschek2013-02-1910-27/+28
|\ \ \ \ \
| * | | | | 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
* | | | | | [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 selectorsJan-Christoph Borchardt2013-02-151-2/+2
| |/ / / / /
| | | | | * change for loop to make it hopefully work with IEBjörn Schießle2013-02-201-1/+1
| | | | | * switch to json encoded file listBjörn Schießle2013-02-203-6/+8
| | | | | * use "|" as delimiter instead of ";", since "|" is not allowed in file/folder ...Björn Schießle2013-02-203-8/+4
| | | | | * 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
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |