aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix merge conflictsGeorg Ehrke2012-06-0846-312/+853
|\
| * split share and root config for smb backend, also sanitize config a bit moreRobin Appelman2012-06-083-4/+21
| |
| * Gallery: Fix database creation on update, also only from version less then 0.5Bart Visscher2012-06-071-6/+8
| |
| * Use the default parameter of OC_Config::getValue to set defaultsBart Visscher2012-06-071-12/+2
| |
| * Add help texts to config options in config.sample.phpBart Visscher2012-06-071-4/+33
| |
| * Better handling of core.css and core.jsBart Visscher2012-06-074-11/+9
| | | | | | | | | | Fixes calling remote.php on install. Fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-933
| * Contacts: Attempt to make file upload work in ICS Chrome.Thomas Tanghus2012-06-071-1/+3
| |
| * Break text to fit in dialog.Thomas Tanghus2012-06-071-1/+1
| |
| * Protect the help pageTom Needham2012-06-071-3/+3
| |
| * LDAP: cache the results, reduce LDAP searchesArthur Schiwon2012-06-072-14/+39
| |
| * ldap: enable the destructorArthur Schiwon2012-06-071-0/+5
| |
| * Make it easier to subclass OC_L10N.Thomas Tanghus2012-06-071-0/+4
| |
| * pictures: update script and removal some all stuffBartek Przybylski2012-06-073-23/+12
| |
| * Edited combobox to adhere to coding standards and added a dblclick handler.Thomas Tanghus2012-06-071-19/+24
| |
| * Remove old internal mail call for password reset, fixes bug oc-934Michael Gapczynski2012-06-071-1/+0
| |
| * ldap: remove unused private functionsArthur Schiwon2012-06-071-24/+0
| |
| * ldap: correct query condition and determining of successArthur Schiwon2012-06-071-2/+12
| |
| * ldap: check index carefully, can be 0Arthur Schiwon2012-06-071-1/+1
| |
| * Migration: Fixed wrong download URL: ↵Thomas Tanghus2012-06-071-1/+1
| | | | | | | | http://forum.owncloud.org/viewtopic.php?f=4&t=2511
| * Calendar: Added more explicit sync links and fixed indentation.Thomas Tanghus2012-06-071-34/+39
| |
| * Contacts: Import upload button was obscured on Android browser.Thomas Tanghus2012-06-072-2/+2
| |
| * A bit of pixel-pushing.Thomas Tanghus2012-06-072-10/+17
| |
| * adding title when fancybox is displayedBartek Przybylski2012-06-061-1/+1
| |
| * replace spaces with tabs, use const and linkTo instead of static pathBartek Przybylski2012-06-061-151/+148
| |
| * Add layer to select fast or slow cache for storing valuesBart Visscher2012-06-062-0/+65
| |
| * hack for file downloadBartek Przybylski2012-06-061-1/+3
| |
| * removing test imageBartek Przybylski2012-06-061-0/+0
| |
| * aviod incorrect image size returning in gallery listingBartek Przybylski2012-06-062-11/+14
| |
| * use fancybox to display image previewBartek Przybylski2012-06-062-12/+7
| |
| * navigate on galleriesBartek Przybylski2012-06-063-25/+45
| |
| * new db schemeBartek Przybylski2012-06-061-38/+4
| |
| * git statusBartek Przybylski2012-06-067-33/+481
| |
| * fixed var name, $filename should be $foldernameBjoern Schiessle2012-06-061-1/+1
| |
| * avoid too-early database access and thus make owncloud installable againArthur Schiwon2012-06-061-12/+14
| |
| * Contacts: Make js a tad DRYer. Added URL property.Thomas Tanghus2012-06-064-42/+34
| |
| * Correct mime type.Thomas Tanghus2012-06-061-1/+1
| |
| * fix wrong documentationFrank Karlitschek2012-06-061-12/+1
| |
| * LDPA: don't drop legal whitespaces when sanitizing DN. Fixes oc-914Arthur Schiwon2012-06-061-1/+1
| |
| * Corrected typos.Thomas Tanghus2012-06-061-3/+3
| |
| * fixed wrong function callBjoern Schiessle2012-06-065-6/+6
| |
* | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-06630-8675/+29340
|\|
| * Less aggressive caching on thumbnails too.Thomas Tanghus2012-06-061-5/+1
| |
| * Cleanup.Thomas Tanghus2012-06-0612-88/+2
| |
| * Also use OC_Cache here.Thomas Tanghus2012-06-061-12/+6
| |
| * Contacts: Removed temp dir cleanup after using OC_Cache.Thomas Tanghus2012-06-062-53/+1
| |
| * update translationsRobin Appelman2012-06-06533-8121/+27330
| |
| * dont show config option for file upload size if we cant write the new valueRobin Appelman2012-06-062-2/+4
| |
| * update l10n script to better read js filesRobin Appelman2012-06-061-1/+1
| |
| * prevent creating files with a / the nameRobin Appelman2012-06-063-0/+13
| |
| * Supress any warnings if log file does not existMichael Gapczynski2012-06-051-1/+1
| |