summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-08-16214-1749/+1447
* Merge pull request #4113 from owncloud/delete-fixJan-Christoph Borchardt2013-08-159-26/+46
|\
| * force show loading icon also for IEJan-Christoph Borchardt2013-08-161-0/+2
| * fix loading.gif size for both upload and deletion, force visiblityJan-Christoph Borchardt2013-07-302-2/+8
| * Replace delete icon with spinnerVictor Dubiniuk2013-07-292-7/+5
| * Merge branch 'master' into delete-fixThomas Müller2013-07-231389-12870/+80511
| |\
| * | Explicit ie8 fallbackVictor Dubiniuk2013-07-231-0/+4
| * | fix delete button not showing in IE8Jan-Christoph Borchardt2013-07-221-4/+4
| * | use new delete icon for deleted files as wellJan-Christoph Borchardt2013-07-181-1/+1
| * | remove unnecessary tipsy for Files deleteJan-Christoph Borchardt2013-07-182-2/+1
| * | use background image instead of img for Files delete iconJan-Christoph Borchardt2013-07-182-4/+5
| * | make delete icon less intrusive again, only on hoverJan-Christoph Borchardt2013-07-185-10/+20
* | | Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_fir...Thomas Müller2013-08-153-7/+11
|\ \ \
| * | | fix #2711 using a custom event, also use css selectors over filterAttrJörn Friedrich Dreyer2013-08-083-7/+11
* | | | Merge pull request #4443 from owncloud/remove-jplayer-from-core-cssThomas Müller2013-08-152-6/+3
|\ \ \ \
| * | | | remove jPlayer css rules from core css fileMorris Jobke2013-08-152-6/+3
|/ / / /
* | | | Merge pull request #4448 from owncloud/fixing-4444-masterMorris Jobke2013-08-15289-957/+957
|\ \ \ \
| * | | | fixing all broken translation filesThomas Müller2013-08-15288-956/+956
| * | | | fixing call to joinThomas Müller2013-08-151-1/+1
|/ / / /
* | | | Merge pull request #4441 from guruz/checkServer_cache_resultMarkus Goetz2013-08-151-0/+7
|\ \ \ \
| * | | | Cache OC_Util::checkServer() result in sessionMarkus Goetz2013-08-151-0/+7
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-15615-8868/+8099
* | | | Merge pull request #4302 from synchrone/masterMorris Jobke2013-08-141-0/+1
|\ \ \ \
| * | | | Fixing owncloud/core#4301Alexander Bogdanov2013-08-021-0/+1
* | | | | Merge pull request #4393 from owncloud/fix_4326Andreas Fischer2013-08-141-1/+1
|\ \ \ \ \
| * | | | | use __DIR__ instead of realpathBjoern Schiessle2013-08-141-1/+1
| * | | | | provide correct path for require_onceBjoern Schiessle2013-08-121-1/+1
* | | | | | Merge pull request #4304 from tripflex/lostpw-themedThomas Müller2013-08-141-1/+2
|\ \ \ \ \ \
| * | | | | | use getName instead of getTitleMyles McNamara2013-08-081-1/+1
| * | | | | | fix syntax errorMyles McNamara2013-08-031-1/+1
| * | | | | | use theme name and title for password resetMyles McNamara2013-08-031-1/+2
* | | | | | | Merge pull request #4372 from owncloud/allow_empty_configvalueThomas Müller2013-08-141-1/+1
|\ \ \ \ \ \ \
| * | | | | | | allow empty configvalue in appconfigJörn Friedrich Dreyer2013-08-091-1/+1
* | | | | | | | Merge pull request #4376 from owncloud/use_pluralsJörn Friedrich Dreyer2013-08-145-35/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Reword a phrasekondou2013-08-141-1/+1
| * | | | | | | | Use plural translationskondou2013-08-095-35/+16
* | | | | | | | | Merge pull request #4363 from owncloud/fix-4355Thomas Müller2013-08-141-11/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use multiple lines for the JSON data array.Andreas Fischer2013-08-081-1/+5
| * | | | | | | | | Adjust JSON code to stable5.Andreas Fischer2013-08-081-1/+2
| * | | | | | | | | Do not repeat JSON success code.Andreas Fischer2013-08-081-8/+7
| * | | | | | | | | Do not repeat definition of $target.Andreas Fischer2013-08-081-5/+6
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #4410 from owncloud/fix_sharing_defaultsJörn Friedrich Dreyer2013-08-132-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | comment clarificationJörn Friedrich Dreyer2013-08-141-1/+1
| * | | | | | | | | use edit & reshare permission as defaultJörn Friedrich Dreyer2013-08-131-2/+2
| * | | | | | | | | add PERMISSIONS_ALL summaryJörn Friedrich Dreyer2013-08-131-0/+1
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-1361-153/+224
* | | | | | | | | | Merge pull request #4391 from owncloud/scanner-reuse-recursiveicewind19912013-08-123-1/+93
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Scanner: correctly pass trough reuse options when doing a recursive scanRobin Appelman2013-08-121-1/+1
| * | | | | | | | | Scanner: additional tests for reusing etags during scanningRobin Appelman2013-08-122-0/+92
|/ / / / / / / / /
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-11254-1148/+1100