summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge master into filesystemRobin Appelman2012-12-25366-5511/+7731
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-2516-69/+93
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-2438-376/+528
| * Merge pull request #845 from owncloud/sqlite_errorFrank Karlitschek2012-12-221-2/+1
| |\
| | * Try to fix #836Frank Karlitschek2012-12-121-2/+1
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-12-2342-147/+188
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-12-2246-269/+371
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-12-21138-355/+496
| * | fixing variable nameThomas Müller2012-12-211-2/+2
| * | Merge pull request #978 from owncloud/logout-iconMichael Gapczynski2012-12-202-18/+100
| |\ \
| | * | fix logout icon, hopefully also #969Jan-Christoph Borchardt2012-12-202-18/+100
| * | | Merge pull request #935 from owncloud/ignore_autogenerated_testfilesBart Visscher2012-12-201-0/+6
| |\ \ \
| | * | | ignore autogenerated testfiles and foldersJörn Friedrich Dreyer2012-12-181-0/+6
| * | | | Merge pull request #869 from owncloud/files-stylesJan-Christoph Borchardt2012-12-204-28/+37
| |\ \ \ \
| | * | | | fix switched values from previous commitJan-Christoph Borchardt2012-12-201-2/+2
| | * | | | fix Firefox issues with file actions position and multiselect bar widthJan-Christoph Borchardt2012-12-201-1/+2
| | * | | | use slightly darker color for file actions background, fix fugly look for sel...Jan-Christoph Borchardt2012-12-201-1/+4
| | * | | | fix file actions messing with file row height on narrower screensJan-Christoph Borchardt2012-12-201-1/+9
| | * | | | move CSS from JS to CSSJan-Christoph Borchardt2012-12-202-13/+10
| | * | | | bring back fixed multiselect bar so it’s visible when scrolled down, fix #746Jan-Christoph Borchardt2012-12-132-6/+8
| | * | | | remove transitions for file rows and actions because it made everything seem ...Jan-Christoph Borchardt2012-12-131-3/+1
| | * | | | fix new button popup looking blurryJan-Christoph Borchardt2012-12-132-5/+5
| * | | | | Merge pull request #970 from owncloud/fixing-950-masterJan-Christoph Borchardt2012-12-201-394/+402
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | adding missing translations for various strings + fixing tool tip on deleteThomas Müller2012-12-201-394/+402
| * | | | | Merge pull request #974 from owncloud/fixing-120-masterJan-Christoph Borchardt2012-12-205-819/+842
| |\ \ \ \ \
| | * | | | | remove timezone.jsThomas Müller2012-12-201-12/+0
| | * | | | | setting the timezone is now part of the login process and true part of the core.Thomas Müller2012-12-204-807/+842
| * | | | | | Merge pull request #925 from owncloud/fix_issue_918Bart Visscher2012-12-201-0/+6
| |\ \ \ \ \ \
| | * | | | | | Trigger last action before continuing with creating a new file/folder/from linkMichael Gapczynski2012-12-161-0/+3
| | * | | | | | Trigger the last action before continuing with a file upload, fixes issue #918Michael Gapczynski2012-12-161-0/+3
| * | | | | | | Merge pull request #914 from owncloud/incorporate-qa-tools-used-by-ciBart Visscher2012-12-204-0/+296
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Migration of build files from JenkinsThomas Mueller2012-12-154-0/+296
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-20193-3531/+4509
| | |_|/ / / / | |/| | | | |
| * | | | | | [l18n] fixing typos in source textThomas Müller2012-12-191-100/+121
| * | | | | | Merge pull request #888 from owncloud/add_curl_proxyFrank Karlitschek2012-12-192-27/+38
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'add_curl_proxy' of https://github.com/owncloud/core into add_cu...Frank Karlitschek2012-12-190-0/+0
| | |\ \ \ \ \ \
| | | * | | | | | call it "proxy" instead of "curlproxy"root2012-12-152-6/+6
| | | * | | | | | make it more readable as deepdiver suggestedFrank Karlitschek2012-12-141-2/+6
| | | * | | | | | add curl proxy support. Fixes #504Frank Karlitschek2012-12-142-0/+8
| | | |/ / / / /
| | * | | | | | call it "proxy" instead of "curlproxy"root2012-12-192-6/+6
| | * | | | | | make it more readable as deepdiver suggestedFrank Karlitschek2012-12-191-2/+6
| | * | | | | | add curl proxy support. Fixes #504Frank Karlitschek2012-12-192-27/+34
| |/ / / / / /
| * | | | | | Merge pull request #961 from owncloud/check_localeFrank Karlitschek2012-12-194-0/+32
| |\ \ \ \ \ \
| | * | | | | | add a check and a warning if setlocale is workingFrank Karlitschek2012-12-194-0/+32
| * | | | | | | Merge pull request #868 from owncloud/new_doc_systemFrank Karlitschek2012-12-196-72/+61
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | fixing links docu/ ->doc/Thomas Mueller2012-12-141-2/+2
| | * | | | | | make it more readableFrank Karlitschek2012-12-141-3/+7
| | * | | | | | rename to docFrank Karlitschek2012-12-142-0/+0
| | * | | | | | add pointer to the existing documentation. This will be replaced by the rel d...Frank Karlitschek2012-12-142-4/+4
| | * | | | | | remove PgeNavi. It's no longer usedFrank Karlitschek2012-12-131-30/+1