summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1476 from owncloud/disable-error-handler-while-running-ph...Thomas Müller2013-02-052-5/+7
|\
| * fix failing test cases due to wrong typingThomas Mueller2013-02-051-2/+2
| * disable error handler while running phpunitThomas Mueller2013-02-051-3/+5
* | offer change password only when the action is supported by the user backendArthur Schiwon2013-02-051-0/+18
* | Merge pull request #1474 from samtuke/masterLukas Reschke2013-02-052-9/+21
|\ \
| * | Minor improvement to commentsSam Tuke2013-02-051-7/+6
| * | Merge github.com:owncloud/coreSam Tuke2013-02-0524-151/+464
| |\ \
| * \ \ Merge github.com:owncloud/coreSam Tuke2013-01-3171-3361/+4563
| |\ \ \
| * \ \ \ Merge branch 'master' of github.com:owncloud/coreSam Tuke2013-01-2367-954/+1026
| |\ \ \ \
| * | | | | Added two hooks: pre_unshare and pre_unshareAll, useful for files_encryptionSam Tuke2013-01-141-0/+13
* | | | | | spell checkThomas Mueller2013-02-051-1/+1
* | | | | | pass the argument to the ctorThomas Mueller2013-02-051-1/+1
| |_|_|_|/ |/| | | |
* | | | | setlocale test is pointless on WindowsThomas Mueller2013-02-051-0/+5
* | | | | new function \OC_Util::runningOnWindows()Thomas Mueller2013-02-051-0/+7
| |_|_|/ |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-052-2/+37
* | | | Merge pull request #1449 from owncloud/fixing-namespace-local-storage-masterThomas Müller2013-02-041-2/+2
|\ \ \ \
| * | | | fixing namespaceThomas Mueller2013-02-041-2/+2
* | | | | Merge pull request #1234 from owncloud/fix-issue-192Thomas Müller2013-02-041-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix sharing issue with collection and children mismatchesMichael Gapczynski2013-01-191-1/+2
* | | | | Merge pull request #1444 from owncloud/writable-temp-folder-for-session-data-...Thomas Müller2013-02-041-0/+11
|\ \ \ \ \
| * | | | | in case file based session handling in enabled - we need to make sure the con...Thomas Mueller2013-02-041-0/+11
* | | | | | Merge pull request #1445 from owncloud/CSP_fontThomas Müller2013-02-041-1/+1
|\ \ \ \ \ \
| * | | | | | Also allow local filesLukas Reschke2013-02-041-1/+1
| * | | | | | Allow the loading of local font files embedded via data:Lukas Reschke2013-02-041-1/+1
| * | | | | | Allow loading of external fontsLukas Reschke2013-02-041-1/+1
* | | | | | | Merge pull request #1427 from TheSFReader/masterThomas Müller2013-02-041-1/+7
|\ \ \ \ \ \ \
| * | | | | | | translate the mimtype/mimepart to readable in the searchByMime functionTheSFReader2013-02-031-1/+7
| |/ / / / / /
* | | | | | | Merge pull request #1436 from owncloud/cache_check_pathThomas Müller2013-02-041-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Cache: fix copy-paste errorsRobin Appelman2013-02-041-2/+2
| * | | | | | | Cache: check for invalid paths in getFileInfo/getDirectoryContentRobin Appelman2013-02-031-0/+6
* | | | | | | | Merge pull request #1423 from owncloud/getownerThomas Müller2013-02-042-0/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Add getOwner to Filesystem and View classesMichael Gapczynski2013-02-022-0/+20
* | | | | | | | | Make fileblacklist configurableLukas Reschke2013-02-031-1/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #1416 from herbrechtsmeier/set_include_path_earlyThomas Müller2013-02-031-6/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | initPaths: set include path before any owncloud function is calledherbrechtsmeier2013-02-021-6/+7
| |/ / / / / / /
* | | | | | | | Merge pull request #1422 from TheSFReader/masterThomas Müller2013-02-031-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove a warning by making sure the renamed file is a dir before trying and o...TheSFReader2013-02-021-1/+1
| |/ / / / / / /
* | / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-02-031-1/+12
| |/ / / / / / |/| | | | | |
* | | | | | | Dav: update etag in filecache when doing a PROPSETRobin Appelman2013-02-021-1/+3
* | | | | | | Dav: don't overwrite etag from filecache with old etag from properties tableRobin Appelman2013-02-021-1/+3
|/ / / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-021-4/+4
* | | | | | Merge pull request #1413 from owncloud/enable_removing_search_providersFrank Karlitschek2013-02-011-0/+16
|\ \ \ \ \ \
| * | | | | | add function to remove a search providerJörn Friedrich Dreyer2013-02-011-0/+16
* | | | | | | Merge pull request #1384 from owncloud/upgrade_fixBart Visscher2013-02-011-70/+53
|\ \ \ \ \ \ \
| * | | | | | | Still load js files in maintance modeRobin Appelman2013-01-301-2/+6
| * | | | | | | Check for upgrade/maintance mode before trying to load an appRobin Appelman2013-01-301-70/+49
| |/ / / / / /
* | | | | | | Merge pull request #1171 from owncloud/move-datadirectory-checksThomas Müller2013-01-311-30/+28
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into move-datadirectory-checksMichael Gapczynski2013-01-1856-934/+963
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Move permissions check to new function checkDataDirectoryPermissions()Michael Gapczynski2013-01-181-28/+27
| * | | | | | | Move data directory permission checks after data directory existence checksMichael Gapczynski2013-01-121-29/+28