summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* merge master into filesystemRobin Appelman2012-01-08141-542/+65669
|\
| * Merge branch 'master' of gitorious.org:owncloud/owncloudBartek Przybylski2012-01-082-5/+18
| |\
| | * Also use track_number to retrieve song track.Cloud Dumper2012-01-081-1/+14
| | * Sort results from music collection getters.Cloud Dumper2012-01-081-4/+4
| * | rename and delete hooksBartek Przybylski2012-01-082-6/+74
| * | gallery version bump to force db updateBartek Przybylski2012-01-081-2/+2
| * | automatic adding of photo to album, feedback for user while scanning, general...Bartek Przybylski2012-01-0811-72/+82
| |/
| * enable gallery and admin_export by default at least for the alpha and beta.Frank Karlitschek2012-01-072-1/+3
| * improve search functionGeorg Ehrke2012-01-063-3/+37
| * Merge branch 'master' into calendarGeorg Ehrke2012-01-051-1/+1
| |\
| | * remove error output if symlink already exists. this can happen if a user remo...Frank Karlitschek2012-01-031-1/+1
| * | fix login check in ajax filesGeorg Ehrke2012-01-053-3/+9
| * | fix js for repeating eventsGeorg Ehrke2012-01-051-1/+4
| * | fix autodetection for the week of the monthGeorg Ehrke2012-01-051-1/+2
| * | fix editeventdialog for monthly repeating events with a specific weekday and ...Georg Ehrke2012-01-051-7/+7
| * | fix repeat rule for every weekdayGeorg Ehrke2012-01-051-1/+1
| * | fix end for repeating eventsGeorg Ehrke2012-01-051-5/+5
| * | Merge branch 'master' into calendarGeorg Ehrke2012-01-039-18/+127
| |\|
| | * Merge git://gitorious.org/owncloud/owncloud into oc_imageThomas Tanghus2012-01-029-0/+4458
| | |\
| | * \ Merge git://gitorious.org/owncloud/owncloud into oc_imageThomas Tanghus2012-01-011-12/+8
| | |\ \
| | * | | Removed redundant DB queries.Thomas Tanghus2011-12-312-7/+16
| | * | | Thumbnails was overwriting default style so hover and active didn't work. Mov...Thomas Tanghus2011-12-302-6/+6
| | * | | Merge git://gitorious.org/owncloud/owncloud into tanghus_contactsThomas Tanghus2011-12-303-2/+11
| | |\ \ \
| | * | | | Added license and waiver of conditions for jquery.inview.Thomas Tanghus2011-12-308-11/+111
| * | | | | Merge branch 'master' into calendarGeorg Ehrke2012-01-0213-14/+4477
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | add jplayer sourceRobin Appelman2012-01-019-0/+4458
| | | |_|/ | | |/| |
| | * | | Fix return for empty Shared folder in opendir()Michael Gapczynski2012-01-011-12/+8
| | | |/ | | |/|
| | * | contacts entry duplication fixBartek Przybylski2011-12-301-1/+1
| | * | Merge branch 'master' of gitorious.org:owncloud/owncloudBartek Przybylski2011-12-307-0/+484
| | |\|
| | * | gallery fixesBartek Przybylski2011-12-302-1/+10
| * | | remove unused jsGeorg Ehrke2012-01-021-52/+13
| * | | add function to detect always the timezoneGeorg Ehrke2012-01-027-5/+53
| * | | Merge branch 'master' into calendarGeorg Ehrke2011-12-2978-51/+59802
| |\ \ \ | | | |/ | | |/|
| | * | More missing js.Thomas Tanghus2011-12-281-0/+12
| | * | Merge git://gitorious.org/owncloud/owncloud into contact_thumbnailsThomas Tanghus2011-12-2874-50/+59323
| | |\|
| | | * Contacts: small merge cleanupsBart Visscher2011-12-273-27/+3
| | | * Merge branch 'tanghus_remote_backup' of git://gitorious.org/~tanghus/owncloud...Bart Visscher2011-12-2721-42/+537
| | | |\
| | | | * Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backupThomas Tanghus2011-12-161-1/+3
| | | | |\
| | | | * | Misc. changes after review by bartv.Thomas Tanghus2011-12-1616-43/+38
| | | | * | Update READMEThomas Tanghus2011-12-131-1/+4
| | | | * | Added readme.tanghusThomas Tanghus2011-12-111-0/+19
| | | | * | Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backupThomas Tanghus2011-12-113-17/+6
| | | | |\ \
| | | | * | | Updating of contact list when activating/adding/deleting address books now wo...Thomas Tanghus2011-12-1110-116/+96
| | | | * | | Resolved conflictThomas Tanghus2011-12-091-6/+0
| | | | * | | Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backupThomas Tanghus2011-12-0946-580/+509
| | | | |\ \ \
| | | | * | | | Various fixes to multiple address books handlingThomas Tanghus2011-12-0913-37/+146
| | | | * | | | Fixed adding, editing and deleting address books. One minor UI flaw remains.Thomas Tanghus2011-12-058-21/+101
| | | | * | | | Merge gitorious.org:~tanghus/owncloud/tanghus-owncloud into tanghus_remote_ba...Thomas Tanghus2011-12-043-3/+5
| | | | |\ \ \ \
| | | | * | | | | Added UI for selecting/editing address books.Thomas Tanghus2011-12-0411-6/+277
| | | | * | | | | Removed some debug statements.Thomas Tanghus2011-12-012-30/+24