summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1419 from owncloud/etag_fixThomas Müller2013-02-022-2/+6
|\
| * Dav: update etag in filecache when doing a PROPSETRobin Appelman2013-02-021-1/+3
| * Dav: don't overwrite etag from filecache with old etag from properties tableRobin Appelman2013-02-021-1/+3
|/
* Merge pull request #1415 from owncloud/ldap_fix_settingsLukas Reschke2013-02-012-20/+32
|\
| * remove ugly whitespaceArthur Schiwon2013-02-011-1/+1
| * LDAP: settings Advanced tab has grown too long by far. Structure it using acc...Arthur Schiwon2013-02-012-20/+32
* | [tx-robot] updated from transifexJenkins for ownCloud2013-02-02382-2256/+2445
|/
* Merge pull request #1413 from owncloud/enable_removing_search_providersFrank Karlitschek2013-02-011-0/+16
|\
| * add function to remove a search providerJörn Friedrich Dreyer2013-02-011-0/+16
* | Merge pull request #1395 from raghunayyar/webkit-scrollbar-534Jan-Christoph Borchardt2013-02-011-0/+5
|\ \
| * | More Visible webkit Scrollbar, syntax error solved.raghunayyar2013-02-011-3/+3
| * | Adds webkit scrollbar to ownCloudraghunayyar2013-01-311-0/+5
* | | Merge pull request #1384 from owncloud/upgrade_fixBart Visscher2013-02-011-70/+53
|\ \ \
| * | | Still load js files in maintance modeRobin Appelman2013-01-301-2/+6
| * | | Check for upgrade/maintance mode before trying to load an appRobin Appelman2013-01-301-70/+49
* | | | Merge pull request #1404 from owncloud/fixing-1276-masterblizzz2013-02-011-3/+4
|\ \ \ \
| * | | | fix #1276 - use registerLoadedCallback()Thomas Mueller2013-02-011-3/+4
* | | | | Updateing -> UpdatingThomas Mueller2013-02-011-1/+1
* | | | | undelete -> restoreThomas Mueller2013-02-011-1/+1
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-01326-3231/+13981
* | | | | fix breadcrumbs for gallery and texteditorRobin Appelman2013-02-011-1/+0
|/ / / /
* | | | Merge pull request #1171 from owncloud/move-datadirectory-checksThomas Müller2013-01-311-30/+28
|\ \ \ \
| * \ \ \ Merge branch 'master' into move-datadirectory-checksMichael Gapczynski2013-01-18622-6831/+6456
| |\ \ \ \
| * | | | | Move permissions check to new function checkDataDirectoryPermissions()Michael Gapczynski2013-01-181-28/+27
| * | | | | Move data directory permission checks after data directory existence checksMichael Gapczynski2013-01-121-29/+28
* | | | | | Merge pull request #1287 from owncloud/ocs_xml_attributesThomas Müller2013-01-311-2/+5
|\ \ \ \ \ \
| * | | | | | Simpler method for getting the first charTom Needham2013-01-241-1/+1
| * | | | | | Remove some whitespaceTom Needham2013-01-241-4/+0
| * | | | | | API: If key begins with '@' treat it as an xml attributeTom Needham2013-01-241-2/+9
* | | | | | | Merge pull request #1351 from owncloud/navigationMichael Gapczynski2013-01-3131-3653/+583
|\ \ \ \ \ \ \
| * | | | | | | use translate string for Log out, remove titleJan-Christoph Borchardt2013-01-311-2/+2
| * | | | | | | fix svg fallback replacement for settings iconsJan-Christoph Borchardt2013-01-311-1/+1
| * | | | | | | fix header for shared linksJan-Christoph Borchardt2013-01-311-1/+3
| * | | | | | | Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-31297-2910/+7811
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-31473-7499/+10484
| |\ \ \ \ \ \ \ \
| * | | | | | | | | increase opacity of inactive apps and settings entries for better visibilityJan-Christoph Borchardt2013-01-311-3/+3
| * | | | | | | | | vertical scrollbar for app navigation when too many appsJan-Christoph Borchardt2013-01-311-1/+6
| * | | | | | | | | ellipsize long app names in navigationJan-Christoph Borchardt2013-01-311-0/+1
| * | | | | | | | | Merge pull request #1359 from raghunayyar/navigationJan-Christoph Borchardt2013-01-312-4/+10
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Shorter, Cleaner JS in apps.jsraghunayyar2013-01-311-8/+4
| | * | | | | | | | | Reduced Styling and Image loads as from src and not backgorund.raghunayyar2013-01-302-3/+5
| | * | | | | | | | | No Image Repetition on Enabling Apps in Navigation Barraghunayyar2013-01-302-1/+9
| * | | | | | | | | | use new user function to display real name if available, username still fallbackJan-Christoph Borchardt2013-01-301-1/+1
| * | | | | | | | | | Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-30326-9711/+11697
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ merge stylesJan-Christoph Borchardt2013-01-28561-9220/+31818
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | update Files icon from home to files, update Home icon from checkbox to homeJan-Christoph Borchardt2013-01-284-34/+78
| * | | | | | | | | | | | undo padding change on buttons, otherwise it will mess up the upload and new ...Jan-Christoph Borchardt2013-01-281-1/+1
| * | | | | | | | | | | | merge changes in navigationJan-Christoph Borchardt2013-01-283-6/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | More Style Fixesraghunayyar2013-01-251-2/+1
| | * | | | | | | | | | | Defined height for #leftcontentraghunayyar2013-01-252-2/+2