summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into multi_app_dirBrice Maron2012-06-21120-616/+1603
|\
| * only use 1 fsview when initializing encryptionRobin Appelman2012-06-211-7/+5
| * fix saved file size for uploaded filesRobin Appelman2012-06-211-4/+4
| * truncate decrypted files based on filelengthRobin Appelman2012-06-217-16/+79
| * Merge branch 'master' of gitorious.org:owncloud/owncloudBjoern Schiessle2012-06-213-46/+37
| |\
| | * fix calendarGeorg Ehrke2012-06-211-1/+1
| | * Fixed missing jQuery event object - expire interface now works with FirefoxSam Tuke2012-06-211-45/+33
| | * fix a PHP NoticeGeorg Ehrke2012-06-211-0/+3
| * | use new sanitizeHTML() functionBjoern Schiessle2012-06-211-1/+1
| |/
| * Merge branch 'master' of gitorious.org:owncloud/owncloudBjoern Schiessle2012-06-211-0/+8
| |\
| | * make edit event form work with DateTime Property UTCGeorg Ehrke2012-06-211-0/+8
| * | check if user is allowed to edit bookmarksBjoern Schiessle2012-06-211-3/+11
| * | use new sanitizeHTML() functionBjoern Schiessle2012-06-212-2/+2
| * | correct presentation of HTML encoded charactersBjoern Schiessle2012-06-211-1/+1
| |/
| * DateTime objects are directly comparableBart Visscher2012-06-201-1/+1
| * Gallery: Move code/js/css from main template to the right placeBart Visscher2012-06-204-113/+108
| * More changes for updating the contacts list.Thomas Tanghus2012-06-202-14/+20
| * Better error checking.Thomas Tanghus2012-06-201-10/+13
| * Make sure address books are shown even if empty.Thomas Tanghus2012-06-201-12/+15
| * Log error as ERROR.Thomas Tanghus2012-06-201-1/+1
| * Merge branch 'master' into calendar_repeatGeorg Ehrke2012-06-2028-44/+448
| |\
| | * make bookmarks bookmarklet work again, kudos to Victor DubiniukArthur Schiwon2012-06-201-7/+7
| | * bookmarks: make read later-button draggable again, fixes oc-944Arthur Schiwon2012-06-201-1/+1
| | * added new user settings interface for deleting old file versionsSam Tuke2012-06-206-15/+124
| | * Merge branch 'master' of gitorious.org:owncloud/owncloudSam Tuke2012-06-2020-19/+317
| | |\
| | | * Merge branch 'shared_log'Bart Visscher2012-06-209-0/+197
| | | |\
| | | | * Add app for logging access to shared filesBart Visscher2012-06-149-0/+197
| | | * | Merge branch 'audit'Bart Visscher2012-06-205-0/+103
| | | |\ \
| | | | * | Audit: Log sharing actionsBart Visscher2012-05-074-0/+27
| | | | * | Audit: Log messages with separate functionBart Visscher2012-05-071-9/+12
| | | | * | Audit: Add user login/logout loggingBart Visscher2012-05-072-0/+17
| | | | * | Start of audit appBart Visscher2012-05-073-0/+56
| | | * | | Delay setup of FS until OC_Filesystem is usedBart Visscher2012-06-202-12/+10
| | | * | | Adjust OC_Filesystem use in hooks to string, so the class is loaded as late a...Bart Visscher2012-06-202-2/+2
| | | * | | use sanitizeHTML() functionBjoern Schiessle2012-06-203-5/+5
| | * | | | removed readdir to fix bug oc-1054Sam Tuke2012-06-202-3/+0
| | |/ / /
| * | | | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-06-208-34/+69
| |\| | |
| | * | | Merge branch 'master' of gitorious.org:owncloud/owncloudBjoern Schiessle2012-06-202-3/+11
| | |\ \ \
| | | * | | forgotten $, incorrect subtractArthur Schiwon2012-06-201-2/+2
| | | * | | LDAP: only map users within the User Base TreeArthur Schiwon2012-06-202-3/+11
| | * | | | use new sanitizeHTML() functionBjoern Schiessle2012-06-202-8/+8
| | |/ / /
| | * | | Fixed deleteAll function for deleting all old versions of files (expireAll)Sam Tuke2012-06-193-22/+47
| | * | | Re-add missing loadhandlers() call.Thomas Tanghus2012-06-191-0/+1
| | * | | Loading of contacts was placed outside of $(document).ready() function.Thomas Tanghus2012-06-191-1/+2
| * | | | Calendar: only run ->expand if the event is repeatingGeorg Ehrke2012-06-191-1/+3
| * | | | Calendar: js fixGeorg Ehrke2012-06-191-1/+1
| * | | | Calendar: fix modifying of end DateTime objectGeorg Ehrke2012-06-191-1/+1
| * | | | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-06-192-2/+2
| |\| | |
| | * | | fixes oc-1026Thomas Mueller2012-06-181-1/+1
| | * | | fix problem with encryption flag not being saved correctly in the filecacheRobin Appelman2012-06-181-1/+1