Thomas Müller
a4f0483f56
Update Symfony/Console to 2.5 & Update Symfony/Routing to 2.5
2014-11-03 13:52:47 +01:00
Lukas Reschke
d30fd23544
Clear session before setup
...
Fixes https://github.com/owncloud/core/issues/11861
2014-10-31 11:21:00 +01:00
Thomas Müller
105940b9dc
Merge pull request #11638 from owncloud/oc8-translations
...
[OC8] Load javascript translations using standard web technologies
2014-10-29 13:09:02 +01:00
Vincent Petry
d71cd680dd
Include core translations
...
Moved search result type translations to search.js
Load JS translations earlier
Translations need to be loaded earlier to make sure that some JS files
like search.js get access to translations at this time.
This requires the template initialization to be moved to after session
initialization, because only after the session we have access to the
current language.
2014-10-29 10:09:12 +01:00
Vincent Petry
ec1a73fab9
Added OC.L10N namespace with translation functions
...
Added addTranslations and fixed de.js file
Fixed de.js to use OC.L10N.register() and use to correct expected
format.
Added JS unit tests for OC.L10N class
Include translations JS script for all apps
2014-10-29 10:09:12 +01:00
Thomas Müller
46c2909c78
Update doctrine/dbal to 2.5
2014-10-28 15:39:37 +01:00
Thomas Müller
c93ddf77b9
Use composer autoloader to load Patchwork
2014-10-28 13:42:28 +01:00
Adam Williamson
0e3f2055d2
use Composer autoloader not OC for non-Composer 3rdparty ( #9643 )
...
Composer's autoloader is rather better than the OwnCloud autoloader's
handling of non-OC classes. Plus we can rely on upstream Composer to
maintain it and not worry about it ourselves.
With this change, we drop the bits of OwnCloud's autoloader that
handled non-OC classes, and register the classes that were being
handled by that code with Composer's autoloader instead. As these
dependencies are converted to actually being managed by Composer,
the explicit registrations can be dropped as they won't be needed
any more.
Since OwnCloud's autoloader isn't going to handle non-OC classes any
more, we no longer need to test to make sure it does it right.
drop unneeded registerPrefix() and registerClass() from autoloader
Now we're not handling anything but OC's own classes, these are
unnecessary.
error out if composer autoloader is not found (thanks bantu)
We're never going to be able to work without the autoloader, if it's not
there we should just throw our hands up and surrender.
2014-10-28 11:32:20 +01:00
Lukas Reschke
d6380a5395
Merge pull request #11786 from owncloud/MakeSupportedDBsConfigurable
...
Make supported DBs configurable within config.php
2014-10-27 22:24:16 +01:00
Lukas Reschke
233c49f4b9
Make supported DBs configurable within config.php
...
This commit will make the supported DBs for installation configurable within config.php. By default the following databases are tested: "sqlite", "mysql", "pgsql". The reason behind this is that there might be instances where we want to prevent SQLite to be used by mistake.
To test this play around with the new configuration parameter "supportedDatabases".
2014-10-27 21:39:34 +01:00
Robin Appelman
0b96297783
Use the TempManager to handle temporary files
2014-10-24 12:18:49 +02:00
Morris Jobke
e2ff180521
Merge pull request #11416 from owncloud/eventlogger
...
Allow apps to gather performance diagnistics
2014-10-22 11:18:26 +02:00
Thomas Müller
2814a294c8
call initPaths() right before the server is instantiated
2014-10-21 14:10:57 +02:00
Thomas Müller
d9907b6fa3
move some deprecated usage of OC_Config and OC_AppConfig to \OC::server
2014-10-20 14:44:44 +02:00
Robin Appelman
9fd234f63f
Log some additional events
2014-10-20 13:38:38 +02:00
Robin Appelman
1e69f5e7ac
Log some basic events
2014-10-20 13:38:38 +02:00
Vincent Petry
9fc23e1967
Merge pull request #10934 from owncloud/datadir-write-setup
...
Don't complain about non-writable datadirs before we're installed
2014-09-25 14:32:32 +02:00
Lukas Reschke
4893d2c0ed
Show login again instead of JSON if CSRF check fails
...
Previously a JSON error page was shown to the user in-case the CSRF token was not valid. This was confusing and prevented people from login.
With this at least the login page is shown again and not a JSON error message. I consider this as sufficient since adding a new error page just for this sake would uneededly make lib/base.php even more cluttered and this is a edge-case which optimally should anyways not happen that often.
This can be tested by opening the login page, then clearing the cookies, and trying to login.
2014-09-23 14:55:08 +02:00
Thomas Müller
bb18fe1384
send browsers timezone back tp the server on login
2014-09-22 14:01:45 +02:00
Thomas Müller
b1d0a0f3bf
Merge pull request #10939 from owncloud/add-port-to-trusted-domain-wizard
...
Append port to trusted domain in case it's not 80 or 443
2014-09-22 10:04:02 +02:00
Lukas Reschke
d0d3b7457b
Move BasicAuth check to "isLoggedIn()"
...
Ensures that Basic Auth works properly for APIs and removes the need for some even uglier lines of code.
2014-09-18 16:14:07 +02:00
Robin Appelman
6fa3280c2a
Inject config into checkserver and cleanup tests
2014-09-18 13:33:13 +02:00
Lukas Reschke
c19bc1917b
Move basic auth check
...
At the previous point not all apps were initialized. Now the basic auth check happens together at the same location as all others.
Fixes https://github.com/owncloud/core/issues/11129
2014-09-17 16:04:12 +02:00
Lukas Reschke
07b14bcd4f
Merge pull request #10960 from owncloud/use-intl-module-master
...
use intl's native normalizer_normalize() in case the module is available
2014-09-15 14:13:30 +02:00
Thomas Müller
59209e0f2b
use intl's native normalizer_normalize() in case the module is available
2014-09-11 10:24:31 +02:00
kondou
69f2c0544e
Refresh if maintenance mode is over
...
Using status.php for this.
I modified status.php to also show, whether we're in maintenance.
Checks every 20 seconds if maintenance is over, if yes: reload.
2014-09-09 17:26:11 +02:00
Lukas Reschke
2590a4dc85
Append port to trusted domain in case it's not 80 or 443
...
Ref https://github.com/owncloud/core/pull/10584#issuecomment-54677059
2014-09-08 16:15:31 +02:00
Vincent Petry
d6bfd90bf8
Do not load extra user backends when an upgrade is due
...
Whenever an upgrade is due, do not load extra user backends
2014-09-08 12:30:04 +02:00
Lukas Reschke
c9afa60f62
Move trusted domain check to init()
...
handleRequest() is not called from remote.php or public.php which made these files party available but all included apps in there produced errors.
As the expected behaviour is anyways that a trusted domain warning is shown I moved this to init()
Fixes https://github.com/owncloud/core/issues/10064
2014-09-05 14:10:35 +02:00
Lukas Reschke
63a90a129b
Use proper RNG generator
...
OC_Util::generateRandomBytes() only returns lowercase alphanumeric values.
We should use the new RNG which has a broader characterset.
2014-09-03 17:46:48 +02:00
Robin Appelman
3c618a0252
Also setup the filesystem when matching routes
2014-09-02 16:15:42 +02:00
Robin Appelman
a9a37b5363
Don't automatically setup the filesystem the moment we load OC\Files\FileSystem
2014-09-02 16:15:42 +02:00
Robin Appelman
d0266c0bf8
Use public api for getting l10n
2014-08-31 10:08:22 +02:00
Jörn Friedrich Dreyer
f687794a4a
be correct in deprecation documentation
2014-08-29 10:22:21 +02:00
Jörn Friedrich Dreyer
f551917a3c
kill OC::$session
...
maintain deprecated \OC::$session when getting or setting the session via the server container or UserSession
restore order os OC::$session and OC::$CLI
remove unneded initialization of dummy session
write back session when $useCustomSession is true
log warning when deprecated app is used
2014-08-29 10:22:21 +02:00
Georg Ehrke
f82b788ba5
add moment.js
2014-08-26 17:39:15 +02:00
Lukas Reschke
97b536e3df
Add a trusted domain wizard
...
Adds a little button to the trusted domain warning, if an admin clicks on the warning he will be redirected to ownCloud and asked whether he want to trust this domain.
By far not the cleanest code, or clean at all, but does the job and I don't see a reason to make a lot of changes for this little improvement.
2014-08-21 22:22:35 +02:00
blizzz
52d5429768
Merge pull request #10522 from owncloud/removeLoadAppScript
...
Remove loadAppScriptFile
2014-08-21 19:59:31 +02:00
Lukas Reschke
ea2a45f19d
Remove loadAppScriptFile
2014-08-19 15:16:49 +02:00
Lukas Reschke
fdb203ff1e
Merge pull request #10409 from owncloud/iShallNotCopyStuffWithoutThinking
...
Add a copied_sample_config switch
2014-08-19 11:03:57 +02:00
Lukas Reschke
c33d1cacd4
Add a copied_sample_config switch
...
Hopefully this will stop people from copying the sample config. I'm so annoyed by all those wrong bug reports...
Add some explanation about this switch
Move check to init
2014-08-19 09:57:03 +02:00
Lukas Reschke
a822a31ce3
Merge pull request #10442 from owncloud/move-failed-logins
...
Move authentication failed logging to checkPassword
2014-08-15 16:50:28 +02:00
Lukas Reschke
5bb4772858
Move authentication failed logging to checkPassword
...
Fixes https://github.com/owncloud/core/issues/10366
2014-08-15 12:13:00 +02:00
Lukas Reschke
a4a897d26d
Remove ability to trigger DEBUG mode via cookie
...
Users should not be able to enable debug mode on their own by setting a cookie. Using debug mode might leak too much information about the environment or have other unexpected behaviour.
We should backport this.
2014-08-15 11:21:56 +02:00
Jörn Friedrich Dreyer
fd798fd982
update deprecation docs
2014-08-14 12:22:34 +02:00
blizzz
54491e8c68
Merge pull request #10323 from gekmihesg/master
...
Load authentication backends before tryBasicAuth
2014-08-13 16:08:48 +02:00
gekmihesg
578a57f0fb
Load authentication backends before tryBasicAuth
2014-08-10 13:29:32 +02:00
marc0s
f2e20757f6
Fix checking of NULL or empty OC::$THIRDPARTYROOT/OC::$THIRDPARTYWEBROOT
...
Fixes #10065
2014-07-30 23:24:55 +02:00
Morris Jobke
521934ee0d
Merge pull request #10029 from owncloud/fix-thirdparty
...
Fix silent crash if 3rdparty dir is not available
2014-07-30 18:34:55 +02:00
Victor Dubiniuk
eb9bd200fa
Replace exit with return
2014-07-30 14:03:31 +02:00
Victor Dubiniuk
31e7fdb9bf
Fix silent crash if 3rdparty dir is not available
2014-07-30 14:03:31 +02:00
Andreas Fischer
a8fbc709ce
Add registerAutoloaderCache().
2014-07-29 11:18:40 +02:00
Andreas Fischer
9be8ac5867
Memcache\Factory: Remove static, use globalPrefix.
2014-07-29 11:14:36 +02:00
Andreas Fischer
da391b8932
InstanceId is properly injected into factory. Remove comment.
2014-07-29 11:03:10 +02:00
Thomas Müller
a3411e3719
Merge pull request #9641 from owncloud/localuser-addressbook
...
ownCloud users are exported as address book
2014-07-28 12:18:56 +02:00
Jörn Friedrich Dreyer
ec7a10f882
reorder if statements to remove negation, indentation correction
2014-07-25 19:39:29 +02:00
Thomas Müller
176ecbd311
ownCloud users are exported as address book
2014-07-24 17:35:02 +02:00
Thomas Müller
2594fb80aa
don't silently exit in cli-mode in case ownCloud in not yet installed
2014-07-24 13:45:06 +02:00
Lukas Reschke
1c16d012ab
Remove uneeded `strip_tags`
...
This `strip_tags` seems to be completely unneeded and will cause problems with passwords containing stripped characters. (e.g. `<` or `>`)
Needs https://github.com/owncloud/core/pull/9735 to be merged first.
2014-07-19 10:17:24 +02:00
Andreas Fischer
bfd59bddf4
Extract Auth Header logic into new function handleAuthHeaders().
2014-07-19 02:21:18 +02:00
Andreas Fischer
fafed17c60
Deduplicate user/password extraction from alternative HTTP headers.
2014-07-19 02:06:37 +02:00
Joas Schilling
5d3e1bc023
Only calculate the WEBROOT from scriptName if it contains $SUBURI
...
If not we are most likely in CLI mode. However to be able to still
generate valid URLs, we need to use the overwrite webroot instead.
Fix #9490
2014-07-07 15:08:46 +02:00
Bjoern Schiessle
3c45925e74
fix hook names
2014-07-03 13:52:58 +02:00
Volkan Gezer
ae68a773c0
more strings to translate in utils also some fixes in defaults
2014-06-28 13:29:24 +02:00
Vincent Petry
a120d6e9a3
Bring back loadApps() in base.php
...
loadApps() had been deleted by mistake in
799205488c
2014-06-24 17:37:58 +02:00
Vincent Petry
799205488c
Prevent loadApps on upgrade
...
Moved OC::needUpgrade() to OCP\Util::needUpgrade() to make it accessible
form the router.
Moved maintenance + upgrade check to the router.
2014-06-18 11:10:07 +02:00
Lukas Reschke
d4bdcb7a9b
Merge pull request #9047 from owncloud/fix_preload_fundamental_apps
...
Load fundamental apps, before any possible customizing app may follow
2014-06-18 07:29:04 +02:00
Lukas Reschke
f2fc214ce0
Add deprecation notice to load* functions
...
This functions are deprecated and/or removed since ownCloud 7. Additionally a issubdirectory check has been added here to prevent developers to use this function in a potentially insecure way.
Port of https://github.com/owncloud/core/pull/9033
2014-06-16 20:33:04 +02:00
Arthur Schiwon
7b704eeb5e
Load fundamental apps, before any possible customizing app may follow
2014-06-16 13:12:21 +02:00
Morris Jobke
63c5c7bd21
set logger before registrate to an error handler
2014-06-09 10:02:23 +02:00
Thomas Müller
289accc31b
Merge pull request #8159 from owncloud/mobile-sidebar-swipe
...
Mobile sidebar swipe
2014-06-06 11:27:04 +02:00
Jan-Christoph Borchardt
9e56acbdc9
add snap.js script
2014-06-05 11:52:17 +02:00
Lukas Reschke
7c4abce373
Move authentication to it's own call
2014-06-05 11:45:45 +02:00
Lukas Reschke
ac7fb1b23e
Remove legacy routing code
...
The getfile routing code was absolutely legacy and not needed anymore. Additionally \OC::$REQUESTEDAPP was never set to the actually accessed application.
This commit removes the legacy routing code and ensures that $REQUESTEDAPP is always set so that other applications (e.g. the firewall or a two-factor authentication) can intercept the currently accessed app.
Testplan:
[x] Installation works
[x] Login with DB works
[x] Logout works
[x] Login with alternate backend works (tested with user_webdavauth)
[x] Other apps are accessible
[x] Redirect on login works (e.g. index.php?redirect_url=%2Fcore%2Findex.php%2Fsettings%2Fapps%3Finstalled)
[x] Personal settings are accessible
[x] Admin settings are accessible
[x] Sharing files works
[x] DAV works
[x] OC::$REQUESTEDAPP contains the requested application and can be intercepted by other applications
2014-06-05 11:45:45 +02:00
Thomas Müller
1c20c72efe
Merge pull request #8620 from owncloud/design-navigation-two
...
Toggle app navigation not only on mobile, but on desktop as well
2014-06-05 10:53:22 +02:00
Vincent Petry
95fda3c17c
Do not load apps when upgrade is needed
...
This prevents routes like "core/js/oc.js" to automatically load apps and
trigger their update prematurely.
2014-06-04 18:52:52 +02:00
Jan-Christoph Borchardt
35308f5b09
hide navigation by default, not only on small screens, first step
2014-06-04 14:29:46 +02:00
Bernhard Posselt
ade6ed3797
Merge pull request #8701 from owncloud/slide-up-toggle
...
Create reusable data attribute for apps setting slideup
2014-06-04 11:31:04 +02:00
Jan-Christoph Borchardt
a244172219
Merge pull request #8853 from owncloud/design-typeface
...
Use Open Sans as typeface
2014-06-04 11:16:03 +02:00
Jan-Christoph Borchardt
6b2b903ea6
Merge pull request #8468 from owncloud/remove-infieldlabels
...
Remove infieldlabels
2014-06-04 09:28:20 +02:00
Morris Jobke
3a1994d001
Merge pull request #8686 from owncloud/session-early
...
Make the session available as early as possible
2014-06-03 19:23:30 +02:00
Jan-Christoph Borchardt
80627dfd2c
use Open Sans as typeface
2014-06-03 19:07:08 +02:00
Morris Jobke
cea7d4961e
move to updated version of placeholder
2014-06-03 16:18:06 +02:00
Jan-Christoph Borchardt
7177d3a496
first step of infield label removal, fix login screen
2014-06-03 15:28:59 +02:00
Robin Appelman
3e14affa9b
Add some comments
2014-06-03 10:57:18 +02:00
Vincent Petry
4e957c7b18
Merge pull request #8443 from owncloud/csrf-on-login-and-logout
...
Add CSRF check on login and logout
2014-06-02 11:27:20 +02:00
Lukas Reschke
705242d390
Merge pull request #8727 from owncloud/upgrade-overview
...
Added update overview page
2014-05-29 21:28:47 +02:00
Lukas Reschke
ce9d5df6df
Merge pull request #8681 from owncloud/logintimestamp
...
Record login timestamp per user. Required for new user managament.
2014-05-28 19:06:47 +02:00
Thomas Müller
f03a3d9d05
remove legacy OC_Filesystem being used in a hook callback
2014-05-28 00:13:54 +02:00
Vincent Petry
02f682b156
Now showing disabled apps as upgrade status line
...
- Added app id in update overview.
- Added status message for disabled app for CLI upgrade and web upgrade
2014-05-27 15:20:33 +02:00
Vincent Petry
146583a98d
Added update overview page
2014-05-27 14:53:08 +02:00
Bernhard Posselt
c2330e558e
rename to apps.js
2014-05-26 17:31:41 +02:00
Lukas Reschke
c03e7fcfa9
Clarify comment
2014-05-24 10:24:42 +02:00
Bernhard Posselt
db1511a11d
add a slideup mechanism
2014-05-23 18:49:16 +02:00
Robin Appelman
8b56d52398
Make the session available as early as possible
2014-05-23 13:27:27 +02:00
Arthur Schiwon
2c89962919
clean up tryRememberLogin and save the timestamp of users last login
2014-05-21 18:03:37 +02:00
scolebrook
954d5b27ff
use custom logfile path if defined, otherwise use default of owncloud.log in data directory
2014-05-20 11:29:59 -04:00
Thomas Müller
f8cb8f4803
Merge branch 'master' into csrf-on-login-and-logout
...
Conflicts:
core/templates/login.php
2014-05-19 20:40:55 +02:00
Morris Jobke
dc36d30953
Remove all occurences of @brief and @returns from PHPDoc
...
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
Thomas Müller
04e6c12fe2
Merge pull request #8557 from owncloud/custom_session_handling
...
Allow apps to create custom session handlers.
2014-05-19 15:58:30 +02:00
Robin McCorkell
bd3bf4b507
Change parameter order of implode
2014-05-13 19:08:14 +01:00
ringmaster
75bc25f906
Allow apps to create custom session handlers.
2014-05-12 11:08:28 -04:00
Thomas Müller
3cd32dcb7c
adding X-Robots-Tag to all responses of ownCloud + move addSecurityHeaders() to OC_Response, which seems to be a more reasonable place
2014-05-12 15:14:01 +02:00
Lukas Reschke
fd5b2d11d6
Rename issubdirectory to isSubDirectory
2014-05-11 15:50:59 +02:00
Lukas Reschke
e1e1009ccc
Redirect to index if the logout link is accessed without valid session
...
This is needed to prevent "Token expired" messages while login if a session is expired
@see https://github.com/owncloud/core/pull/8443#issuecomment-42425583
2014-05-11 13:09:46 +02:00
Lukas Reschke
73b914ddbc
Add CSRF check on login and logout
...
This is a minor issue and not worth a backport in my opinion as it could break more things than it's worth having it.
2014-05-04 13:56:21 +02:00
Bernhard Posselt
906061a07b
Merge pull request #8171 from owncloud/fix-import
...
be nice and use a relative import so people can use the class without fi...
2014-05-02 22:43:19 +02:00
Thomas Müller
7c0340c63c
Merge pull request #7852 from josh4trunks/basic_auth_fix
...
Fixes login / logout when HTTP Basic Headers are avilable.
2014-04-28 21:46:52 +02:00
Thomas Müller
6935364b33
add class Pimple to autloader
2014-04-28 20:57:44 +02:00
Lukas Reschke
1d9ac38da6
Remove an added t by the github webeditor
...
Notice to myself: Stick to my IDE.
2014-04-27 16:41:09 +02:00
Lukas Reschke
7a8bfeae6e
Grammatical fixes
2014-04-27 16:31:04 +02:00
Lukas Reschke
b6612ef04a
Clarify the trusted_domain error page
2014-04-26 23:11:29 +02:00
Volkan Gezer
ff0dab6e92
This adds one more missing untranslated text from lib/share
...
Also displays the untrusted domain warning in English
2014-04-24 01:42:18 +02:00
Lukas Reschke
e88731a477
Some more PHPDoc fixes
2014-04-21 15:44:54 +02:00
Lukas Reschke
c123dc7de4
Fix typo
...
Thanks @DeepDiver1975
2014-04-14 10:15:31 +02:00
Lukas Reschke
387d46cb98
Typo + Line breaks
2014-04-13 12:54:26 +02:00
Lukas Reschke
df67a04385
Move security headers to base.php
...
Some headers were currently only added to the templates but not to other components (e.g. SabreDAV / JSON / etc...)
The migration to base.php ensures that the headers are served to all requests passing base.php
2014-04-13 11:51:03 +02:00
Thomas Müller
647abe512b
reduce code duplication, fix parse error, prevent page reload on hitting enter while changing the display name - refs #8085
2014-04-07 14:04:16 +02:00
josh4trunks
5b402aa846
Fixed Typo
2014-04-03 22:12:57 -07:00
josh4trunks
a266144750
Don't always $cookie_path, only set it when needed
2014-04-03 22:12:57 -07:00
josh4trunks
d1106f1749
cookie would be useless if value is not set
2014-04-03 22:12:57 -07:00
josh4trunks
63df8354da
Don't to set the cookie it wasn't needed.
2014-04-03 22:12:57 -07:00
josh4trunks
4ddf5d92f2
Fixes login / logout when HTTP Basic Headers are avilable.
2014-04-03 22:12:57 -07:00
Vincent Petry
d0012e729a
Merge pull request #7879 from owncloud/sharing_cleanup_public_api
...
sharing api cleanup, first step
2014-03-28 12:23:11 +01:00
Thomas Müller
5fa8f7cf12
Merge pull request #7107 from owncloud/load-apps-proper-master
...
Load apps proper master
2014-03-28 10:33:55 +01:00
Bjoern Schiessle
b602662578
add a "helper" and a "hooks" class. Move constants needed by multiple classes
...
to a "constants" class
2014-03-25 17:47:24 +01:00
icewind1991
4c8a83e82f
Merge pull request #7714 from owncloud/phpunit-config
...
Allow setting the config dir to use as enviroment variable for phpunit
2014-03-24 13:01:37 +01:00
Thomas Müller
96e6cb3db4
all authentication apps are loaded at first - everything else relies on these apps
2014-03-21 15:00:25 +01:00
Thomas Müller
6ff96b34ad
Merge branch 'master' into load-apps-proper-master
...
Conflicts:
apps/files/ajax/rawlist.php
cron.php
ocs/v1.php
2014-03-21 14:05:08 +01:00
Vincent Petry
36c0f08ec0
Merge pull request #7732 from owncloud/datafolderexistence
...
Added .ocdata file to check for data folder validity
2014-03-20 11:31:28 +01:00
Thomas Müller
756bbe8786
Merge pull request #7649 from owncloud/routing-public
...
Move routing classes to an interface and expose it in the public api
2014-03-17 21:07:05 +01:00
Vincent Petry
b619ff6076
Return 503 when a config/data dir error exists
2014-03-14 21:05:15 +01:00
Robin Appelman
a8eb7a5092
Allow setting the config dir to use as enviroment variable for phpunit
2014-03-13 13:33:09 +01:00
Georg Ehrke
8048868bd7
use preDelete instead of postDelete hook
2014-03-13 03:14:42 +01:00
Robin Appelman
26793e1f94
switch OC::getRouter usages to OC::$server->getRouter
2014-03-10 14:06:47 +01:00
Robin Appelman
8ab7d18a6a
Move the router classes to a namespace and expose it with a public interface
2014-03-10 14:04:58 +01:00
Vincent Petry
ba3f5fe53a
Merge pull request #7583 from owncloud/trusteddomainerrorpage
...
[master] Show warning page when accessing server from an untrusted domain
2014-03-07 10:37:16 +01:00
Vincent Petry
421cff00bd
Show warning page when accessing server from an untrusted domain
...
Added early check for the requested domain host and show a warning
page if the domain is not trusted.
2014-03-06 11:51:08 +01:00
Thomas Müller
32b29c9d73
Merge branch 'master' into fix-7307
...
Conflicts:
core/js/router.js
settings/js/admin.js
2014-03-06 00:15:08 +01:00
Thomas Müller
1291303c5a
Replace OC.Router.generate() with OC.generateUrl()
2014-03-02 22:30:24 +01:00
kondou
da19109f40
Config to disable basic_auth username chacking
...
This can be confusing and/or annoying
2014-02-26 18:06:13 +01:00
Bart Visscher
7f05c23231
Merge pull request #3760 from IMM0rtalis/remove_logout_redirect_slash
...
- removed slash-adding for logout-header-redirect
2014-02-26 16:05:09 +01:00
Thomas Müller
27ad69eea5
Merge branch 'master' into no-css-js-delivery-via-php
2014-02-21 14:01:24 +01:00
Thomas Müller
fbea02bebb
kill $coreStyles and $coreScripts
2014-02-20 14:18:01 +01:00
Thomas Müller
bf22ed7bdb
kill old minimizer code
2014-02-20 13:10:56 +01:00
Jan-Christoph Borchardt
3e2c56157b
reduce width of searchbox on mobile, fix overlap, fix #7282
2014-02-20 11:33:46 +01:00
Jörn Friedrich Dreyer
2a6a9a8cef
polish documentation based on scrutinizer patches
2014-02-06 17:02:21 +01:00
Thomas Müller
79fc4f3126
Within OC:init() the minimum set of apps is loaded - which is filesystem, authentication and logging
2014-02-06 11:34:27 +01:00
Thomas Müller
0db5fead8e
remove some more global variable $RUNTIME_NOAPPS
2014-02-06 10:04:18 +01:00
Thomas Müller
afbe50d09c
remove global variable $RUNTIME_NOAPPS - it's just superfluous
2014-02-06 09:44:13 +01:00
Morris Jobke
3c80071807
Merge pull request #4795 from owncloud/setup
...
Move core setup code to controller class
2014-02-04 06:04:21 -08:00
Bjoern Schiessle
cf5277b558
also load error handler if debugging is enabled
2014-02-03 12:08:28 +01:00
Bart Visscher
bca725dc32
Merge branch 'master' into setup
...
Conflicts:
core/setup.php
2014-01-31 16:43:12 +01:00
Morris Jobke
0a1708ba11
Merge pull request #6912 from owncloud/replace-webroot-in-css
...
Remove %webroot% from CSS
2014-01-27 04:11:15 -08:00
Thomas Müller
9fa788c452
Merge pull request #6736 from owncloud/tests-jsunittests
...
Added Javascript unit tests
2014-01-23 12:43:05 -08:00
Jan-Christoph Borchardt
25e9b7a742
add icons.css file, first step to get rid of %webroot%
2014-01-23 12:55:39 +01:00
Robin Appelman
164915a3f8
Move test config folder to tests/config
2014-01-20 13:41:52 +01:00
Robin Appelman
6b4c3df087
Load a separate config (if present) when running unit tests
2014-01-17 14:40:48 +01:00
Vincent Petry
350214c609
Added Javascript unit tests
...
- added karma utility to run jasmine unit tests
- added Sinon library (for stubs/mocks/fakeserver)
- added a few unit tests for core and files
- added autotest-js.sh script
2014-01-16 17:12:29 +01:00
Thomas Müller
c3829dfa61
rename user-id to loginname to stay consistent
2014-01-09 10:29:21 +01:00
Thomas Müller
e0bd7e145c
Remove @ in order to get proper error handling
2014-01-07 16:24:05 +01:00
Thomas Müller
214aecac78
require composer's autoload.php if present
2014-01-05 21:49:08 +01:00
Robin Appelman
4c45c6f418
dont try to register background jobs if we haven't upgraded yet
2013-12-13 17:15:18 +01:00
Arthur Schiwon
f26ba5846d
coding style
2013-12-13 16:58:16 +01:00
Arthur Schiwon
dcfda5c2a9
coding style
2013-12-13 16:58:09 +01:00
Arthur Schiwon
91d6a6dd7c
On webdav sesssions, loginname was compared to username which does not need to match necessarily
2013-12-13 16:58:03 +01:00
Vincent Petry
df1a404466
Fix webroot for update page
...
On the update page, config.js was missing which caused oc_webroot to not
be available. That would trigger the faulty oc_webroot fallback that
didn't take URLs like "/owncloud/index.php/files/apps" into account.
This fix adds config.js in the update page and also a fix for the
oc_webroot fallback, in case it is used elsewhere.
2013-12-13 12:56:48 +01:00
Morris Jobke
9c4bbf9ad7
Revert "Revert "Fix user's displayName being overwritten by (old) cookie""
...
This reverts commit eba35d28cd
.
2013-12-05 20:53:11 +01:00
Morris Jobke
eba35d28cd
Revert "Fix user's displayName being overwritten by (old) cookie"
...
This reverts commit 2a7380cc21
.
2013-12-05 16:12:46 +01:00
Nico Kaiser
2a7380cc21
Fix user's displayName being overwritten by (old) cookie
2013-12-05 14:18:32 +01:00
Robin Appelman
9fbccc83e3
merge master into single-user-mode
2013-11-25 21:25:04 +01:00
Robin Appelman
71c1327691
Add "single user mode" which restricts access to users in the admin group
...
This can be enabled by setting 'singleuser' to true in config.php
2013-11-25 15:08:24 +01:00
Robin Appelman
317d421874
provide more cli friendly error messages
2013-11-25 13:04:23 +01:00
Thomas Müller
4a2f9636cf
Merge pull request #5773 from owncloud/fix-2152-master
...
Make working en_US.UTF-8 locale a hard requirement
2013-11-21 08:03:21 -08:00
Georg Ehrke
49cd5dad24
add trash bin and file versions delete hooks in OC::registerPreviewHooks
2013-11-12 14:08:55 +01:00
Bart Visscher
a6d8854d2a
Make working en_US.UTF-8 locale a hard requirement
2013-11-08 14:30:08 +01:00
Thomas Müller
4f24d4ba01
display the exception instead of meaningless message
2013-11-04 21:55:55 +01:00
Thomas Mueller
eb3c5070c0
replace template function link_to_docs() with \OC_Helper::linkToDocs()
2013-11-02 19:11:46 +01:00
Bart Visscher
06b42f9788
Merge pull request #5443 from owncloud/fix-autoloader-caching
...
Remove Autoloader Cache Hack. Do not use Cache on Install.
2013-11-01 05:35:34 -07:00
Andreas Fischer
b6bb2b26dd
Make "Please contact your system administrator" a full sentence.
2013-11-01 11:35:02 +01:00
Morris Jobke
c61d328ab9
Merge pull request #3889 from owncloud/apps_preload
...
Don't load the apps when we need to upgrade
2013-10-28 03:17:52 -07:00
Thomas Müller
3917d18980
Merge pull request #5528 from frisco82/changeUpadateNotification
...
Changed update message to be more instructive
2013-10-24 10:28:17 -07:00
Ramiro Aparicio
3a81c8e3af
Changed update message to be more instructive, changed update style to be less aggresive
...
Fix br tags
Improve english messages
2013-10-24 19:21:40 +02:00
Thomas Müller
54e9d8c306
Merge pull request #5507 from owncloud/webdav-removeredirectfromindex
...
Remove WebDAV redirect from the root path
2013-10-24 10:05:21 -07:00
Vincent Petry
c186f33428
Remove WebDAV redirect from the root path
...
This will prevent people mounting the root path.
They should use the full webdav path instead.
Fixes #4923
2013-10-24 10:34:09 +02:00
Vincent Petry
086b82bd69
Fixed sharing dropdown placeholders in IE8/9
...
Added jquery.placeholder shim to handle input field placeholders in IE8/9
2013-10-23 18:51:25 +02:00
Andreas Fischer
f5e2b92688
Only use autoloader cache when 'instanceid' is available.
2013-10-22 11:17:15 +02:00
Andreas Fischer
eb6637682e
Inject memoryCache into Autoloader. Remove recursion-prevention hack.
2013-10-22 11:17:15 +02:00
Thomas Müller
148d2616e5
introduce link_to_docs() and migrate links
2013-10-21 21:29:45 +02:00
Arthur Schiwon
33c4747fdf
Use display name from magic cookie, fixes #4884
2013-10-18 13:36:33 +02:00
Thomas Müller
fdeef5e874
Merge branch 'master' into fixing-appframework-master
...
Conflicts:
lib/private/appframework/middleware/security/securitymiddleware.php
tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
2013-10-16 15:45:55 +02:00
Tom Needham
6f8dd54788
Include exception message in log entry when session fails to start
2013-10-12 09:15:08 +01:00
Tom Needham
cf7ea4bec5
Handle ownCloud logging when data dir not created
2013-10-11 17:16:37 +01:00
Tom Needham
cb110c0679
Log the session exception when ownCloud is not installed
2013-10-11 16:45:58 +01:00
Morris Jobke
0641365a10
Merge pull request #4780 from AxelRb/master
...
On an auth failure the uid and the IP address should be logged to the st...
2013-10-10 07:21:36 -07:00
Axel Roenn
9b0454380c
changed the argument to false for getValue , reformated else statement
2013-10-10 14:15:13 +02:00
Thomas Müller
053b55721d
Merge branch 'master' into fixing-appframework-master
2013-10-08 12:13:24 +02:00
Thomas Müller
fda37ea09c
PHPDoc added
2013-10-07 00:32:08 +02:00
Bart Visscher
a90ea2c069
Merge remote-tracking branch 'origin/master' into setup
2013-10-02 18:23:59 +02:00
Thomas Müller
621ab1c7ee
fixing various PHPDoc comments
2013-10-02 15:04:42 +02:00
Thomas Müller
8c77cd1901
remove obsolete function login()
2013-10-02 14:49:14 +02:00
Thomas Müller
4cecede13d
code cleanup - remove special case for webdav in handleApacheAuth()
2013-10-02 00:55:35 +02:00
Thomas Müller
7e9e23f210
Merge branch 'master' into apache-auth-master
2013-10-02 00:21:11 +02:00
Thomas Müller
d8ada370d7
Squashed commit of the following:
...
commit ae1f68ac54cf2878d265b2bbce13bd600d2d0719
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Thu Aug 22 11:45:27 2013 +0200
fixing undefined variable
commit 982f327ca10eea0a2222eae3e74210648591fd8a
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed Aug 7 12:00:14 2013 +0200
adding login.php as alternative for index.php/login
commit da0d7e1d096fb80789524b01f0f96fe08d147943
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed Aug 7 11:36:12 2013 +0200
adding a route for web login
commit 8e2a01160485cf7e9a2eb8bf46f06fae73956e8e
Author: Karl Beecher <karl@endocode.com>
Date: Tue Aug 6 17:00:28 2013 +0200
Login attempt returns true instead of exiting immediately
commit fd89d55de9e71e986e03a0de9aad9407b632e22f
Author: Karl Beecher <karl@endocode.com>
Date: Mon Aug 5 15:31:30 2013 +0200
Further abstraction.
This change introduces the ApacheBackend interface for backends that
depend on Apache authentication and session management. There are no
longer references to specific backends in OC_User.
commit 469cfd98aea5a37985722cf5f9e00ece0ce38178
Author: Karl Beecher <karl@endocode.com>
Date: Thu Aug 1 15:46:36 2013 +0200
Make login attempt function protected.
commit d803515f19ff086e2028fcaa51afae579685e596
Author: Karl Beecher <karl@endocode.com>
Date: Wed Jul 31 16:00:22 2013 +0200
Amends the login link
When using a Shibboleth login, clicking logout displays a message to the
user instead of ending the session.
commit aa8c1fcea05c8268f26a10b21c4e0bc547c3414f
Author: Karl Beecher <karl@endocode.com>
Date: Tue Jul 30 13:15:59 2013 +0200
Abstract Shibboleth authentication into an Apache authentication method
commit 69082f2ebcab267f6e8eceb1a252f84c52236546
Author: Karl Beecher <karl@endocode.com>
Date: Tue Jul 30 11:22:26 2013 +0200
Convert spaces -> tabs
commit 5a80861d86855eec5906fd5e235ac4ff12efb0f2
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 17:40:48 2013 +0200
Separate the authentication methods
SABRE authentication and base authentication have slightly different
workings right now. They should be refactored into a common method
later, but time pressure requires us to reinvent the wheel slightly.
commit dc20a9f8764b103b7d8c5b713f2bcdae18708b65
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 17:07:07 2013 +0200
Authenicate calls to WebDAV against Shibboleth.
When using WebDAV, the OC_Connector_Sabre_Auth::authenticate method is
normally called without trying the Shibboleth authentication... thus the
session is not established.
The method now tries Shib authentication, setting up a session if the
user has already authenticated.
commit 091e4861b2246c4084c9b30e232289fde4ba1abf
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 14:04:54 2013 +0200
Sets up the Shibboleth login attempt.
commit bae710ec0579ef99b23022cc12f6876c5fe6b0d5
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 12:36:44 2013 +0200
Add a method for attempting shibboleth login.
If the PHP_AUTH_USER and EPPN environment variables are set, attempt a
Shibboleth (passwordless) login.
commit 667d0710a7854e58fb109201d9cee6ec064e793a
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 11:38:04 2013 +0200
Revert "Adds the apps2 folder with user_shibboleth backend."
This reverts commit 7abbdb64676d667b0c69aca37becdc47e56dc7ef.
commit 7abbdb64676d667b0c69aca37becdc47e56dc7ef
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 11:28:06 2013 +0200
Adds the apps2 folder with user_shibboleth backend.
Conflicts:
core/templates/layout.user.php
lib/base.php
2013-10-01 14:29:01 +02:00
Thomas Müller
02d6976263
Merge branch 'master' into lib-private-master-2
2013-09-30 21:29:58 +02:00
Thomas Müller
b58a464b86
Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled
...
don't remember login if the encrypion app is enabled
2013-09-30 10:53:41 -07:00
Thomas Müller
9c9dc276b7
move the private namespace OC into lib/private - OCP will stay in lib/public
...
Conflicts:
lib/private/vcategories.php
2013-09-30 16:36:59 +02:00
Thomas Müller
db39fede97
Merge branch 'master' into appframework-master
...
Conflicts:
apps/files/lib/helper.php
apps/files_trashbin/lib/helper.php
2013-09-25 09:52:12 +02:00
Bjoern Schiessle
c486fc7608
introduce OC_Util::rememberLoginAllowed()
2013-09-24 18:01:34 +02:00
Bjoern Schiessle
b693b5085c
don't remember login if the encrypion app is enabled because the user
...
needs to log-in again in order to decrypt his private key with his password
2013-09-24 13:08:55 +02:00
Bart Visscher
8e26f291a7
Merge pull request #4684 from owncloud/improved-console
...
Use more object oriented way for console commands
2013-09-19 14:22:32 -07:00
Thomas Tanghus
09d043729a
Note to self 2: Do as you preach. Test!
2013-09-18 15:02:25 +02:00
Thomas Tanghus
79cd655920
Note to self: Test before pushing!!!
2013-09-18 14:50:21 +02:00
Thomas Tanghus
534933ee9b
Use new emitter system
2013-09-18 13:15:38 +02:00
Thomas Tanghus
fe86182dac
OC_Cache namespace changes and add UserCache to server container.
...
Refs #4863
2013-09-17 17:46:33 +02:00
Thomas Müller
5d4e9e0d25
/OC/Server has created too early causing issues with config operations as OC:$SERVERPATH was not yet initialized
...
This fixes unit test execution
2013-09-15 23:07:18 +02:00
Thomas Müller
ad82a56f79
Merge branch 'master' into appframework-master
2013-09-15 21:18:59 +02:00
Thomas Müller
5b3388c7c4
Merge branch 'master' into appframework-master
2013-09-13 20:56:49 +02:00
kondou
c9c5e1b97f
Merge branch 'master' into oc_avatars
2013-09-12 07:41:44 +02:00
Bart Visscher
8ae612f693
Move core setup code to controller class
2013-09-10 20:19:42 +02:00
Axel Roenn
7810e27dad
Changed default behaviour to not log IP address in case of an auth failure. Can be configured in OC conf now.
...
Log level changed to warning .
2013-09-10 11:07:26 +02:00
Axel Roenn
0cd6473909
On an auth failure the uid and the IP address should be logged to the standard log file.
...
This update works for a standard setup, when using a proxy for the server one can probably use the X-forwarded-for header
instead of the remote address.
2013-09-09 15:35:39 +02:00
Thomas Müller
e9849270e3
Revert "fixes #4574"
...
This reverts commit 81a45cfcf1
.
2013-09-06 00:28:13 +02:00
kondou
820fd42161
Merge branch 'master' into oc_avatars
2013-09-04 12:56:40 +02:00
kondou
e5fc7b9dbe
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/base.php
2013-09-02 07:58:06 +02:00
kondou
76b1b5b6a3
Provide 'enable_avatars' in config.php, to disable avatars
2013-09-01 18:17:14 +02:00
Bart Visscher
0aba549e7f
Use more object oriented way for console commands
2013-09-01 16:40:50 +02:00
kondou
5d653753bd
Merge branch 'master' into oc_avatars
2013-08-31 12:56:36 +02:00
Thomas Müller
a9d6b59307
Merge branch 'master' into appframework-master
2013-08-31 01:38:44 +02:00
Georg Ehrke
8ef40277b2
Merge master into oc_preview
2013-08-30 18:11:18 +02:00
Jan-Christoph Borchardt
0f5df181a3
Merge pull request #4661 from owncloud/separate-app-styles
...
Move CSS for apps and browser-specific fixes out of main styles.css
2013-08-30 09:08:25 -07:00
Stephane Martin
95f42d6544
Merge pull request #4578 from houbaastef/master
...
fixes #4574
2013-08-30 06:20:07 -07:00
Arthur Schiwon
7d398ba622
Use the real username in preferences and magic cookie instead of case-insensitive user input. Fixes 4616.
2013-08-30 11:45:16 +02:00
Jan-Christoph Borchardt
9c23ed580a
move CSS for browser-specific fixes out of styles.css into new fixes.css
2013-08-30 11:42:32 +02:00
Jan-Christoph Borchardt
cc8e19ad11
move CSS for apps out of styles.css into new apps.css
2013-08-30 11:38:49 +02:00
kondou
0c708be76b
Use defaultavatars
2013-08-29 14:26:11 +02:00
Georg Ehrke
b7758d0f8d
Merge master into oc_preview
2013-08-29 10:50:55 +02:00
Bart Visscher
3fd2df4088
Only enable logrotate when configured. Also rotate size is settable.
2013-08-28 17:41:27 +02:00
Bart Visscher
42f3ecb60f
Check for installed state before registering the logrotate background job
2013-08-28 17:11:43 +02:00
Bart Visscher
b5e2842e00
Very simple log rotation
2013-08-28 17:11:43 +02:00
Bart Visscher
45076edf4f
Merge pull request #3891 from owncloud/fix_loadAppScriptFile
...
Check if the app is enabled and the app path is found before trying to l...
2013-08-28 06:10:06 -07:00
Thomas Tanghus
9843c8e838
Merge pull request #4434 from owncloud/fix_octemplate_escaping
...
Fix octemplate string escaping.
2013-08-28 03:59:43 -07:00
Thomas Müller
a995e81686
Merge branch 'master' into appframework-master
2013-08-26 21:31:15 +02:00
Stephane Martin
81a45cfcf1
fixes #4574
2013-08-26 15:16:41 +02:00
Georg Ehrke
6ffa2a28d0
Merge branch 'master' into oc_preview
2013-08-23 23:10:37 +02:00
Thomas Müller
ba029ef4b2
initial setup of the server container
2013-08-21 00:58:15 +02:00
kondou
f1518a54df
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/util.php
2013-08-20 17:20:30 +02:00
kondou
65d802329f
Fix some naming and spacing in lib/util.php
2013-08-18 10:33:09 +02:00
kondou
9c5416fe4a
Clean up \OC\Util
...
- Use camelCase
- Add some phpdoc
- Fix some indents
- Use some more spacing
2013-08-15 15:57:32 +02:00
Thomas Tanghus
ca495758bd
Fix octemplate string escaping.
2013-08-14 23:06:43 +02:00
Thomas Müller
7425efade7
Merge branch 'master' into oc_preview
...
Conflicts:
3rdparty
lib/template.php
2013-07-30 00:34:36 +02:00
Robin Appelman
10d3e63ce5
add quota streamwrapper that limits the amount of data that can be written to a stream
2013-07-25 00:31:51 +02:00
Jan-Christoph Borchardt
93b227d803
shorten wording on config directory errors
2013-07-23 18:41:00 +02:00
Bart Visscher
aa22194a09
In debug mode uncaught exceptions should display a nice page
2013-07-21 22:40:35 +02:00
Bart Visscher
49fca86f3c
Cleanup error generation in base.php
2013-07-16 22:36:39 +02:00
Bart Visscher
7d86e262e1
Use autoloader for Patchwork/PHP/Shim/Normalizer
2013-07-16 22:32:04 +02:00
Bart Visscher
1a2db491af
Merge pull request #3962 from owncloud/move-error-handlers
...
Move error handlers from OC_Log to OC\Log\ErrorHandler
2013-07-15 09:23:37 -07:00
Thomas Müller
6f5b0af67f
Merge pull request #3487 from owncloud/basic_auth_hack
...
Basic Auth is broken - again...
2013-07-14 14:56:45 -07:00
Georg Ehrke
a357e5b284
merge conflicts ...
2013-07-10 12:41:53 +02:00
Björn Schießle
9b9ea7cd8e
Merge https://github.com/owncloud/core/pull/3827
...
Squashed commit of the following:
commit eed4b49cebcbcc252a75ed85097730b73213b0da
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 8 10:03:23 2013 +0200
initialize OC_Defaults only once
commit bf6f07ccc8fb87535a069ca341789a590cb187ee
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 8 10:02:48 2013 +0200
link to doc in error messages
commit ea61ee60e06ee98f2671aec1fdaff666c50f47c2
Merge: e41af3d 3c1308f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 4 11:10:56 2013 +0200
Merge branch 'master' into better-messages
commit e41af3d7bad26aa5ca9ab21ec7dcbadd3cfe5d4f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 4 11:10:41 2013 +0200
move to non-static defaults.php
commit 9e4258b1905244bdf34943a825421f041cbed43d
Author: Björn Schießle <schiessle@owncloud.com>
Date: Tue Jul 2 10:32:13 2013 +0200
no sprintf here, lets t() handle it
commit fe1df349e248667a137f70d78b04225e5b42a111
Merge: d8f6859 cb5811b
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:13:38 2013 +0200
Merge branch 'master' into better-messages
commit d8f68595df2dc0e0917d916cbde511ec5333010b
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:10:57 2013 +0200
use document base url from defaults.php
commit 6c5403748a45717125a2aa375550f05646317d72
Merge: bea6b1c 7b0e3e6
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:00:15 2013 +0200
Merge branch 'master' into better-messages
commit bea6b1c8a0968846065b9153e0a3f46a4e3245ee
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon Jun 24 16:21:12 2013 +0200
link to docs in WebDAV message, ref #3791
commit 3119b364a1094769e711283d1ce9014505f64ab9
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon Jun 24 16:10:21 2013 +0200
link to docs in error messages, fix #3819
2013-07-08 10:07:57 +02:00
Bart Visscher
2db839c4d3
Move error handlers from OC_Log to OC\Log\ErrorHandler
2013-07-05 19:28:10 +02:00
Bart Visscher
57370353ad
Check if the app is enabled and the app path is found before trying to load the script file
2013-06-28 20:34:28 +02:00
Bart Visscher
9a50a8f0cc
Don't load the apps when we need to upgrade
...
The loading can call functions that require new tables, like oc_jobs
2013-06-28 17:23:40 +02:00
Thomas Mueller
3b91ce695f
session_life_time -> session_lifetime
...
default session_lifetime is 24hrs
recreation of session is triggered at 50% of the session life time
2013-06-28 15:17:54 +02:00
Thomas Mueller
794c189650
session life time is now configurable and set to the same value
2013-06-26 09:21:38 +02:00
Florian Scholz
b1fd9b3907
- add slash if webroot is an empty string
...
- added comment
2013-06-25 10:45:37 +02:00
Victor Dubiniuk
fbbb6ef8ef
Init dummy session first
2013-06-17 23:41:07 +03:00
Florian Scholz
efea868704
- removed slash-adding for logout-header-redirect
2013-06-17 14:21:53 +02:00
Georg Ehrke
1a933a9173
Merge branch 'master' into oc_preview
2013-06-17 12:31:02 +02:00
Thomas Mueller
c8564c0795
Merge branch 'master' into move-maint-start
...
Conflicts:
lib/util.php
2013-06-14 10:06:13 +02:00
Georg Ehrke
85ecec8b01
Merge branch 'master' into oc_preview
2013-06-06 11:13:55 +02:00
Thomas Tanghus
9cd6645037
Move comment and set requesttoken.
2013-06-05 00:38:08 +02:00
Thomas Tanghus
2572c9a6b7
Merge pull request #3578 from owncloud/ocdialog
...
Replacement for jquery.dialog to fit better with ownCloud design.
2013-06-03 06:37:27 -07:00
Jörn Friedrich Dreyer
b76725c1fa
Merge pull request #3560 from owncloud/init-order-session
...
initialize the session earlier
2013-06-03 03:21:05 -07:00
Thomas Tanghus
901b1150ff
Replacement for jquery.dialog to fit better with ownCloud design.
2013-06-02 21:52:59 +02:00
Robin Appelman
251527c6e6
merge master into backgroundjob
2013-06-02 20:12:44 +02:00
Robin Appelman
b8b0b7606a
initialize the session earlier
2013-05-31 17:31:52 +02:00
Thomas Tanghus
ad5c4bf771
Cleanup hacke v.2
2013-05-31 00:53:57 +02:00
Thomas Tanghus
e21649ccff
Revert "Clean up hack."
...
This reverts commit 138c7f615b
.
2013-05-31 00:53:15 +02:00
Thomas Tanghus
138c7f615b
Clean up hack.
2013-05-31 00:28:03 +02:00
Jörn Friedrich Dreyer
476747ee89
Merge pull request #3509 from owncloud/update_jquery_to_1_10
...
Update jquery to 1.10.0 and add jquery-migrate 1.2.1
2013-05-30 06:00:52 -07:00
Georg Ehrke
d8008ae421
Merge branch 'master' into oc_preview
2013-05-29 13:24:14 +02:00
Georg Ehrke
fa6b96090a
move to OC namespace
2013-05-29 12:46:54 +02:00
Georg Ehrke
eebc15dce0
connect preview lib to filesystem hooks
2013-05-29 12:01:43 +02:00
Robin Appelman
040045cc2e
provide a dummy session for CLI
2013-05-28 01:15:38 +02:00
Robin Appelman
e73c04501e
Fix session not working error
2013-05-28 01:10:18 +02:00
Robin Appelman
44f9af5a7f
Use the new session wrapper
2013-05-28 01:04:09 +02:00
kondou
3001db6b50
Update jquery to 1.10.0 & add jquery-migrate 1.2.1
2013-05-27 20:13:13 +02:00
Thomas Tanghus
e66f609a64
Hack base.php to make Basic Auth work
2013-05-25 05:51:51 +03:00
Morris Jobke
9fd2be0757
Merge pull request #3406 from owncloud/oc_dialogs_oc_template
...
Use js templates in OC.dialogs etc.
2013-05-22 03:00:04 -07:00
Michael Gapczynski
c62f230ddb
Merge branch 'master' into move-maint-start
2013-05-21 11:26:56 -04:00
Florin Peter
a92dead754
only connect share hooks if installation OC is installed
2013-05-17 01:20:02 +02:00
Thomas Tanghus
c8bbf90feb
Port OC.dialogs to use octemplate except for prompt() and form().
...
Also load octemplate per default.
2013-05-16 13:41:04 +02:00
Michael Gapczynski
f8336c1e2c
Turn off theme before update
2013-05-14 09:34:01 -04:00
Robin Appelman
0d25c0001c
check for setlocale after setting up the paths to prevent autoloader confusion
2013-05-07 22:53:07 +02:00
Robin Appelman
0b5f6b9c13
Move autoloader to it's own class
2013-05-07 22:16:17 +02:00
Bart Visscher
41f7eb948a
Move start of the maintenance mode to the ajax call
...
Make sure the update page is shown in a browser. And not an ajax request
2013-05-04 00:05:29 +02:00
Robin Appelman
172499d5f3
Don't start the session when in cli mode
2013-04-26 14:53:59 +02:00
Thomas Tanghus
c84281990c
Merge pull request #2993 from owncloud/resolve_apps_lib_path
...
Let autoloader resolve paths under apps lib directory.
2013-04-24 13:33:05 -07:00
Morris Jobke
b1c9b296e8
Merge pull request #3089 from guruz/fix_ugly_config_writeability_error
...
Fix ugly error style on install
2013-04-24 02:24:23 -07:00
Markus Goetz
f1a63254fb
Fix ugly error style on install
...
By initializing the template engine first we can show the
'Can't write into config directory 'config'' error in a nice way instead
of plain unstyled HTML.
2013-04-23 11:06:28 +02:00
Lukas Reschke
6e78c4fcc0
Disallow URLs containing a @
2013-04-23 00:26:40 +03:00
Robin Appelman
e63633b5f3
Don't try to use backgroundjobs before the installtion is done
2013-04-22 20:23:23 +02:00
Robin Appelman
40de36a8f3
Try to supress pre-upgrade backgroundjob error
2013-04-21 00:58:15 +02:00
Robin Appelman
07f510692c
Ensure we don't throw an exception before we can upgrade to the new backgroundjob system
2013-04-21 00:08:55 +02:00
Robin Appelman
7948341a86
Rework background job system
2013-04-20 23:27:46 +02:00
Thomas Tanghus
4ccc9d896a
Merge pull request #3010 from owncloud/fix-cookie_path
...
Don't use empty session.cookie_path, otherwise we get multiple cookies
2013-04-19 01:17:35 -07:00
Thomas Tanghus
e09c17de5b
Added explanation
2013-04-18 22:29:50 +02:00
Bart Visscher
e4876c9117
Don't use empty session.cookie_path, otherwise we get multiple cookies
2013-04-18 21:11:58 +02:00
Thomas Tanghus
9facb67fab
Let autoloader resolve paths under apps lib directory.
2013-04-18 08:30:09 +02:00
Brice Maron
43d0f1fabf
Warn when we do an upgrade
2013-04-17 21:29:14 +02:00
Lukas Reschke
fbffbe0170
Juse send the cookies in the ownCloud directory
2013-04-06 00:16:52 +02:00
VicDeo
3e9ea6d13b
Remove space before parethesis
2013-03-20 16:54:06 +04:00
VicDeo
c3a64012d8
Remove leading and trailing backslashes in classname. Ref #2310
2013-03-19 16:40:52 +03:00
Frank Karlitschek
63336f2acb
remove deprecated call
2013-03-17 22:05:45 +01:00
Michael Gapczynski
5300d6ad55
Clear the CSS and JS cache earlier to make sure update goes smoothly
2013-03-05 21:13:07 -05:00
Bart Visscher
d800f35bf4
Disable loading of backgroundjobs js when upgrade is needed
2013-03-03 23:15:22 +01:00
Bart Visscher
a2d6b27170
Check maintenance mode before loading apps in route matcher
2013-03-03 23:15:18 +01:00
Bernhard Posselt
2f036bcc54
Merge pull request #1972 from owncloud/raw-pathinfo
...
Use the plain urlencoded path info for the routing matching
2013-02-27 13:43:47 -08:00
Bart Visscher
56f3917f36
Use the plain urlencoded path info for the routing matching
2013-02-27 21:38:58 +01:00
Bernhard Posselt
888e4f21d2
timeout after a longer time
2013-02-27 15:44:00 +01:00
Bart Visscher
3a7322342e
Merge pull request #1956 from owncloud/session-error-format
...
add styles before session init
2013-02-27 05:21:17 -08:00
Bernhard Posselt
a1afc2e34f
only add style.css to initsession
2013-02-27 11:36:05 +01:00
Bernhard Posselt
18b7a2bf21
add css and scripts before session init
2013-02-27 11:17:14 +01:00
Bart Visscher
4a26d63867
Fix using wrong quotes for breaking long lines
...
Fixes #1925
2013-02-26 20:48:01 +01:00
Bernhard Posselt
7f7b8bc07a
use error template
2013-02-25 19:17:29 +01:00
Bernhard Posselt
aba60dba28
added simple error message for the browser
2013-02-25 18:47:34 +01:00
Bernhard Posselt
bc2fefed59
write an error log when session could not be initialized
2013-02-25 18:42:09 +01:00
Bernhard Posselt
55c72617c6
set http 500 when session could not be started to prevent serving of empty files see #1049
2013-02-25 18:37:05 +01:00
Robin Appelman
0395715348
set DEBUG from xdebug session before we first use it
2013-02-15 03:15:09 +01:00
Robin Appelman
bcabdd7dd5
Don't cache errors/exceptions when debug is enabled
2013-02-15 03:14:41 +01:00
Bart Visscher
9058d398a7
Merge pull request #1662 from owncloud/style-cleanup
...
Style cleanup
2013-02-14 12:54:36 -08:00
Lukas Reschke
be194c5b5b
Invalidate existing HSTS headers
2013-02-14 19:23:29 +01:00
Thomas Mueller
8877087b57
adding a compatibility.js as a single source to define all fallback function declarations
2013-02-14 12:20:04 +01:00
Bart Visscher
ffae6f4b84
Style-fix: Breakup long lines
2013-02-14 08:38:37 +01:00
Bart Visscher
5c4a804ddb
Fix SpaceBeforeOpenBrace errors
2013-02-14 08:36:26 +01:00
Thomas Müller
0222c589ac
Merge pull request #1546 from owncloud/fix-loading-hooks
...
Fix loading hooks when going though the routing system
2013-02-09 09:59:41 -08:00
Thomas Müller
e68cf72458
Merge pull request #1543 from owncloud/utf8-locale-master
...
some systems use en_US.UTF8 instead of en_US.UTF-8
2013-02-09 09:58:05 -08:00
Thomas Müller
d67d9566ce
Merge branch 'master' into clean-app-id
2013-02-09 17:28:30 +01:00
Bart Visscher
9dddcae9ca
Remove invalid characters from app id to prevent loading of invalid resources
2013-02-09 15:10:40 +01:00
Thomas Müller
279cbeb001
Merge pull request #1481 from owncloud/fixing-1354-master
...
basic WebDAV test in place now
2013-02-09 05:13:33 -08:00
Bart Visscher
fba9739448
Always load the apps before trying to match a route
2013-02-08 19:06:59 +01:00
Thomas Müller
232a98524c
some systems use en_US.UTF8 instead of en_US.UTF-8
2013-02-08 17:49:54 +01:00
Robin Appelman
afa1a6d2b3
Don't try to use routes when called from cli
2013-02-07 17:53:38 +01:00
Thomas Mueller
5788d36c8d
Merge branch 'master' into fixing-1354-master
...
Conflicts:
settings/admin.php
settings/templates/admin.php
2013-02-07 10:44:28 +01:00
Bart Visscher
3582f7bd09
Execute the post setup check after finishing the setup
2013-02-06 17:56:45 +01:00
Thomas Mueller
1adcc5fd23
basic WebDAV test in place now
2013-02-05 23:33:44 +01:00
Thomas Mueller
77369d8164
disable error handler while running phpunit
2013-02-05 16:44:02 +01:00
herbrechtsmeier
37e6ac9a2a
initPaths: set include path before any owncloud function is called
...
Ensure we can find basic owncloud classes while detecting the owncloud
paths in function initPaths by add OC::$SERVERROOT . '/lib' to include
path before any owncloud function is called.
This fix a bug with XAMPP that cannot find the class OC_Config in
function OC_Request::scriptName when called from function
OC_Base::initPaths.
2013-02-02 12:07:18 +01:00
Bart Visscher
2488a495c6
Merge pull request #1384 from owncloud/upgrade_fix
...
Check for upgrade/maintance mode before trying to load an app
2013-02-01 07:12:06 -08:00