aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
...
| * Migration: Fix contacts and bookmarksTom Needham2012-06-272-8/+9
| * Load contactlist progressivly.Thomas Tanghus2012-06-273-68/+105
* | Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-271-11/+48
|\|
| * Fixes in Dropbox API, try to catch Dropbox exceptions, implement rename and c...Michael Gapczynski2012-06-271-11/+48
* | fix style of some docGeorg Ehrke2012-06-271-5/+5
* | Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2710-33/+57
|\|
| * move some documentation to the right placeGeorg Ehrke2012-06-272-13/+20
| * add merge calendar function and add some documentation to OC_Calendar_CalendarGeorg Ehrke2012-06-271-1/+24
| * Add Samba Share parameter to external storage UIMichael Gapczynski2012-06-271-1/+1
| * Don't overwrite fake directory stream for Shared storageMichael Gapczynski2012-06-271-2/+2
| * Don't overwrite fake directory stream for Dropbox and Google DriveMichael Gapczynski2012-06-272-5/+4
| * no reason to strip tags at this pointBjoern Schiessle2012-06-271-1/+0
| * Util::formatDate() expect $timestamp as doubleBjoern Schiessle2012-06-274-10/+6
* | Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2713-101/+257
|\|
| * enable highlighting of address in OSM.Bjoern Schiessle2012-06-271-1/+1
| * Improve error handling of Dropbox storage backendMichael Gapczynski2012-06-261-4/+8
| * Load default categories if there are none,Thomas Tanghus2012-06-271-6/+29
| * Ensure event handlers are being set when adding first contact.Thomas Tanghus2012-06-271-24/+24
| * Add check for return value.Thomas Tanghus2012-06-271-11/+13
| * Don't call getLocalFile() until you know it actually is musicMichael Gapczynski2012-06-261-1/+1
| * Added some error checking.Thomas Tanghus2012-06-261-1/+5
| * Added missing requesttoken.Thomas Tanghus2012-06-262-1/+4
| * Added error checking on all db queries.Thomas Tanghus2012-06-263-51/+152
| * Added createUser hook.Thomas Tanghus2012-06-262-0/+11
| * Merge branch 'master' of gitorious.org:owncloud/owncloudBjoern Schiessle2012-06-261-1/+1
| |\
| | * Fix variable name.Thomas Tanghus2012-06-261-1/+1
| * | Merge branch 'master' of gitorious.org:owncloud/owncloudBjoern Schiessle2012-06-261-0/+8
| |\|
| | * add OC_Calendar_Object::createUID()Georg Ehrke2012-06-261-0/+8
| * | xss fixBjoern Schiessle2012-06-261-1/+1
| |/
* | Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2641-167/+246
|\|
| * Added signals.Thomas Tanghus2012-06-262-4/+14
| * Adjust pic width a bit.Thomas Tanghus2012-06-261-1/+1
| * Remove x-scrollbar from contacts list.Thomas Tanghus2012-06-251-3/+4
| * Media: Change includes in app.php to use the autoloaderBart Visscher2012-06-252-15/+16
| * LDAP: compare base trees case insensitivelyArthur Schiwon2012-06-251-2/+2
| * Emit Completed.Thomas Tanghus2012-06-251-0/+1
| * Better visual feedback and prevent drop on self.Thomas Tanghus2012-06-252-1/+11
| * Improve styling on draggables.Thomas Tanghus2012-06-252-6/+9
| * Added placeholder msg to share with menu to clarify user list restricted to s...Sam Tuke2012-06-252-1/+2
| * fix syntax error after mergeArthur Schiwon2012-06-251-3/+0
| * Try to conserve some memory. Should fix oc-1106 for master.Thomas Tanghus2012-06-252-2/+2
| * LDAP: cheaper userExists() implementation, fixes oc-1012Arthur Schiwon2012-06-251-0/+3
| * LDAP: always sanitize DN and DN-containing attributesArthur Schiwon2012-06-251-3/+12
| * sanitizeHTML() has to be called later to keep the path unchangedBjoern Schiessle2012-06-252-3/+3
| * Only delete existing thumbnails (bug #1100)Bjoern Schiessle2012-06-251-1/+4
| * Drag'n'Drop contacts between addressbook. Still needs some css magic.Thomas Tanghus2012-06-252-0/+77
| * Prevent errors and mini enhancement of saved window in bookmarksBrice Maron2012-06-242-1/+3
| * Correct bookmark app : add through interface and remove missing cssBrice Maron2012-06-242-2/+1
| * Remove excessive debugging.Thomas Tanghus2012-06-241-3/+0
| * Add some DRYness to logging.Thomas Tanghus2012-06-2417-117/+70