aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into calendar_repeatGeorg Ehrke2012-05-2914-30/+14
|\
| * fix statusGeorg Ehrke2012-05-291-9/+5
| | | | | | | | of timezone detection
| * Correct typo in last_insert_id for calendar and pg fix #oc-731Brice Maron2012-05-281-1/+1
| |
| * Contacts: Fix XSS.Thomas Tanghus2012-05-281-2/+2
| |
| * Merge branch 'master' of gitorious.org:owncloud/owncloudFrank Karlitschek2012-05-283-2/+3
| |\
| | * Contacts: Double check XSS, and fix a rookie error ;-)Thomas Tanghus2012-05-282-2/+2
| | |
| | * add urlencode for caldav linkGeorg Ehrke2012-05-281-0/+1
| | |
| * | remove not needed includesFrank Karlitschek2012-05-288-16/+3
| |/
* | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-05-2614-18/+20
|\|
| * allow longer paths for galleryRobin Appelman2012-05-262-4/+4
| |
| * update copyrightFrank Karlitschek2012-05-269-9/+9
| |
| * LDAP: support for 'member' as group-member-associationArthur Schiwon2012-05-262-2/+3
| |
| * fix share for users with a point within their nameGeorg Ehrke2012-05-261-3/+4
| |
* | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-05-2562-319/+849
|\|
| * Add HEAD request management for files ajax/download.phpBrice Maron2012-05-241-1/+1
| |
| * Add translation for error messageBrice Maron2012-05-241-1/+1
| |
| * Add error message when uploading folder or null files. ref oc-739Brice Maron2012-05-241-0/+5
| |
| * share code between smb and ftp filestorage backendsRobin Appelman2012-05-244-157/+92
| |
| * Add pending line in file list before trying to upload. Correct indentationBrice Maron2012-05-241-111/+110
| |
| * smb filestorage backendRobin Appelman2012-05-244-0/+159
| |
| * Initial work on UI for mounting external storageMichael Gapczynski2012-05-246-1/+176
| |
| * Fix private link sharing via email, fix for bug oc-750Michael Gapczynski2012-05-231-1/+0
| |
| * Correct small style problem with task app fix #oc-689Brice Maron2012-05-231-1/+1
| |
| * removed closing php tagSam Tuke2012-05-221-3/+1
| |
| * 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
| |
| * 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-17415-32642/+4144
| | |\
| | * | 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
| | | | |
| * | | | Make sure sharing and versions dropdowns come down in the same location for ↵v4.0.0Michael Gapczynski2012-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | all files
| * | | | 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-192-2/+2
| | | | |
| * | | | 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
| | | | |
| * | | | 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 ↵Michael Gapczynski2012-05-181-5/+7
| | | | | | | | | | | | | | | | | | | | versions
| * | | | 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 ↵Arthur Schiwon2012-05-182-15/+24
| | | | | | | | | | | | | | | | | | | | as well
| * | | | Contacts: Added MS opacity mumbo-jumbo that I can't test myself to file form ↵Thomas Tanghus2012-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | fields.
| * | | | make upload work with IE againArthur Schiwon2012-05-181-1/+1
| | | | |
| * | | | LDAP: update meta infoArthur Schiwon2012-05-181-1/+1
| | | | |
| * | | | mark the apps as part of the shipped package and increase the requirement to ↵Frank Karlitschek2012-05-1823-30/+53
| | | | | | | | | | | | | | | | | | | | ownCloud 4
| * | | | LDAP: don't make us of global constants (completing, was removed with latest ↵Arthur Schiwon2012-05-181-2/+2
| | | | | | | | | | | | | | | | | | | | additions to update.php)
| * | | | LDAP: check wether applying naming rule would end up in conflicts on update, ↵Arthur Schiwon2012-05-183-23/+53
| | | | | | | | | | | | | | | | | | | | if so don't do it