summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* some fixes for sharingGeorg Ehrke2012-04-276-9/+4
* fix duplicated entries on uploadBartek Przybylski2012-04-271-1/+0
* Merge branch 'master' of gitorious.org:owncloud/owncloudSam Tuke2012-04-27188-184/+4160
|\
| * Merge branch 'master' into movable_apps_2Georg Ehrke2012-04-273-10/+26
| |\
| * | ampache should work nowGeorg Ehrke2012-04-262-5/+5
| * | make *DAV work with movable appsGeorg Ehrke2012-04-264-3/+5
| * | Merge branch 'master' into movable_apps_2Georg Ehrke2012-04-265-36/+171
| |\ \
| * | | move files to the correct placeGeorg Ehrke2012-04-262-0/+1031
| * | | fix merge conflictsGeorg Ehrke2012-04-2643-213/+1141
| |\ \ \
| * | | | fix security check for the path of the requested fileGeorg Ehrke2012-04-262-2/+2
| * | | | fix downloading of files in files appGeorg Ehrke2012-04-262-4/+4
| * | | | fixes for media appGeorg Ehrke2012-04-261-2/+2
| * | | | fixes for contacts appGeorg Ehrke2012-04-262-23/+16
| * | | | some fixes fore movable appsGeorg Ehrke2012-04-264-37/+37
| * | | | gallery app seems to work now :)Georg Ehrke2012-04-251-1/+1
| * | | | bookmarks app seems to work now :)Georg Ehrke2012-04-252-6/+6
| * | | | some fixes in contacts javascript filesGeorg Ehrke2012-04-251-2/+2
| * | | | Merge branch 'master' into movable_appsGeorg Ehrke2012-04-251-0/+1
| |\ \ \ \
| | * | | | fix js fail in media playerGeorg Ehrke2012-04-251-0/+1
| * | | | | fix merge conflictsGeorg Ehrke2012-04-2431-1242/+585
| |\| | | |
| * | | | | fix pathes in contactsGeorg Ehrke2012-04-242-30/+37
| * | | | | fix contacts app a bitGeorg Ehrke2012-04-232-13/+13
| * | | | | make calendar work with movable appsGeorg Ehrke2012-04-232-4/+4
| * | | | | fix pathes of shared calendarsGeorg Ehrke2012-04-231-2/+2
| * | | | | fix file path in apps/media/ajax/api.phpGeorg Ehrke2012-04-231-5/+3
| * | | | | Merge branch 'master' into movable_appsGeorg Ehrke2012-04-235-20/+57
| |\ \ \ \ \
| * | | | | | fix path in apps/files/templats/index.phpGeorg Ehrke2012-04-231-1/+1
| * | | | | | fix style.css of the files appGeorg Ehrke2012-04-231-2/+2
| * | | | | | fix path in /apps/files/js/timezone.phpGeorg Ehrke2012-04-231-1/+1
| * | | | | | Merge branch 'master' into movable_appsGeorg Ehrke2012-04-2317-56/+285
| |\ \ \ \ \ \
| * \ \ \ \ \ \ fix merge conflictsGeorg Ehrke2012-04-2251-435/+1933
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into movable_appsGeorg Ehrke2012-04-2012-113/+777
| |\ \ \ \ \ \ \ \
| * | | | | | | | | remove require once lib base in files scan.phpGeorg Ehrke2012-04-201-2/+0
| * | | | | | | | | remove require once lib base in some more filesGeorg Ehrke2012-04-185-8/+4
| * | | | | | | | | move files to app folderGeorg Ehrke2012-04-1868-0/+2767
| * | | | | | | | | Merge branch 'master' into movable_appsGeorg Ehrke2012-04-188-10/+49
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | remove the require_once lib base from all (or nearly all) filesGeorg Ehrke2012-04-17111-111/+111
* | | | | | | | | | | added revert attempt outcome messages, removed contextual ajax revert button ...Sam Tuke2012-04-276-32/+77
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Contacts: Added convinience method for notifications.Thomas Tanghus2012-04-271-0/+12
* | | | | | | | | | jquery.combobox: Added 'editable' option and cleaned up a bit.Thomas Tanghus2012-04-271-8/+13
* | | | | | | | | | Contacts: Updated first run page.Thomas Tanghus2012-04-271-2/+1
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge branch 'master' of gitorious.org:owncloud/owncloudSam Tuke2012-04-262-2/+34
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Add ability to send private links from sharing via emailMichael Gapczynski2012-04-262-2/+34
* | | | | | | | | started implementing ajax file rollbackSam Tuke2012-04-264-17/+61
* | | | | | | | | added available version names to files dropdown menu via new ajax scriptSam Tuke2012-04-264-31/+122
|/ / / / / / / /
* | | | | | | | improved styling, called css file in history.phpSam Tuke2012-04-264-4/+8
* | | | | | | | linked more button to history pageSam Tuke2012-04-261-3/+3
* | | | | | | | changed function name to avoid clash with sharing dropdownSam Tuke2012-04-261-2/+2
* | | | | | | | Contacts: Some js cleanup.Thomas Tanghus2012-04-261-5/+13
* | | | | | | | Contacts: Added import with with file picker.Thomas Tanghus2012-04-265-8/+76