summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* comment out non working codeFrank Karlitschek2012-06-051-2/+3
* Load apps before minimizing the core css and jsBart Visscher2012-06-041-0/+2
* Tasks: styling fixesBart Visscher2012-06-041-4/+5
* Merge branch 'unstable'Bart Visscher2012-06-0435-200/+1359
|\
| * Merge branch 'unstable' of gitorious.org:owncloud/owncloud into unstableSam Tuke2012-05-223-0/+292
| |\
| | * Initial support for Amazon S3 storage backendMichael Gapczynski2012-05-163-0/+292
| * | Merge branch 'unstable' of gitorious.org:owncloud/owncloud into unstableSam Tuke2012-05-1614-14/+1058
| |\|
| | * Fix empty jsfiles and cssfiles in layout templateBart Visscher2012-05-161-0/+2
| | * Combine and minimize core and default app js filesBart Visscher2012-05-168-3/+688
| | * Combine and minimize core and default app css filesBart Visscher2012-05-1611-10/+367
| | * Template: Fix var nameBart Visscher2012-05-161-1/+1
| | * Template: Make getFormFactorExtension function publicBart Visscher2012-05-161-3/+3
| * | made initial testing version of expireAll for version control \ngave some old...Sam Tuke2012-05-165-32/+98
| |/
| * added phpdoc commentSam Tuke2012-05-161-2/+5
| * Merge branch 'unstable' of gitorious.org:owncloud/owncloud into unstableSam Tuke2012-05-160-0/+0
| |\
| | * added recognition of which version is 'current' - which is currently live and...Sam Tuke2012-05-163-20/+59
| * | added recognition of which version is 'current' - which is currently live and...Sam Tuke2012-05-163-20/+59
| |/
| * fixed some include path issuesSam Tuke2012-05-154-63/+25
| * fixed 'delete' label so it doesn't break translationsSam Tuke2012-05-151-1/+1
| * Remove DOCUMENTROOT static var, and make SUBURI var privateBart Visscher2012-05-111-7/+3
| * Gallery: Use App storage instead of contructing our own pathBart Visscher2012-05-106-21/+20
| * Remove unused OC static variable CONFIG_DATADIRECTORY_ROOTBart Visscher2012-05-101-4/+0
| * Whitespace fixesBart Visscher2012-05-104-26/+23
| * Implement default functions in OC_Group backendBart Visscher2012-05-103-26/+53
| * Implement default functions in OC_User backendBart Visscher2012-05-104-52/+40
* | Fix newline in codeBart Visscher2012-06-041-2/+3
* | Calendar & Contacts: Store import progress in OC_CacheBart Visscher2012-06-0410-36/+127
* | load authentication apps before checking wether user exists. fixes oc-910Arthur Schiwon2012-06-041-6/+7
* | make it possible to load apps seperately. needed to fix oc-910 without breaki...Arthur Schiwon2012-06-041-17/+12
* | Merge branch 'master' of gitorious.org:owncloud/owncloudTom Needham2012-06-041-0/+2
|\ \
| * | Hide app page link for internal apps, fixes bug oc-913Michael Gapczynski2012-06-041-0/+2
* | | Validate email on saveTom Needham2012-06-041-5/+4
|/ /
* | Merge branch 'master' of gitorious.org:owncloud/owncloudBjoern Schiessle2012-06-041-0/+9
|\ \
| * | update file paths in filecache when the parent is renamedRobin Appelman2012-06-041-0/+9
* | | don't allow user to delete Shared dir via webdav and sync client (bug #774)Bjoern Schiessle2012-06-041-2/+4
|/ /
* | prevent xss attacks by manipulating image file namesBjoern Schiessle2012-06-041-1/+1
* | prevent xss attacks by manipulating text file namesBjoern Schiessle2012-06-041-1/+1
* | Contacts: Make tmp file cleaup a bit safer.Thomas Tanghus2012-06-041-5/+1
* | commited a bit too much beforeArthur Schiwon2012-06-041-1/+0
* | Contacts: When editing photo on a newly created contact the name in the conta...Thomas Tanghus2012-06-041-0/+1
* | Contacts: Temporary files weren't deleted if crop window was closed without s...Thomas Tanghus2012-06-043-6/+59
* | LDAP: link to documentation on settings pageArthur Schiwon2012-06-041-1/+2
* | Merge branch 'master' of gitorious.org:owncloud/owncloudFrank Karlitschek2012-06-043-5/+7
|\ \
| * | no move (rename) operation for "Shared" directoryBjoern Schiessle2012-06-041-1/+1
| * | Don't allow user to delete, rename and re-share the "Shared" directoryBjoern Schiessle2012-06-043-4/+6
* | | add deprecated warningFrank Karlitschek2012-06-041-1/+2
|/ /
* | link to apps.owncloud.comFrank Karlitschek2012-06-032-2/+7
* | http user backendRobin Appelman2012-06-031-0/+93
* | Verify user exists when checking if logged in, fix for bug oc-863Michael Gapczynski2012-06-021-1/+1
* | Fix typo in log messageMichael Gapczynski2012-06-011-1/+1