summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add phpunit configuration for autotest withou the json listener because this ↵Thomas Mueller2013-02-052-1/+15
| | | | pollutes the console
* fix failing test cases due to wrong typingThomas Mueller2013-02-051-2/+2
|
* disable error handler while running phpunitThomas Mueller2013-02-052-3/+8
|
* Merge pull request #1469 from owncloud/no-setlocale-on-windowsBart Visscher2013-02-051-0/+12
|\ | | | | No setlocale on windows
| * setlocale test is pointless on WindowsThomas Mueller2013-02-051-0/+5
| |
| * new function \OC_Util::runningOnWindows()Thomas Mueller2013-02-051-0/+7
| |
* | Merge pull request #1452 from owncloud/fix-breadcrumbMichael Gapczynski2013-02-051-1/+1
|\ \ | |/ |/| Remove undefined crumb variable from home breadcrumb
| * Remove undefined crumb variable from home breadcrumbMichael Gapczynski2013-02-041-1/+1
| |
* | Merge pull request #1429 from owncloud/fix_addNavigationJan-Christoph Borchardt2013-02-052-7/+2
|\ \ | | | | | | Make app icon linkable when enabling app.
| * | Remove superfluous appendThomas Tanghus2013-02-051-1/+0
| | |
| * | remove superfluous enabled-app class againJan-Christoph Borchardt2013-02-052-6/+1
| | |
| * | Merge branch 'master' into fix_addNavigationJan-Christoph Borchardt2013-02-05112-937/+1494
| |\|
| * | Make app icon linkable when enabling app.Thomas Tanghus2013-02-031-0/+1
| | |
* | | Merge pull request #1460 from owncloud/login-buttonJan-Christoph Borchardt2013-02-051-2/+2
|\ \ \ | | | | | | | | Login screen details
| * | | line up 'remember' text with checkboxJan-Christoph Borchardt2013-02-051-1/+1
| | | |
| * | | form detail on log in button, better shapeJan-Christoph Borchardt2013-02-051-1/+1
| | |/ | |/|
* | | Merge pull request #1456 from owncloud/gitignore-appsThomas Müller2013-02-051-0/+11
|\ \ \ | |/ / |/| | gitignore all apps except core ones
| * | gitignore all apps except core onesJan-Christoph Borchardt2013-02-051-0/+11
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2013-02-0556-476/+823
| |
* | Merge pull request #1449 from owncloud/fixing-namespace-local-storage-masterThomas Müller2013-02-041-2/+2
|\ \ | | | | | | fixing namespace in local storage
| * | fixing namespaceThomas Mueller2013-02-041-2/+2
| | |
* | | Merge pull request #1432 from owncloud/add_requesttokenThomas Tanghus2013-02-042-1/+4
|\ \ \ | | | | | | | | [user_webdavauth] add requesttoken
| * | | [user_webdavauth] add requesttokenLukas Reschke2013-02-032-1/+4
| | |/ | |/|
* | | Merge pull request #1442 from owncloud/reuse-oc_helper-tmpfolder-masterThomas Tanghus2013-02-041-4/+1
|\ \ \ | | | | | | | | reuse \OC_Helper::tmpFolder()
| * | | reuse \OC_Helper::tmpFolder()Thomas Mueller2013-02-041-4/+1
| | | |
* | | | Merge pull request #1234 from owncloud/fix-issue-192Thomas Müller2013-02-041-1/+2
|\ \ \ \ | |_|_|/ |/| | | Fix sharing issue with collection and children mismatches
| * | | Fix sharing issue with collection and children mismatchesMichael Gapczynski2013-01-191-1/+2
| | | |
* | | | Merge pull request #1444 from ↵Thomas Müller2013-02-041-0/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/writable-temp-folder-for-session-data-master in case file based session handling in enabled - we need to make sure th...
| * | | | in case file based session handling in enabled - we need to make sure the ↵Thomas Mueller2013-02-041-0/+11
| | | | | | | | | | | | | | | | | | | | configured folder is writable
* | | | | Merge pull request #1445 from owncloud/CSP_fontThomas Müller2013-02-042-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Allow loading of external fonts
| * | | | | Also allow local filesLukas Reschke2013-02-042-2/+2
| | | | | |
| * | | | | Allow the loading of local font files embedded via data:Lukas Reschke2013-02-042-2/+2
| | | | | |
| * | | | | Allow loading of external fontsLukas Reschke2013-02-042-2/+2
| | |_|_|/ | |/| | | | | | | | | | | | | Required by several applications like our pdf viewer
* | | | | Merge pull request #1427 from TheSFReader/masterThomas Müller2013-02-041-1/+7
|\ \ \ \ \ | | | | | | | | | | | | The mimetype/mimepart need to be readable, even from searchByMime
| * | | | | Merge remote-tracking branch 'refs/remotes/upstream/master'TheSFReader2013-02-035-4/+89
| |\| | | |
| * | | | | 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: check for invalid paths in getFileInfo/getDirectoryContent
| * | | | | 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 classes
| * | | | | | Add getOwner to Filesystem and View classesMichael Gapczynski2013-02-022-0/+20
| | | | | | |
* | | | | | | Merge pull request #1434 from owncloud/trashbin_CSRFBjörn Schießle2013-02-041-3/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [files_trashbin] Add CSRF token
| * | | | | | | OCP\JSON instead of OCP\UserLukas Reschke2013-02-041-1/+1
| | | | | | | |
| * | | | | | | [files_trashbin] Add CSRF tokenLukas Reschke2013-02-031-3/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #1229 from owncloud/from_live_to_onThomas Müller2013-02-038-40/+39
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | replace live() with on() in core js
| * \ \ \ \ \ \ Merge branch 'master' into from_live_to_onThomas Mueller2013-01-31589-9506/+17539
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_external/js/google.js
| * | | | | | | | use on instead of live in users.jsJörn Friedrich Dreyer2013-01-301-1/+1
| | | | | | | | |
| * | | | | | | | attach to filelist which is present on .ready()Jörn Friedrich Dreyer2013-01-301-13/+13
| | | | | | | | |
| * | | | | | | | attach on to filelist instead of individual td elements for file link behaviourJörn Friedrich Dreyer2013-01-301-1/+1
| | | | | | | | |
| * | | | | | | | replace live() with on() in core jsJörn Friedrich Dreyer2013-01-308-38/+38
| | | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-15 05:18:55 +0000