Commit Graph

12822 Commits

Author SHA1 Message Date
Thomas Müller 25ebe495b8 controller reuses IRequest methods 2013-08-20 21:05:55 +02:00
Thomas Müller f115b94927 Introducing IRequest 2013-08-20 17:53:58 +02:00
Thomas Müller 6e1946ab00 Introducing IContainer into public api 2013-08-20 17:22:33 +02:00
Thomas Müller 93194bb396 Introducing IContainer into public api 2013-08-20 17:21:14 +02:00
Thomas Müller cdada78aa4 typos & unused var fixed 2013-08-20 17:20:36 +02:00
Thomas Müller 0fa8f38076 fixing broken test 2013-08-20 16:51:12 +02:00
Thomas Müller 0fa2e1b3d9 there is no HttpMiddleware 2013-08-20 12:48:45 +02:00
Thomas Müller 72e1a8d83b fixing require to Pimple 2013-08-20 12:47:23 +02:00
Thomas Müller 3324495a78 pulling in 3rdparty submodule 2013-08-17 18:26:53 +02:00
Thomas Müller fde9cabe97 initial import of appframework 2013-08-17 11:16:48 +02:00
Thomas Müller 33bb2238ae updating 3rdparty repo commit 2013-08-16 08:06:25 +02:00
Jenkins for ownCloud 6bd0ba79df [tx-robot] updated from transifex 2013-08-16 01:32:30 -04:00
Jan-Christoph Borchardt d2767faf61 Merge pull request #4113 from owncloud/delete-fix
Delete icon fix
2013-08-15 15:31:42 -07:00
Jan-Christoph Borchardt b632b8f4e4 force show loading icon also for IE 2013-08-16 00:02:11 +02:00
Thomas Müller bd1895bdf8 Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_firefox
fix #2711 using a custom event, also use css selectors over filterAttr
2013-08-15 14:08:01 -07:00
Thomas Müller b3241402b9 Merge pull request #4443 from owncloud/remove-jplayer-from-core-css
remove jPlayer css rules from core css file
2013-08-15 08:38:56 -07:00
Morris Jobke 5fb7aab7a0 remove jPlayer css rules from core css file 2013-08-15 16:08:49 +02:00
Morris Jobke b6ac711787 Merge pull request #4448 from owncloud/fixing-4444-master
Fixing 4444 master
2013-08-15 07:06:18 -07:00
Thomas Müller ada13a4d40 fixing all broken translation files 2013-08-15 15:41:45 +02:00
Thomas Müller c71408eaa9 fixing call to join 2013-08-15 15:38:33 +02:00
Markus Goetz b9f3bb2426 Merge pull request #4441 from guruz/checkServer_cache_result
Cache OC_Util::checkServer() result in session
2013-08-15 03:52:16 -07:00
Markus Goetz 3972198b61 Cache OC_Util::checkServer() result in session
The return value almost never changes but this function
is called for every request.
2013-08-15 11:58:09 +02:00
Jenkins for ownCloud 680ac48856 [tx-robot] updated from transifex 2013-08-15 04:53:54 -04:00
Morris Jobke de89c31f5a Merge pull request #4302 from synchrone/master
Fixing owncloud/core#4301
2013-08-14 17:11:30 -07:00
Andreas Fischer 75e9015b54 Merge pull request #4393 from owncloud/fix_4326
provide correct path for require_once

* owncloud/fix_4326:
  use __DIR__ instead of realpath
  provide correct path for require_once
2013-08-14 21:20:53 +02:00
Thomas Müller 06670cef8a Merge pull request #4304 from tripflex/lostpw-themed
use theme name and title for password reset
2013-08-14 12:04:40 -07:00
Thomas Müller 994537a5b9 Merge pull request #4372 from owncloud/allow_empty_configvalue
allow empty configvalue in appconfig
2013-08-14 10:34:06 -07:00
Jörn Friedrich Dreyer 8f3f47e868 Merge pull request #4376 from owncloud/use_plurals
Use plural translations
2013-08-14 10:23:19 -07:00
Thomas Müller b3b2b2d64c Merge pull request #4363 from owncloud/fix-4355
Send mime-type for new files
2013-08-14 09:46:10 -07:00
Bjoern Schiessle 7d0e9cc685 use __DIR__ instead of realpath 2013-08-14 17:15:01 +02:00
kondou 4002491947 Reword a phrase 2013-08-14 06:29:19 +02:00
Jörn Friedrich Dreyer 435e63b5ee Merge pull request #4410 from owncloud/fix_sharing_defaults
Fix sharing defaults
2013-08-13 15:27:24 -07:00
Jörn Friedrich Dreyer 11a404b90b comment clarification 2013-08-14 00:25:07 +02:00
Jörn Friedrich Dreyer ca95a475d5 use edit & reshare permission as default 2013-08-13 22:58:47 +02:00
Jörn Friedrich Dreyer 5660f99592 add PERMISSIONS_ALL summary 2013-08-13 22:58:27 +02:00
Jenkins for ownCloud 9492aeffe9 [tx-robot] updated from transifex 2013-08-13 09:13:11 -04:00
Bjoern Schiessle eb0fdc8380 provide correct path for require_once 2013-08-12 17:38:57 +02:00
icewind1991 77596ace81 Merge pull request #4391 from owncloud/scanner-reuse-recursive
Fix recursive scanner to reusing etags
2013-08-12 08:28:23 -07:00
Robin Appelman f22719b1ee Scanner: correctly pass trough reuse options when doing a recursive scan 2013-08-12 15:37:39 +02:00
Robin Appelman 1877a42a0d Scanner: additional tests for reusing etags during scanning 2013-08-12 15:37:15 +02:00
Jenkins for ownCloud 5ebff8cfc4 [tx-robot] updated from transifex 2013-08-11 08:11:03 -04:00
Owen Winkler 4128561f22 Merge pull request #4360 from owncloud/format-date-numeric-strings
Do not pass numeric strings to strtotime() when formatting dates.
2013-08-09 16:05:01 -07:00
Thomas Müller 0e3dea7111 adding test case for a numeric value 2013-08-09 23:36:23 +02:00
Andreas Fischer b6b1bc5d09 Add datetime test for numeric string. 2013-08-09 22:32:38 +02:00
Andreas Fischer 43be3eb4d0 Changing elseif statement to what the PEAR coding guidelines say. 2013-08-09 22:32:38 +02:00
Andreas Fischer 9c22046bff Do not pass numeric strings to strtotime() when formatting dates.
strtotime() will return false and the date will be formatted as the 0-timestamp
(e.g. January 1, 1970 00:00) otherwise.
2013-08-09 22:32:38 +02:00
kondou 9549bd3e68 Use plural translations 2013-08-09 20:37:18 +02:00
Jan-Christoph Borchardt 4c0ec974b9 Merge pull request #4344 from owncloud/appmgmt-in-navigation
show 'More apps' link to app administration directly in app navigation
2013-08-09 08:49:41 -07:00
Jenkins for ownCloud 98f836363a [tx-robot] updated from transifex 2013-08-09 08:06:31 -04:00
Jörn Friedrich Dreyer 9334974a92 allow empty configvalue in appconfig 2013-08-09 11:27:21 +02:00