summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-255-0/+15
* Merge pull request #1862 from owncloud/whitespace-cleanupThomas Müller2013-02-2320-301/+297
|\
| * Whitespace fixesBart Visscher2013-02-2220-301/+297
* | [tx-robot] updated from transifexJenkins for ownCloud2013-02-231-1/+1
|/
* Merge pull request #1711 from owncloud/style-cleanupJörn Friedrich Dreyer2013-02-2213-55/+114
|\
| * Fix review issuesBart Visscher2013-02-221-13/+14
| * Join split translated stringsBart Visscher2013-02-211-2/+1
| * Style cleanup files_versionsBart Visscher2013-02-213-17/+26
| * Style cleanup files_trashbinBart Visscher2013-02-211-17/+36
| * Style cleanup files_sharingBart Visscher2013-02-218-19/+50
* | mount users home before write/read file to it, necessary to deal with externa...Björn Schießle2013-02-221-0/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-02-2264-57/+170
|/
* rename app to 'deleted files'Björn Schießle2013-02-211-1/+1
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-2113-28/+123
* Merge branch 'master' into trash_bin_delete_selectedThomas Mueller2013-02-2017-83/+73
|\
| * replaced for in loops with normal enumerating loops to fix #1803Bernhard Posselt2013-02-202-5/+5
| * 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 #1731 from owncloud/unknown-freespaceFrank Karlitschek2013-02-196-19/+2
| |\ \ \
| | * | | Give storage backends the option to define having no known free spaceRobin Appelman2013-02-166-19/+2
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-204-1/+19
* | | | | 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-1918-50/+135
|\| | | |
| * | | | 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-1914-11/+95
| * | | | | | | Merge pull request #1728 from owncloud/mountconfigThomas Müller2013-02-181-35/+15
| |\| | | | | |
| | * | | | | | 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-1842-108/+320
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Create new mountconfig files in jsonRobin Appelman2013-02-161-31/+14
| | * | | | | | | Use a parser to read custom mount configuration instead of including the php ...Robin Appelman2013-02-161-1/+2
| | | |_|_|/ / / | | |/| | | | |