summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Code cleanup.Thomas Tanghus2012-06-091-11/+22
|
* Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4Thomas Tanghus2012-06-091-2/+2
|\
| * fix infinite redirect during setup for windows hostsRobin Appelman2012-06-091-1/+1
| |
| * fix loading of OC::$REQUESTEDAPP if WTFE the app parameter is given but ↵Georg Ehrke2012-06-081-1/+1
| | | | | | | | empty aka /?app
* | Contacts: Use POST instead of GET.Thomas Tanghus2012-06-093-5/+5
| |
* | Don't fix bugs not present in this branch ;-)Thomas Tanghus2012-06-081-1/+0
| |
* | Contacts: Closed stupid XSS hole. Thanks AnybodyElse ;-)Thomas Tanghus2012-06-081-0/+1
|/ | | | | | Conflicts: apps/contacts/ajax/uploadphoto.php
* code cleanup from previous commitBjoern Schiessle2012-06-081-1/+0
|
* Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4Bjoern Schiessle2012-06-081-1/+1
|\
| * typo in varArthur Schiwon2012-06-081-1/+1
| |
* | fix for bug #872: Folders not holding any images are ignored, even if they ↵Bjoern Schiessle2012-06-081-24/+30
|/ | | | hold subfolders with images
* backport the password salting fix.Frank Karlitschek2012-06-083-3/+8
| | | | a salt is generated during setup and used to salt the user password hases in the database backend
* Sharing, fix: connect to hooks from the correct classesArthur Schiwon2012-06-081-2/+2
|
* fixed broken lines in user tableBjoern Schiessle2012-06-082-2/+3
| | | | | | Conflicts: settings/css/settings.css
* LDAP: cache the results, reduce LDAP searchesArthur Schiwon2012-06-072-14/+39
|
* ldap: enable the destructorArthur Schiwon2012-06-071-0/+5
|
* Remove old internal mail call for password reset, fixes bug oc-934Michael Gapczynski2012-06-071-1/+0
| | | | | Conflicts: core/lostpassword/index.php
* ldap: correct query condition and determining of successArthur Schiwon2012-06-071-2/+12
|
* ldap: check index carefully, can be 0Arthur Schiwon2012-06-071-1/+1
|
* Migration: Fixed wrong download URL: ↵Thomas Tanghus2012-06-071-1/+1
| | | | http://forum.owncloud.org/viewtopic.php?f=4&t=2511
* Calendar: Added more explicit sync links and fixed indentation.Thomas Tanghus2012-06-071-34/+39
|
* Contacts: Import upload button was obscured on Android browser.Thomas Tanghus2012-06-072-2/+2
|
* fixed var name, $filename should be $foldernameBjoern Schiessle2012-06-061-1/+1
|
* LDPA: don't drop legal whitespaces when sanitizing DN. Fixes oc-914Arthur Schiwon2012-06-061-1/+1
|
* Corrected typos.Thomas Tanghus2012-06-061-3/+3
|
* Supress any warnings if log file does not existMichael Gapczynski2012-06-051-1/+1
|
* update translationsRobin Appelman2012-06-06533-8121/+27330
|
* prevent creating files with a / the nameRobin Appelman2012-06-063-0/+13
|
* show pictures in folder with special characters, e.g. '+'Bjoern Schiessle2012-06-051-1/+1
|
* fi login for hosts running n port 80Frank Karlitschek2012-06-051-2/+2
|
* linkTo instead of hard links in Files and Files_Archive. Hope that makes sense.Arthur Schiwon2012-06-053-5/+5
|
* CLI is no availabe in stable4Frank Karlitschek2012-06-051-7/+5
|
* more reliable host detection for reverse proxy scenariosFrank Karlitschek2012-06-051-7/+12
|
* xss vulnerability fixedBjoern Schiessle2012-06-051-3/+3
|
* xss vulnerability fixedBjoern Schiessle2012-06-051-3/+3
|
* Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4Arthur Schiwon2012-06-041-5/+4
|\
| * Validate email on saveTom Needham2012-06-041-5/+4
| |
* | load authentication apps before checking wether user exists. fixes oc-910Arthur Schiwon2012-06-041-6/+7
| |
* | make it possible to load apps seperately. needed to fix oc-910 without ↵Arthur Schiwon2012-06-041-19/+14
|/ | | | breaking oc-863
* update file paths in filecache when the parent is renamedRobin Appelman2012-06-041-0/+9
|
* prevent xss attacks by manipulating image file namesBjoern Schiessle2012-06-041-1/+1
|
* prevent xss attacks by manipulating text file namesBjoern Schiessle2012-06-041-1/+1
|
* don't allow user to delete Shared dir via webdav and sync client (bug #774)Bjoern Schiessle2012-06-041-2/+4
|
* no move (rename) operation for "Shared" directoryBjoern Schiessle2012-06-041-1/+1
|
* Don't allow user to delete, rename and re-share the "Shared" directoryBjoern Schiessle2012-06-043-4/+6
|
* commited a bit too much beforeArthur Schiwon2012-06-041-1/+0
|
* Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4Thomas Tanghus2012-06-042-2/+4
|\
| * Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4Arthur Schiwon2012-06-041-1/+2
| |\
| | * add deprecated warningFrank Karlitschek2012-06-041-1/+2
| | |
| * | LDAP: link to documentation on settings pageArthur Schiwon2012-06-041-1/+2
| |/