aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* tixing width and position of wider error messagesThomas Müller2013-08-162-1/+6
|
* merge master into css-fixesJan-Christoph Borchardt2013-08-161473-14328/+24962
|\
| * Merge pull request #4354 from ↵Thomas Müller2013-08-153-7/+11
| |\ | | | | | | | | | | | | owncloud/fix_2711_shared_icon_disappears_on_firefox fix #2711 using a custom event, also use css selectors over filterAttr
| | * 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 file
| | * | 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 4444 master
| | * | 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 session
| | * | Cache OC_Util::checkServer() result in sessionMarkus Goetz2013-08-151-0/+7
| |/ / | | | | | | | | | | | | The return value almost never changes but this function is called for every request.
| * | [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#4301
| | * | Fixing owncloud/core#4301Alexander Bogdanov2013-08-021-0/+1
| | | | | | | | | | | | Adding a CURLOPT_FOLLOWLOCATION for HTTP 301 support (e.g yandex disk uses those)
| * | | Merge pull request #4393 from owncloud/fix_4326Andreas Fischer2013-08-141-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | provide correct path for require_once * owncloud/fix_4326: use __DIR__ instead of realpath provide correct path for require_once
| | * | | 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 theme name and title for password reset
| | * | | | use getName instead of getTitleMyles McNamara2013-08-081-1/+1
| | | | | |
| | * | | | fix syntax errorMyles McNamara2013-08-031-1/+1
| | | | | | | | | | | | | | | | | | accidentally had ; included, and changed concatenating
| | * | | | use theme name and title for password resetMyles McNamara2013-08-031-1/+2
| | | | | | | | | | | | | | | | | | password reset email uses owncloud, updated to use theme settings
| * | | | | Merge pull request #4372 from owncloud/allow_empty_configvalueThomas Müller2013-08-141-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | allow empty configvalue in appconfig
| | * | | | | 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Use plural translations
| | * | | | | | 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
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Send mime-type for new files
| | * | | | | | | 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
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix sharing defaults
| | * | | | | | | 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
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Fix recursive scanner to reusing etags
| | * | | | | | | 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
| | | | | | | |
| * | | | | | | Merge pull request #4360 from owncloud/format-date-numeric-stringsOwen Winkler2013-08-092-2/+13
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | Do not pass numeric strings to strtotime() when formatting dates.
| | * | | | | | adding test case for a numeric valueThomas Müller2013-08-091-2/+7
| | | | | | | |
| | * | | | | | Add datetime test for numeric string.Andreas Fischer2013-08-091-0/+7
| | | | | | | |
| | * | | | | | Changing elseif statement to what the PEAR coding guidelines say.Andreas Fischer2013-08-091-2/+1
| | | | | | | |
| | * | | | | | Do not pass numeric strings to strtotime() when formatting dates.Andreas Fischer2013-08-091-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | strtotime() will return false and the date will be formatted as the 0-timestamp (e.g. January 1, 1970 00:00) otherwise.
| * | | | | | Merge pull request #4344 from owncloud/appmgmt-in-navigationJan-Christoph Borchardt2013-08-096-17/+40
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | show 'More apps' link to app administration directly in app navigation
| | * | | | | draw attention to the newly added app entry by flashing it twiceJan-Christoph Borchardt2013-08-071-0/+3
| | | | | | |
| | * | | | | scroll the app navigation down so the newly added app is seenJan-Christoph Borchardt2013-08-071-0/+2
| | | | | | |
| | * | | | | prepend the new app before the 'More apps' functionJan-Christoph Borchardt2013-08-071-1/+2
| | | | | | |
| | * | | | | show 'More apps' link to app administration directly in app navigationJan-Christoph Borchardt2013-08-075-16/+33
| | | |_|_|/ | | |/| | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-15 08:35:19 +0000