summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #1456 from owncloud/gitignore-appsThomas Müller2013-02-051-0/+11
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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 namespaceThomas Mueller2013-02-041-2/+2
* | | | | | | Merge pull request #1432 from owncloud/add_requesttokenThomas Tanghus2013-02-042-1/+4
|\ \ \ \ \ \ \
| * | | | | | | [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()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 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-042-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #1427 from TheSFReader/masterThomas Müller2013-02-041-1/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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: 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
* | | | | | | | | | | Merge pull request #1434 from owncloud/trashbin_CSRFBjörn Schießle2013-02-041-3/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into from_live_to_onThomas Mueller2013-01-31589-9506/+17539
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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
* | | | | | | | | | | | | Merge pull request #1340 from owncloud/fixing-js-errors-public-link-masterThomas Müller2013-02-033-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | call ajax scan only if a user is logged in - otherwise we'll get a 500Thomas Mueller2013-01-311-0/+4
| * | | | | | | | | | | | | Merge branch 'master' into fixing-js-errors-public-link-masterThomas Mueller2013-01-31686-18789/+28813
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | call ajax scan only if a user is logged in - otherwise we'll get a 500Thomas Mueller2013-01-281-5/+7
| * | | | | | | | | | | | | include keyboardshortcuts.jsThomas Mueller2013-01-281-0/+1
| * | | | | | | | | | | | | fixing href for foldersThomas Mueller2013-01-281-1/+1
* | | | | | | | | | | | | | Merge pull request #1435 from owncloud/make_BlacklistConfigurableMichael Gapczynski2013-02-032-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Make fileblacklist configurableLukas Reschke2013-02-032-1/+4
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* / | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-0455-440/+600
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | fix CSS to coding guidelineJan-Christoph Borchardt2013-02-031-0/+13
* | | | | | | | | | | | | Password Toggle Support for Loginraghunayyar2013-02-035-4/+76
| |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | 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-032-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove a warning by making sure the renamed file is a dir before trying and o...TheSFReader2013-02-021-1/+1
| * | | | | | | | | | | | Merge remote-tracking branch 'refs/remotes/upstream/master'TheSFReader2013-02-02384-2276/+2477
| |\| | | | | | | | | | |