summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* removed closing php tagSam Tuke2012-05-221-3/+1
* prevent apps from printing output from app.phpFlorian Hülsmann2012-05-221-0/+3
* encryption is not yet compatible with ldapFrank Karlitschek2012-05-221-1/+1
* Contacts: XSS fix. Still some more to check.Thomas Tanghus2012-05-211-0/+3
* oc-657: icons for M$ office file typesThomas Mueller2012-05-213-0/+0
* dont throw errors when apps dont have types configuredRobin Appelman2012-05-201-1/+5
* files app is always enabledRobin Appelman2012-05-201-1/+1
* add warningFrank Karlitschek2012-05-201-1/+1
* Merge branch 'calendar_dropimport'Georg Ehrke2012-05-192-0/+119
|\
| * Merge branch 'master' into calendar_dropimportGeorg Ehrke2012-05-17777-70956/+34785
| |\
| * \ Merge branch 'master' into calendar_dropimportGeorg Ehrke2012-05-131-6/+10
| |\ \
| * | | some little js fixes for drop importGeorg Ehrke2012-05-131-2/+2
| * | | Merge branch 'master' into calendar_dropimportGeorg Ehrke2012-05-134-6/+7
| |\ \ \
| * | | | add first version of drop importGeorg Ehrke2012-05-132-0/+119
* | | | | this is 5 pre alpha nowFrank Karlitschek2012-05-191-2/+2
* | | | | Make sure sharing and versions dropdowns come down in the same location for a...v4.0.0Michael Gapczynski2012-05-191-1/+1
* | | | | some fixes for contacts, gallery and openidGeorg Ehrke2012-05-193-6/+0
* | | | | fix for calendarGeorg Ehrke2012-05-191-2/+1
* | | | | getStorage belongs to files not to apps.Frank Karlitschek2012-05-194-11/+11
* | | | | document the public classes a bit moreFrank Karlitschek2012-05-199-1/+25
* | | | | Fix check for when to store a new version of a fileMichael Gapczynski2012-05-181-2/+2
* | | | | Fix revert link on history page of file versionsMichael Gapczynski2012-05-181-1/+1
* | | | | Fix versioning of shared filesMichael Gapczynski2012-05-181-17/+51
* | | | | dont run update scripts for apps that arent enabledRobin Appelman2012-05-191-0/+3
* | | | | log upgradesRobin Appelman2012-05-192-1/+2
* | | | | strict standards fixes for sqlite3Robin Appelman2012-05-191-5/+5
* | | | | Fix redirect after login, prevent open redirectsMichael Gapczynski2012-05-182-3/+4
* | | | | Merge branch 'master' of gitorious.org:owncloud/owncloudv4.0.0RC2Frank Karlitschek2012-05-181-8/+19
|\ \ \ \ \
| * | | | | Forgot to actually call remove on the history dropdownMichael Gapczynski2012-05-181-0/+1
| * | | | | Remove the history dropdown before creating a new oneMichael Gapczynski2012-05-181-3/+11
| * | | | | Don't show the select form in the history dropdown if a file has no other ver...Michael Gapczynski2012-05-181-5/+7
* | | | | | don´t claim that already downloaded 3rd party apps are internal appsFrank Karlitschek2012-05-181-2/+7
|/ / / / /
* | | | | Merge branch 'master' of gitorious.org:owncloud/owncloudFrank Karlitschek2012-05-187-20/+29
|\ \ \ \ \
| * | | | | LDAP: we're 0.2 nowArthur Schiwon2012-05-181-1/+1
| * | | | | LDAP: only check once for name conflicts on update. Set a value on install as...Arthur Schiwon2012-05-182-15/+24
| * | | | | Contacts: Added MS opacity mumbo-jumbo that I can't test myself to file form ...Thomas Tanghus2012-05-181-1/+1
| * | | | | make upload work with IE againArthur Schiwon2012-05-181-1/+1
| * | | | | LDAP: update meta infoArthur Schiwon2012-05-181-1/+1
| * | | | | add htmlentities() call into login formMichiel de Jong2012-05-181-1/+1
* | | | | | "fopen(" interferes with our own classes.Frank Karlitschek2012-05-181-1/+1
|/ / / / /
* | | | | mark the apps as part of the shipped package and increase the requirement to ...Frank Karlitschek2012-05-1823-30/+53
* | | | | Merge branch 'master' of gitorious.org:owncloud/owncloudFrank Karlitschek2012-05-186-27/+57
|\ \ \ \ \
| * | | | | this code looks wrong to me but i'm putting it back while we find out what th...Michiel de Jong2012-05-181-1/+1
| * | | | | make redirect safe by restricting it to current hostMichiel de Jong2012-05-182-2/+2
| * | | | | fix redirect to desired page after loginMichiel de Jong2012-05-182-2/+2
| * | | | | LDAP: don't make us of global constants (completing, was removed with latest ...Arthur Schiwon2012-05-181-2/+2
| * | | | | LDAP: check wether applying naming rule would end up in conflicts on update, ...Arthur Schiwon2012-05-183-23/+53
* | | | | | only try to install apps that are compatible with oC4Frank Karlitschek2012-05-181-1/+10
* | | | | | increase to RC2Frank Karlitschek2012-05-181-2/+2
|/ / / / /
* | | | | fix call of all versions pageGeorg Ehrke2012-05-181-1/+1