summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into filesystemRobin Appelman2012-12-117-46/+55
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-112-2/+2
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-101-18/+18
| * Merge pull request #762 from owncloud/database_exceptionThomas Müller2012-12-081-10/+15
| |\
| | * dont handle database exception in OC_DBRobin Appelman2012-12-071-10/+15
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-12-081-9/+9
| |/
| * Merge pull request #182 from owncloud/fix-redirectBart Visscher2012-12-072-7/+11
| |\
| | * Fix warning about redirect_url not setBart Visscher2012-12-071-1/+1
| | * Remove uneeded new lineLukas Reschke2012-11-011-1/+0
| | * Check for redirect_url for logged in usersLukas Reschke2012-11-011-0/+7
| | * Make the redirect_url working againLukas Reschke2012-10-312-7/+5
* | | actually connect the filesystem hooks to the cache updaterRobin Appelman2012-12-111-0/+4
* | | fix cache behaviour for non existing filesRobin Appelman2012-12-111-13/+15
* | | catch error if old filecache table is not present during upgradeRobin Appelman2012-12-061-4/+8
* | | merge master into filesystemRobin Appelman2012-12-063-16/+13
|\| |
| * | one more undefined index errorBjörn Schießle2012-12-061-2/+2
| * | fix more undefined indexesBjörn Schießle2012-12-061-1/+1
| * | Merge pull request #647 from owncloud/fix_app_settings_navigationThomas Müller2012-12-052-1/+2
| |\ \
| | * | Move loading of all the apps to setting the active navigation entry.Bart Visscher2012-11-302-1/+2
| * | | Merge pull request #700 from eMerzh/fix_error_displayThomas Müller2012-12-051-14/+10
| |\ \ \
| | * | | Fix a dirty function preventing showing errorsBrice Maron2012-12-031-14/+10
| * | | | minified version no longer availableThomas Mueller2012-12-041-1/+1
| |/ / /
* | | | merge master into filesystemRobin Appelman2012-12-033-34/+34
|\| | |
| * | | Merge pull request #682 from VicDeo/masterThomas Müller2012-12-031-32/+27
| |\ \ \
| | * | | Clean KB entries processing codeVictor Dubiniuk2012-12-021-32/+27
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-031-1/+6
| |/ / /
| * | | Update lib/image.phpIsaac Rosenberg2012-12-011-1/+1
* | | | fix some edge cases while scanning the root of a storageRobin Appelman2012-12-022-4/+4
* | | | merge master into filesystemRobin Appelman2012-12-024-15/+32
|\| | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-024-15/+32
| * | | Merge pull request #619 from samtuke/versions_cacheBart Visscher2012-11-302-5/+31
| |\ \ \
| | * | | OC_FSV->copy now only caches files which are copied from data/user/filesSam Tuke2012-11-282-5/+31
| | |/ /
* | | | fail gracefully when no old filecache is present during upgradeRobin Appelman2012-12-011-1/+8
* | | | add upgrade path from old cache to preserve file id'sRobin Appelman2012-11-301-0/+50
* | | | merge master into filesystemRobin Appelman2012-11-3013-65/+141
|\| | |
| * | | use new obEnd function instead of ob_end_cleanRobin Appelman2012-11-293-3/+3
| * | | add function to safely end output bufferingRobin Appelman2012-11-291-3/+12
| * | | Cleaned up docblock commentsSam Tuke2012-11-281-21/+15
| |/ /
| * | Merge pull request #401 from owncloud/share_hooksJörn Friedrich Dreyer2012-11-282-12/+31
| |\ \
| | * | Rename install hook functions to register hookBart Visscher2012-11-151-9/+9
| | * | Create functions to install standard hooksBart Visscher2012-11-132-12/+31
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-281-1/+5
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-273-3/+21
| * | | Merge pull request #380 from butonic/feature_share_link_with_tokenJörn Friedrich Dreyer2012-11-263-22/+49
| |\ \ \
| | * | | readd fallback code for pre token linksJörn Friedrich Dreyer2012-11-231-1/+1
| | * | | implement share via link tokenJörn Friedrich Dreyer2012-11-203-21/+48
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-261-1/+5
* | | | | better check if we are passing a fileid to Cache::getRobin Appelman2012-11-251-1/+1
* | | | | sort output of getFolderContent by nameRobin Appelman2012-11-251-1/+1
* | | | | Merge branch 'master' into filesystemRobin Appelman2012-11-252-16/+35
|\| | | |