Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of gitorious.org:owncloud/owncloud | Bjoern Schiessle | 2012-06-15 | 4 | -24/+32 |
|\ | |||||
| * | Optimize WebDav access using OC_FileCache | Bart Visscher | 2012-06-15 | 3 | -23/+31 |
| | | |||||
| * | Files: Double encode download links. Fix for oc-1016. | Thomas Tanghus | 2012-06-15 | 1 | -1/+1 |
| | | |||||
* | | fixed xss vulnerability | Bjoern Schiessle | 2012-06-15 | 1 | -1/+1 |
|/ | |||||
* | Load app before running update script | Bart Visscher | 2012-06-15 | 1 | -0/+1 |
| | |||||
* | Disable minizing when DEBUG is true | Bart Visscher | 2012-06-15 | 2 | -2/+6 |
| | |||||
* | Merge commit 'refs/merge-requests/128' of ↵ | Bjoern Schiessle | 2012-06-15 | 2 | -24/+45 |
|\ | | | | | | | | | | | | | git://gitorious.org/owncloud/owncloud into merge-requests/128 Conflicts: apps/gallery/templates/index.php | ||||
| * | fixed handling of fallback_images | Stephan Bergemann | 2012-06-14 | 1 | -1/+4 |
| | | |||||
| * | fixed one issue with last directory in structure having a lot of | Stephan Bergemann | 2012-06-14 | 1 | -0/+5 |
| | | | | | | | | subdirectories and finally some pictures | ||||
| * | fixed bug #996: first picture in folder is repeated in the last position ↵ | Bjoern Schiessle | 2012-06-14 | 1 | -26/+26 |
| | | | | | | | | | | | | | | behaving like a directory Conflicts: apps/gallery/templates/index.php | ||||
| * | we don't neede the functions for empty stacks any more | Stephan Bergemann | 2012-06-14 | 1 | -16/+0 |
| | | |||||
| * | we don't have empty previewstacks any more - code cleaned up | Stephan Bergemann | 2012-06-14 | 1 | -25/+10 |
| | | |||||
| * | deleted some debugging output | Stephan Bergemann | 2012-06-14 | 1 | -1/+0 |
| | | |||||
| * | use images from deeper directories for preview if the actual directory ↵ | Stephan Bergemann | 2012-06-14 | 1 | -16/+29 |
| | | | | | | | | doesn't contain any | ||||
| * | improved look of directories not containing images directly | Stephan Bergemann | 2012-06-14 | 2 | -4/+4 |
| | | |||||
| * | now also working for directories only containing one image | Stephan Bergemann | 2012-06-14 | 1 | -1/+2 |
| | | |||||
| * | fixed second_level_images issue | Stephan Bergemann | 2012-06-14 | 1 | -3/+2 |
| | | |||||
| * | fixed sorting errors and missbehaviours - now sorting like file browser | Stephan Bergemann | 2012-06-14 | 2 | -35/+65 |
| | | |||||
* | | Update stylesheet for type=url. | Thomas Tanghus | 2012-06-15 | 1 | -3/+3 |
| | | |||||
* | | Use type=url for URL field. | Thomas Tanghus | 2012-06-15 | 1 | -1/+1 |
| | | |||||
* | | Fix upload for Google Drive; Google Documents List API documentation was ↵ | Michael Gapczynski | 2012-06-14 | 1 | -7/+9 |
| | | | | | | | | misleading | ||||
* | | Make sure there is a calendar after delete. | Thomas Tanghus | 2012-06-15 | 1 | -0/+4 |
| | | |||||
* | | Update calendar after delete. | Thomas Tanghus | 2012-06-15 | 1 | -0/+1 |
| | | |||||
* | | Only create new calendar when there are none. Fix oc-1007. | Thomas Tanghus | 2012-06-15 | 1 | -2/+4 |
| | | |||||
* | | Agree on argument type (cleaned this time). | Thomas Tanghus | 2012-06-15 | 4 | -7/+7 |
| | | |||||
* | | Revert "Agree on argument type." | Thomas Tanghus | 2012-06-15 | 4 | -10/+10 |
| | | | | | | | | This reverts commit 0f6b1be0e6f0cc6ff97c97190c7da67f5fee0294. | ||||
* | | Agree on argument type. | Thomas Tanghus | 2012-06-15 | 4 | -10/+10 |
| | | |||||
* | | No need to find calendar twice. | Thomas Tanghus | 2012-06-15 | 1 | -4/+1 |
| | | |||||
* | | Make events show again. | Thomas Tanghus | 2012-06-15 | 1 | -8/+7 |
| | | |||||
* | | Cleanup code. | Thomas Tanghus | 2012-06-14 | 1 | -10/+3 |
| | | |||||
* | | If Hr. Lerdorf had made up his mind on parameter order, life would have been ↵ | Thomas Tanghus | 2012-06-14 | 1 | -1/+1 |
| | | | | | | | | a lot easier... | ||||
* | | Forgot $ sign for variable | Michael Gapczynski | 2012-06-14 | 1 | -1/+1 |
| | | |||||
* | | Revert "Fix a counting mistake" | Michael Gapczynski | 2012-06-14 | 1 | -1/+1 |
| | | | | | | | | This reverts commit c20abfef388f9159e71b71c17a57d849faa5d913. | ||||
* | | first load compatibility.js | Thomas Mueller | 2012-06-14 | 1 | -2/+3 |
| | | |||||
* | | fix javascript error | Thomas Mueller | 2012-06-14 | 1 | -0/+4 |
| | | |||||
* | | reverting 8c7fa15aaf98e31646e4306e7819d1d2b725a7e1, differs between OC3 and 4 | Arthur Schiwon | 2012-06-14 | 1 | -2/+2 |
| | | |||||
* | | Check for '\' as well when searching for parent folders, because Windows ↵ | Michael Gapczynski | 2012-06-14 | 1 | -1/+1 |
| | | | | | | | | returns '\' for dirname() | ||||
* | | Contacts: Fixes for CSRF. | Thomas Tanghus | 2012-06-14 | 1 | -2/+2 |
| | | |||||
* | | Make requesttoken global. | Thomas Tanghus | 2012-06-14 | 1 | -1/+1 |
| | | |||||
* | | fixed bug #996: first picture in folder is repeated in the last position ↵ | Bjoern Schiessle | 2012-06-14 | 1 | -4/+2 |
| | | | | | | | | behaving like a directory | ||||
* | | prevent xss attacks also if some javascript ends up in the alt-tag | Bjoern Schiessle | 2012-06-14 | 2 | -2/+3 |
| | | |||||
* | | Merge branch 'master' of gitorious.org:owncloud/owncloud | Bjoern Schiessle | 2012-06-14 | 3 | -52/+48 |
|\ \ | |||||
| * | | White-space fix. | Thomas Tanghus | 2012-06-14 | 2 | -49/+45 |
| | | | |||||
| * | | Don't add slash if it's there already. | Thomas Tanghus | 2012-06-14 | 1 | -1/+1 |
| | | | |||||
| * | | Use the right csrf token. | Thomas Tanghus | 2012-06-14 | 1 | -2/+2 |
| | | | |||||
* | | | fixed xss vulnerability in un-packed version of jquery.fancybox and repack it | Bjoern Schiessle | 2012-06-14 | 2 | -794/+3 |
|/ / | |||||
* | | debugging output removed | Bjoern Schiessle | 2012-06-14 | 1 | -1/+0 |
| | | |||||
* | | xss vulnerability fixed for fancybox image viewer | Bjoern Schiessle | 2012-06-14 | 2 | -29/+777 |
| | | |||||
* | | suppress warning if /dev/urandom is not readable (bug #997) | Bjoern Schiessle | 2012-06-14 | 1 | -1/+1 |
|/ | |||||
* | fix another ui bug of calendar | Georg Ehrke | 2012-06-13 | 1 | -4/+6 |
| |