summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into routingBart Visscher2012-08-3071-448/+662
|\
| * More info about not compatible apps (app id)Bart Visscher2012-08-291-1/+1
| * Fix filesystem setup for shared public link with logged in userBart Visscher2012-08-291-6/+12
| * $storage shouldn't be static in OC_Cache_FileMichael Gapczynski2012-08-291-1/+1
| * Fix shared storage working with user backend defined data directoriesMichael Gapczynski2012-08-291-9/+1
| * Space before tab fixesBart Visscher2012-08-2910-28/+28
| * Fix OC_Cache_FileBart Visscher2012-08-291-4/+4
| * Remove php close at end of fileBart Visscher2012-08-294-7/+0
| * Whitespace fixes in libBart Visscher2012-08-2957-326/+322
| * Delete old link if user sets a passwordMichael Gapczynski2012-08-291-0/+10
| * Fix password authentication for links and fix template problems for links by ...Michael Gapczynski2012-08-291-4/+6
| * fixing: apps/files/ajax/scan.phpThomas Mueller2012-08-291-1/+1
| * Remember storage view in OC_Cache_FileBart Visscher2012-08-281-1/+6
| * Clean user cache on loginBart Visscher2012-08-282-1/+23
| * Add background job for global file cache cleanupBart Visscher2012-08-282-6/+31
| * Check usernames in the database as case insensitive, they are still stored ca...Michael Gapczynski2012-08-281-2/+2
| * Allow share_with column to be null for linksMichael Gapczynski2012-08-281-1/+1
| * beta 1Frank Karlitschek2012-08-281-2/+3
| * Add Share API settings to admin pageMichael Gapczynski2012-08-271-17/+48
| * Fix share collection queryMichael Gapczynski2012-08-271-28/+34
| * Initial previewer for public linksMichael Gapczynski2012-08-273-16/+57
| * update now(), current_timestamp and backtick replacementJörn Friedrich Dreyer2012-08-271-4/+3
| * only mount every single homefolder when using sharing appGeorg Ehrke2012-08-271-3/+6
| * fix filesharing for multiple data directoriesGeorg Ehrke2012-08-271-2/+6
| * OC_User: getHome is an optional method, taking it out of the InterfaceArthur Schiwon2012-08-271-7/+0
| * Merge branch 'master' of github.com:owncloud/coreJörn Friedrich Dreyer2012-08-271-3/+3
| |\
| | * make use of OC_User::getHome in lib/migrate.phpGeorg Ehrke2012-08-271-3/+3
| * | return standard SQL values (sqlite3 understands CURRENT_...)Jörn Friedrich Dreyer2012-08-271-3/+3
| |/
| * Fix share getItems() limitMichael Gapczynski2012-08-261-2/+9
| * use OC_User::getHome in lib/filesystem.phpGeorg Ehrke2012-08-261-1/+1
| * enable user backends to define their own place where to store the dataGeorg Ehrke2012-08-261-3/+5
| * fix c&p fail from earlier commit todayGeorg Ehrke2012-08-263-3/+3
| * Merge branch 'master' of github.com:owncloud/coreGeorg Ehrke2012-08-262-5/+3
| |\
| | * Merge branch 'master' of github.com:owncloud/coreJörn Friedrich Dreyer2012-08-261-0/+1
| | |\
| | | * [tx-robot] updated from transifexJenkins for ownCloud2012-08-261-0/+1
| | * | fix sharing bug introduced with oracle supportjfd2012-08-261-5/+2
| | |/
| * | don't allow group admins to change admin's accountsGeorg Ehrke2012-08-261-0/+3
| * | implement getHome in OC_UserGeorg Ehrke2012-08-266-0/+75
| |/
* | Merge remote-tracking branch 'gitorious/master' into routingBart Visscher2012-08-2945-242/+1903
|\|
| * Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-su...Jörn Friedrich Dreyer2012-08-252-0/+50
| |\
| | * [tx-robot] updated from transifexJenkins for ownCloud2012-08-252-0/+50
| * | remove superflous LIMITjfd2012-08-251-1/+1
| * | fix missing $jfd2012-08-251-1/+1
| * | remove duplicate methodjfd2012-08-251-14/+0
| * | add backticks to SQL, use limit parameter instead of LIMIT SQLJörn Friedrich Dreyer2012-08-256-58/+56
| * | Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-su...Jörn Friedrich Dreyer2012-08-252-49/+31
| |\|
| | * Switch to using file cache ids instead of paths for file sharingMichael Gapczynski2012-08-242-49/+31
| * | Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-su...Jörn Friedrich Dreyer2012-08-25110-2417/+7169
| |\|
| | * [tx-robot] updated from transifexJenkins for ownCloud2012-08-244-5/+70
| | * Only load js and css once.Thomas Tanghus2012-08-231-11/+13