summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* remove unused OC_L10NThomas Müller2013-09-131-1/+0
* adding TB and GB to OC_Helper::humanFileSizeThomas Müller2013-09-131-2/+9
* Merge pull request #4719 from owncloud/port_4701_masterThomas Müller2013-09-1212-73/+103
|\
| * more is_resource checks before readdirArthur Schiwon2013-09-053-23/+30
| * Always check variable type before using readdir to avoid surprisesArthur Schiwon2013-09-049-50/+73
* | adding icons for shared folders and external foldersThomas Müller2013-09-121-0/+8
* | Merge pull request #4798 from owncloud/fixing-variable-typos-masterVicDeo2013-09-111-3/+3
|\ \
| * | no further comment - which dev did not test this BEFORE submitting the pull r...Thomas Müller2013-09-111-3/+3
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-111-4/+18
|/ /
* | Merge pull request #4472 from owncloud/remove-disconnectAndreas Fischer2013-09-101-12/+0
|\ \
| * | Remove disconnect function from OC_DBBart Visscher2013-08-161-12/+0
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-103-12/+12
* | | Merge pull request #4757 from owncloud/deleteAll-aliasThomas Müller2013-09-091-1/+1
|\ \ \
| * | | change View->deleteAll to an alias of View->rmdir since rmdir works recursiveRobin Appelman2013-09-071-1/+1
* | | | Merge pull request #4772 from owncloud/preview_improvementsThomas Müller2013-09-091-4/+4
|\ \ \ \
| * | | | use avconv instead of ffmpegGeorg Ehrke2013-09-051-4/+4
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-081-5/+5
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-075-1/+26
| |/ / / |/| | |
* | | | remove some more debug outputBjoern Schiessle2013-09-061-2/+0
* | | | remove some error_logsBjoern Schiessle2013-09-061-1/+0
* | | | remove error logsBjoern Schiessle2013-09-061-2/+2
* | | | if the files doesn't exist yet we start with the parent to search for sharesBjoern Schiessle2013-09-061-4/+12
* | | | Revert "fixes #4574"Thomas Müller2013-09-061-10/+5
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-053-8/+43
|/ / /
* | | Merge pull request #4477 from owncloud/hooks-viewBernhard Posselt2013-09-041-32/+57
|\ \ \ | |_|/ |/| |
| * | also emit hooks for views that are a subfolder of the user folderRobin Appelman2013-08-171-32/+57
| |/
* | Merge pull request #4449 from owncloud/clean_up_utilMorris Jobke2013-09-0310-231/+307
|\ \
| * \ Merge branch 'master' into clean_up_utilkondou2013-09-0255-337/+2197
| |\ \
| * | | Fix some phpdoc and camelcasekondou2013-08-231-15/+17
| * | | fixing typosThomas Müller2013-08-221-9/+10
| * | | Merge branch 'master' into clean_up_utilkondou2013-08-20116-766/+1124
| |\ \ \
| * | | | Fix some naming and spacing in lib/util.phpkondou2013-08-182-12/+17
| * | | | Clean up \OC\Utilkondou2013-08-1510-211/+279
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-031-4/+4
* | | | | Merge pull request #4672 from owncloud/ocs_cleanupblizzz2013-09-021-49/+0
|\ \ \ \ \
| * | | | | remove knowledgebase calls that are no longer used in ownCloud 5/6Frank Karlitschek2013-08-311-49/+0
* | | | | | Merge pull request #4673 from owncloud/ocsapi_cleanupJörn Friedrich Dreyer2013-09-021-28/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | remove the activity call here. it is not implemented anyways. This will be pr...Frank Karlitschek2013-08-311-28/+0
| |/ / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-013-0/+25
* | | | | Merge pull request #4329 from owncloud/fix_4258Christopher2013-09-011-136/+165
|\ \ \ \ \
| * | | | | Check for $this->fileInfo and @depend on testData()kondou2013-09-011-2/+2
| * | | | | Merge branch 'master' into fix_4258kondou2013-08-3119-2/+1392
| |\| | | |
| * | | | | Fix #4258, clean up \OC_Image and improve its unittestkondou2013-08-301-136/+165
* | | | | | fixing this obvious typo directlyFrank Karlitschek2013-09-011-1/+1
| |/ / / / |/| | | |
* | | | | Merge master into oc_previewGeorg Ehrke2013-08-3013-17/+189
|\| | | |
| * | | | Merge pull request #4661 from owncloud/separate-app-stylesJan-Christoph Borchardt2013-08-301-1/+3
| |\ \ \ \
| | * | | | move CSS for browser-specific fixes out of styles.css into new fixes.cssJan-Christoph Borchardt2013-08-301-0/+1
| | * | | | move CSS for apps out of styles.css into new apps.cssJan-Christoph Borchardt2013-08-301-1/+2
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-309-3/+168
| * | | | | Merge pull request #4578 from houbaastef/masterStephane Martin2013-08-301-5/+10
| |\ \ \ \ \