summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove uneeded linesLukas Reschke2013-02-091-4/+1
* Merge pull request #1546 from owncloud/fix-loading-hooksThomas Müller2013-02-093-4/+19
|\
| * Always load the apps before trying to match a routeBart Visscher2013-02-081-0/+1
| * Better way of getting the navigation entries for an appBart Visscher2013-02-082-4/+18
* | Merge pull request #1543 from owncloud/utf8-locale-masterThomas Müller2013-02-093-9/+8
|\ \
| * | some systems use en_US.UTF8 instead of en_US.UTF-8Thomas Müller2013-02-083-9/+8
| |/
* | Merge pull request #1570 from owncloud/refactor_filelist_addFile_addDirThomas Müller2013-02-091-43/+88
|\ \
| * | extract common codeJörn Friedrich Dreyer2013-02-091-43/+88
* | | Merge pull request #1569 from owncloud/clean-app-idThomas Müller2013-02-098-4/+16
|\ \ \
| * \ \ Merge branch 'master' into clean-app-idThomas Müller2013-02-09310-1265/+5289
| |\ \ \
| * | | | Remove invalid characters from app id to prevent loading of invalid resourcesBart Visscher2013-02-098-4/+16
* | | | | Merge pull request #1575 from owncloud/exec_mimetypeBernhard Posselt2013-02-092-0/+2
|\ \ \ \ \
| * | | | | added icons and mimetypes for .msi and .exe filesBernhard Posselt2013-02-092-0/+2
* | | | | | Merge pull request #1383 from owncloud/files_encryption-style-fixesSam Tuke2013-02-0910-829/+685
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | cleanup - more to come afterThomas Müller2013-02-0910-568/+403
| * | | | | Merge branch 'master' into files_encryption-style-fixesSam Tuke2013-02-09800-10470/+20042
| |\ \ \ \ \
| * | | | | | Reverted erroneous commitSam Tuke2013-02-061-3/+6
| * | | | | | Merge branch 'master' into files_encryption-style-fixesSam Tuke2013-02-0525-1436/+1769
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into files_encryption-style-fixesSam Tuke2013-02-05886-18133/+35460
| |\ \ \ \ \ \ \
| * | | | | | | | Fixed todos: undefined vars and unreachable codeSam Tuke2013-02-053-34/+33
| * | | | | | | | first style fixes - @samtuke: I added some TODO regarding undefined variables...Thomas Mueller2013-01-302-455/+485
* | | | | | | | | Merge pull request #1561 from Raydiation/masterJörn Friedrich Dreyer2013-02-092-2/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | moved iframe height and width fix from js to cssBernhard Posselt2013-02-092-2/+5
* | | | | | | | | | Revert "moved iframe height and width fix from js to css"Bernhard Posselt2013-02-092-5/+2
* | | | | | | | | | Revert "added exe and msi filetypes and icon"Bernhard Posselt2013-02-092-2/+0
* | | | | | | | | | added exe and msi filetypes and iconBernhard Posselt2013-02-092-0/+2
* | | | | | | | | | moved iframe height and width fix from js to cssBernhard Posselt2013-02-092-2/+5
* | | | | | | | | | Merge pull request #1566 from owncloud/fixing-1505-masterThomas Müller2013-02-091-5/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | know your libraries ;-)Thomas Müller2013-02-091-5/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #1572 from owncloud/fix_empty_path_handlingicewind19912013-02-091-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix empty path handlingJörn Friedrich Dreyer2013-02-091-1/+1
| |/ / / / / / / /
* | | | | | | | | Remove unneeded __destruct call in OC\Files\Storage\TemporaryBart Visscher2013-02-091-1/+0
* | | | | | | | | json_encode the appidLukas Reschke2013-02-091-1/+1
* | | | | | | | | Merge pull request #1481 from owncloud/fixing-1354-masterThomas Müller2013-02-097-1/+77
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | in case curl is not present we cannot testThomas Müller2013-02-081-0/+4
| * | | | | | | | | Merge branch 'master' into fixing-1354-masterThomas Mueller2013-02-07496-7365/+8501
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | show webdav test results in admin section as wellThomas Mueller2013-02-072-0/+16
| * | | | | | | | | | Execute the post setup check after finishing the setupBart Visscher2013-02-064-23/+25
| * | | | | | | | | | basic WebDAV test in place nowThomas Mueller2013-02-052-0/+53
* | | | | | | | | | | Merge pull request #1512 from owncloud/mapped-filename-storageicewind19912013-02-096-4/+614
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | initial version of a local storage implementation which will use unique slugi...Thomas Mueller2013-02-066-4/+614
* | | | | | | | | | | Merge pull request #1565 from owncloud/fix_replacingJörn Friedrich Dreyer2013-02-091-3/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | remove code properlyGeorg Ehrke2013-02-091-3/+0
* | | | | | | | | | | Merge pull request #1560 from owncloud/fix_replacingBernhard Posselt2013-02-091-2/+2
|\| | | | | | | | | |
| * | | | | | | | | | remove (comment out) old code to fix replacing of filesGeorg Ehrke2013-02-091-2/+2
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #1545 from owncloud/fix-oc_webrootThomas Müller2013-02-091-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix-oc_webrootBart Visscher2013-02-081-1/+3
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge pull request #1537 from owncloud/fix_sharing_dropdown_event_handlersThomas Müller2013-02-091-60/+71
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | attach handlers to document instead of filelist, minor whitespace cleanupsJörn Friedrich Dreyer2013-02-081-60/+71
* | | | | | | | | | | Merge pull request #1562 from schiesbn/fix_namingBernhard Posselt2013-02-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-07 21:37:49 +0000