summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixed cancelling of uploads and wrong merge conflict resolutionSimon Birnbach2012-04-152-12/+36
* Fixed cancelling upload of same file to folder and subfolderSimon Birnbach2012-04-152-1/+4
* Merge git://gitorious.org/owncloud/owncloudSimon Birnbach2012-04-15399-17994/+26501
|\
| * increasing the file row height a bitJan-Christoph Borchardt2012-04-151-2/+2
| * renamed extention to extension, also now only showing lowercaseJan-Christoph Borchardt2012-04-1515-39/+39
| * show text for file actionsJan-Christoph Borchardt2012-04-152-7/+6
| * fixed settings hover, now whole row sensitive and fading not jerkyJan-Christoph Borchardt2012-04-153-6/+4
| * add span around fileactionsRobin Appelman2012-04-151-2/+3
| * add public api to get the file id from the cacheRobin Appelman2012-04-151-0/+34
| * fix installing shipped appsRobin Appelman2012-04-151-1/+1
| * fix getAppVersion errorBartek Przybylski2012-04-151-1/+1
| * firefighting Robin-breakageJan-Christoph Borchardt2012-04-141-1/+1
| * don't rely on the old version in info.xml anymoreRobin Appelman2012-04-143-4/+4
| * Merge branch 'master' of gitorious.org:owncloud/owncloudJan-Christoph Borchardt2012-04-1414-42/+344
| |\
| | * Contact: Don't use non core class in appinfo/app.phpBart Visscher2012-04-141-1/+1
| | * Typo fix (breif->brief)Bart Visscher2012-04-144-28/+28
| | * Fix default database type stringBart Visscher2012-04-141-1/+1
| | * Use offset function to position block elementsBart Visscher2012-04-141-2/+8
| | * few pieces of documentationArthur Schiwon2012-04-141-0/+17
| | * typoRobin Appelman2012-04-141-2/+2
| | * give back expected result types as long as logic is not there yetArthur Schiwon2012-04-141-0/+3
| | * test for ldap group backendArthur Schiwon2012-04-141-0/+36
| | * starting to create the ldap group backend (with some inspiration from Yoann G...Arthur Schiwon2012-04-143-0/+183
| | * cache app types in the dbRobin Appelman2012-04-142-5/+62
| | * use the correct array indexes...Robin Appelman2012-04-141-3/+3
| * | improved installation instructionsJan-Christoph Borchardt2012-04-141-1/+1
| * | improved updater wordingJan-Christoph Borchardt2012-04-142-6/+4
| * | increase opacity of search field and logout iconJan-Christoph Borchardt2012-04-141-2/+3
| |/
| * reuse OC_L10N objectsRobin Appelman2012-04-1433-38/+52
| * some minor optimizationsRobin Appelman2012-04-142-19/+32
| * keep version numbers in their own files for faster readingRobin Appelman2012-04-1443-24/+37
| * remove outdated fileRobin Appelman2012-04-141-40/+0
| * Remove go to lineTom Needham2012-04-141-25/+17
| * Fix annoying error in logTom Needham2012-04-141-150/+151
| * Merge branch 'master' of gitorious.org:owncloud/owncloudTom Needham2012-04-1424-258/+389
| |\
| | * swap enable and dissable error messagesRobin Appelman2012-04-141-2/+2
| | * show error when installing an app has failedRobin Appelman2012-04-144-9/+24
| | * prevent users with the same name but different casing from being createdRobin Appelman2012-04-141-1/+1
| | * Sharing: Add a filename after public share linkBart Visscher2012-04-141-4/+4
| | * Sharing: Don't get share icon for undefined filenameBart Visscher2012-04-141-1/+4
| | * Sharing: Define missing template varsBart Visscher2012-04-141-0/+2
| | * remove outdated codeRobin Appelman2012-04-141-204/+0
| | * improve flexibility of search providers a bitRobin Appelman2012-04-148-17/+43
| | * LDAP: don't keep possibly outdated passwordsArthur Schiwon2012-04-141-4/+0
| | * test cases for user backendsRobin Appelman2012-04-144-0/+275
| | * typoArthur Schiwon2012-04-131-3/+3
| | * don't fail on missing extensionArthur Schiwon2012-04-131-1/+5
| | * make sure temporary files are being removed, fixes oc-450Arthur Schiwon2012-04-132-16/+30
| * | Merge branch 'master' of gitorious.org:owncloud/owncloudTom Needham2012-04-1321-81/+247
| |\|
| | * Contacts: Save the category list update when updating/adding contactBart Visscher2012-04-131-1/+1