summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-19207-3214/+6299
|\
| * creating and retrive thumbnails for intermediate galleriesBartek Przybylski2012-03-173-4/+23
| * Don't truncate users emailTom Needham2012-03-171-0/+1
| * Dont truncate the time formatTom Needham2012-03-171-1/+1
| * bredcrumb fixBartek Przybylski2012-03-172-2/+1
| * it may take time for zip file download, so give a messageArthur Schiwon2012-03-161-17/+16
| * check if selected files for zip archive are not too largeArthur Schiwon2012-03-163-13/+60
| * make Files settings workArthur Schiwon2012-03-163-6/+10
| * fix adding photo to incorrect galleryBartek Przybylski2012-03-152-2/+2
| * creating intermediate galleriesBartek Przybylski2012-03-142-9/+30
| * Make PHOTO deletable.Thomas Tanghus2012-03-133-4/+17
| * Added sync path for iOS/OS X.Thomas Tanghus2012-03-131-3/+8
| * Fixed NOTE property UI.Thomas Tanghus2012-03-132-5/+11
| * Cleanup in Contacts.Thomas Tanghus2012-03-1318-1266/+1
| * Force load profile pic after edit hack.Thomas Tanghus2012-03-122-1/+3
| * Remember categories when they have changed.Thomas Tanghus2012-03-121-2/+3
| * Rename...Thomas Tanghus2012-03-122-1/+1
| * More modifications for using jquery.multiple_autocomplete.Thomas Tanghus2012-03-122-16/+10
| * Small fix to jquery.multiple_autocomplete.Thomas Tanghus2012-03-121-0/+10
| * Contacts: Modifications for using categories.Thomas Tanghus2012-03-1210-187/+69
| * Added category editor for apps using OC_VObjects.Thomas Tanghus2012-03-127-0/+282
| * oc_db isn't pdoRobin Appelman2012-03-111-2/+2
| * fix thumbnail generationBartek Przybylski2012-03-111-27/+27
| * disabling file handlers in gallery for nowBartek Przybylski2012-03-111-3/+3
| * media scanner fixBartek Przybylski2012-03-111-1/+1
| * gallery migration to events systemBartek Przybylski2012-03-1110-285/+236
| * spaces to tabsTom Needham2012-03-111-25/+25
| * Text editor will now wrap text based on window sizeTom Needham2012-03-101-0/+1
| * fix character encoding bug oc-278Tom Needham2012-03-101-1/+1
| * update file extensions in editorTom Needham2012-03-101-3/+9
| * spaces to tabs replacementBartek Przybylski2012-03-091-4/+4
| * filescan by mimetype scanBartek Przybylski2012-03-091-5/+6
| * filecache search comparition fixBartek Przybylski2012-03-093-45/+36
| * Yet a missing file :-PThomas Tanghus2012-03-091-0/+49
| * Added missing template.Thomas Tanghus2012-03-091-0/+16
| * Merge branch 'vcategories'Thomas Tanghus2012-03-0917-119/+838
| |\
| | * Temporarily disabled multi_autoselect.Thomas Tanghus2012-03-092-11/+11
| | * Merge branch 'vcategories' of gitorious.org:owncloud/owncloud into vcategoriesThomas Tanghus2012-03-088-13/+74
| | |\
| | | * Contacts: Add UI for categoriesBart Visscher2012-03-077-1/+67
| | | * Merge branch 'master' into vcategoriesBart Visscher2012-03-07222-2039/+5693
| | | |\
| | * | \ Merge gitorious.org:owncloud/owncloud into vcategoriesThomas Tanghus2012-03-0718-150/+154
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Use OC.dialogs.Thomas Tanghus2012-03-071-71/+39
| | * | | Fix conflict.Thomas Tanghus2012-03-07209-1896/+5549
| | |\ \ \
| | * | | | Contacts: UI updates and ajax methods for categories.Thomas Tanghus2012-03-0714-101/+593
| | | |_|/ | | |/| |
| | * | | Translate and fix copy/paste error.Thomas Tanghus2012-02-221-4/+2
| | * | | Fix merge conflict.Thomas Tanghus2012-02-2211-118/+181
| | |\ \ \
| | * | | | Check for empty value in ctor and being conservative about configvalue name ;-)Thomas Tanghus2012-02-211-22/+4
| | * | | | Forgot to assign param.Thomas Tanghus2012-02-211-3/+1
| | * | | | Merge branch 'vcategories' of gitorious.org:owncloud/owncloud into vcategoriesThomas Tanghus2012-02-201-25/+39
| | |\ \ \ \
| | | * | | | Review changes of OC_VCategoryBart Visscher2012-02-201-25/+39