summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into filesystemRobin Appelman2012-02-0524-65/+194
|\
| * preferences store fixBartek Przybylski2012-02-045-8/+8
| * stripping root from gallery nameBartek Przybylski2012-02-041-4/+11
| * handling special chars in dirnamesBartek Przybylski2012-02-044-6/+5
| * gallery: fix FS hooksBartek Przybylski2012-02-042-2/+9
| * gallery settings, defining scan root and shor orderBartek Przybylski2012-02-036-11/+119
| * removing console error in safari for bookmarksBartek Przybylski2012-02-031-1/+1
| * use strip_tags for calendar namesGeorg Ehrke2012-02-022-2/+2
| * add a label calendar to the settings page - bugfix for oc-157Georg Ehrke2012-02-021-0/+1
| * More in-/output sanitation,Thomas Tanghus2012-02-023-3/+3
| * Sanitize in- and output.Thomas Tanghus2012-02-026-32/+38
| * Calendar: Bugfix: better input validationGeorg Ehrke2012-02-025-7/+8
* | Merge branch 'master' into filesystemRobin Appelman2012-02-023-32/+41
|\|
| * gallery works in safari nowBartek Przybylski2012-02-011-6/+6
| * Bookmark layout updatedMarvin Thomas Rabe2012-02-012-7/+21
| * Bookmark layout updatedMarvin Thomas Rabe2012-02-012-21/+16
* | Merge branch 'master' into filesystemRobin Appelman2012-02-0120-163/+386
|\|
| * fix javascriptDavid Iwanowitsch2012-02-011-1/+1
| * Added searchprovider for bookmarks, initial l10n support for bookmark pluginDavid Iwanowitsch2012-02-016-56/+205
| * Merge branch 'tanghus_contacts'Thomas Tanghus2012-01-3112-102/+177
| |\
| | * - Fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-93Thomas Tanghus2012-01-3111-111/+175
| | * Some reminders in the code of what I have to change post OC3.0Thomas Tanghus2012-01-313-0/+11
| * | Resize profile picture if bigger than 200px on either x or y.Thomas Tanghus2012-01-312-5/+4
| |/
* | prevent sharing from making aditional http requests while scanningRobin Appelman2012-02-011-0/+1
* | dont try to use the filesystem when it isnt setup yetRobin Appelman2012-01-311-1/+1
* | Merge branch 'master' into filesystemRobin Appelman2012-01-301-1/+0
|\|
| * Sharing app needs to be loaded for public link of file in Shared folder - fix...Michael Gapczynski2012-01-301-1/+0
* | merge master into filesystemRobin Appelman2012-01-30118-419/+1717
|\|
| * new gallery look and feelBartek Przybylski2012-01-309-50/+117
| * remove debug fileGeorg Ehrke2012-01-291-39/+0
| * fix version-compare in calendars app.phpGeorg Ehrke2012-01-291-1/+1
| * update translationsRobin Appelman2012-01-2718-5/+276
| * use the correct hooks to remove contact/calendars of remvoed usersRobin Appelman2012-01-262-2/+2
| * use oc_filesystem::getlocalfile instead of manually trying to get the correct...Robin Appelman2012-01-262-4/+5
| * db cleanup after gallery removeBartek Przybylski2012-01-251-0/+4
| * creating thumbnails on upload, recursive removeBartek Przybylski2012-01-253-16/+8
| * Removed debug outputThomas Tanghus2012-01-241-1/+0
| * Fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-92Thomas Tanghus2012-01-241-1/+1
| * Fix some issues in ampache resonponseRobin Appelman2012-01-242-9/+65
| * update translationsRobin Appelman2012-01-2416-8/+301
| * Merge branch 'master' of gitorious.org:owncloud/owncloudRobin Appelman2012-01-2412-56/+107
| |\
| | * oc-89 handling no photos in collection alertBartek Przybylski2012-01-231-1/+5
| | * disable keyboard shortcuts as temp fixTom Needham2012-01-231-1/+2
| | * fix undefined indices - bugfix for oc-99Georg Ehrke2012-01-231-12/+14
| | * validate the calendar nameGeorg Ehrke2012-01-213-2/+40
| | * fix Undefined variable - bugfix for oc-69Georg Ehrke2012-01-211-2/+3
| | * some gallery css fixesRobin Appelman2012-01-211-2/+2
| | * recognizing img basing on extensionBartek Przybylski2012-01-202-7/+4
| | * make media detection based on extention case insensitiveRobin Appelman2012-01-201-1/+1
| | * fix renaming albumsRobin Appelman2012-01-203-5/+5