summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Log error as ERROR.Thomas Tanghus2012-06-201-1/+1
* Merge branch 'master' into calendar_repeatGeorg Ehrke2012-06-2035-66/+468
|\
| * 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-207-18/+124
| * Merge branch 'master' of gitorious.org:owncloud/owncloudSam Tuke2012-06-2025-37/+337
| |\
| | * 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-206-1/+104
| | |\ \
| | | * | 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-074-1/+57
| | * | | Prefer requested app before redirecting to default pageBart Visscher2012-06-201-1/+5
| | * | | Delay setup of FS until OC_Filesystem is usedBart Visscher2012-06-205-21/+16
| | * | | Adjust OC_Filesystem use in hooks to string, so the class is loaded as late a...Bart Visscher2012-06-202-2/+2
| | * | | Small code reorderBart Visscher2012-06-201-5/+6
| | * | | remove unnecessary commentBjoern Schiessle2012-06-201-1/+1
| | * | | no need to escape the titleBjoern Schiessle2012-06-201-1/+1
| | * | | use sanitizeHTML() functionBjoern Schiessle2012-06-203-5/+5
| * | | | removed readdir to fix bug oc-1054Sam Tuke2012-06-203-4/+0
| |/ / /
* | | | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-06-2023-120/+154
|\| | |
| * | | 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
| |/ / /
| * | | don't show other users file if the filesystem is not index alreadyRobin Appelman2012-06-201-0/+3
| * | | Remove OC::$CONFIG_DATADIRECTORY, not usedBart Visscher2012-06-193-33/+18
| * | | Move check code from setupFS to checkServerBart Visscher2012-06-191-34/+20
| * | | Fixed deleteAll function for deleting all old versions of files (expireAll)Sam Tuke2012-06-197-22/+58
| * | | removing sanitizeHTML() function from template.php since I moved it to util.phpBjoern Schiessle2012-06-191-11/+0
| * | | Remember result of OC_User::isLoggedIn, can be very expensive to checkBart Visscher2012-06-191-2/+6
| * | | use new sanitize HTML functionBjoern Schiessle2012-06-195-11/+5
| * | | introducing a sanitize HTML function for the internal and the public API. ThisBjoern Schiessle2012-06-192-1/+28
| * | | 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-199-13/+62
|\| | |
| * | | quota calculation fixedBjoern Schiessle2012-06-191-1/+1
| * | | fixes oc-668Thomas Mueller2012-06-181-0/+6
| * | | CSS class headerAction -> header-actionFlorian Hülsmann2012-06-182-3/+3
| * | | Merge branch 'master' of gitorious.org:owncloud/owncloudFlorian Hülsmann2012-06-183-8/+49
| |\ \ \
| | * | | Delay loading of translations until they are usedBart Visscher2012-06-182-7/+48
| | * | | fixes oc-1026Thomas Mueller2012-06-181-1/+1
| * | | | added CSS class .headerActionFlorian Hülsmann2012-06-181-2/+2
| |/ / /
| * | | Force sanitize function to use UTF8 (for php lower than 5.4)Brice Maron2012-06-181-1/+1
| * | | fix problem with encryption flag not being saved correctly in the filecacheRobin Appelman2012-06-181-1/+1
| * | | Merge branch 'master' of gitorious.org:owncloud/owncloudBjoern Schiessle2012-06-189-262/+215
| |\ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-03 08:04:54 +0000