Commit graph

369 commits

Author SHA1 Message Date
Björn Schießle
8406d3f7b1 also use the default theme if the theme is set to an empty string in the config.php 2013-06-19 11:58:29 +02:00
Thomas Mueller
c8564c0795 Merge branch 'master' into move-maint-start
Conflicts:
	lib/util.php
2013-06-14 10:06:13 +02:00
Robin Appelman
251527c6e6 merge master into backgroundjob 2013-06-02 20:12:44 +02:00
Thomas Müller
1b3c9fe5ae Merge pull request #3454 from owncloud/fix_hasInternetConnection
isinternetconnectionworking should return false if OC_Config::getValue("has_internet_connection") is false
2013-05-31 17:05:45 -07:00
Thomas Mueller
dd4a07321a fix method naming 2013-05-31 23:24:09 +02:00
icewind1991
94a6622bcd Merge pull request #3459 from owncloud/fix_for_2377
fix problems with german "Umlaut" in folder name
2013-05-31 14:00:02 -07:00
Robin Appelman
44f9af5a7f Use the new session wrapper 2013-05-28 01:04:09 +02:00
Georg Ehrke
557cc4c1ab make method names camelCase 2013-05-27 19:24:31 +02:00
Georg Ehrke
d69b7e24d2 update comment 2013-05-27 19:20:29 +02:00
Georg Ehrke
58c9175a56 move check if internet connection is disabled on purpose to a dedicated method 2013-05-27 19:19:17 +02:00
Florin Peter
adcafbde34 Merge branch 'master' into fix_for_2377 2013-05-25 20:37:28 +02:00
Michael Gapczynski
2893bb9543 Bump version for files_encryption changes 2013-05-25 11:42:28 -04:00
Michael Gapczynski
0a29d2029a Clear opcode caches after writing to the config file, fixes #3372 2013-05-25 11:25:43 -04:00
Florin Peter
f6bf9de6de prevent for returning while false normalize string 2013-05-25 14:54:36 +02:00
Florin Peter
661b5501b0 added normalizeUnicode() method to OC_Util 2013-05-24 20:35:01 +02:00
Jörn Friedrich Dreyer
1b68c0c0cd allow install when only oracle is available 2013-05-22 13:56:57 +02:00
Georg Ehrke
efb2e69230 fix return value of OC_Util::isinternetconnectionworking() 2013-05-22 12:21:11 +02:00
Robin Appelman
81fd1badc3 merge master into filecache_mtime 2013-05-21 23:35:19 +02:00
Florin Peter
03d8907df8 fix for tearDownFS, after filesystem::tearDown() the root is not mounted 2013-05-07 22:26:16 +02:00
Bart Visscher
398fbb61f8 Merge pull request #2813 from owncloud/improve-lib-check
added correct check for gd and check for php-intl
2013-05-07 06:12:40 -07:00
Morris Jobke
2b9da8a6c9 remove hard php-intl requirement 2013-05-07 13:51:30 +02:00
Morris Jobke
0e5eccbdbc Merge pull request #3146 from owncloud/restart-hint
web_server_restart needs to be true to display the hint
2013-04-27 08:19:08 -07:00
Morris Jobke
86455d6ac3 Merge pull request #3145 from owncloud/magic_quotes_gpc-check
Add check for Magic Quotes
2013-04-27 08:14:40 -07:00
Bart Visscher
7db5ec30c3 Add check for Magic Quotes 2013-04-26 16:32:58 +02:00
Bart Visscher
f5b0d904fb web_server_restart needs to be true to display the hint 2013-04-26 16:21:56 +02:00
Robin Appelman
809b5f81f6 Further seperation of mount management logic 2013-04-26 00:01:36 +02:00
Bernhard Posselt
a8075943c3 use variable instead of relative path to file 2013-04-24 14:17:52 +02:00
Bernhard Posselt
b98b56e4a8 check if there is a default/ folder in the theme directory if no theme exists 2013-04-24 13:45:40 +02:00
Robin Appelman
db0ea9780b Add database table for backgroundjob 2013-04-21 00:04:58 +02:00
Bart Visscher
7ac49dd52a Cleaner isWebDAVWorking reason, otherwise people overlook the reason 2013-04-19 12:44:54 +02:00
Thomas Tanghus
44668b36a7 Remove not null constraint. Fix #2976 2013-04-17 14:08:45 +02:00
Bernhard Posselt
16b513e4dc added correct check for gd and check for php-intl 2013-04-09 12:22:55 +02:00
Thomas Mueller
46722d8282 fixes #2789 - no internet connectivity check if there is non on purpose 2013-04-08 22:41:20 +02:00
Birk Borkason
d6253696cb Fix indentation in util.php. 2013-04-05 21:49:57 +03:00
Lukas Reschke
877ff9358f Don't expose the server installation time 2013-04-04 01:33:18 +03:00
Miquel Rodríguez Telep / Michael Rodríguez-Torrent
93a6ed3dab Ensure instanceid contains a letter
instanceid is generated by uniqid() and then used as the
session_name. Because session_name requires at least one letter
and uniqid() does not guarantee to provide that, in the case that
uniqid() generates a string of only digits, the user will be stuck
in an infinite login loop because every request will generate a
new PHP session.
2013-03-26 21:49:32 +00:00
Miquel Rodríguez Telep / Michael Rodríguez-Torrent
53fd122b89 Minor typo, coding style fixes for OC_Util::getInstanceId 2013-03-26 21:48:49 +00:00
Thomas Mueller
86c819bbe8 more accurate safe_mode check - refs #2258 2013-03-19 14:36:52 +01:00
Thomas Tanghus
f052846914 Add indexes and primary keys. 2013-03-19 01:38:40 +01:00
Thomas Tanghus
935d2169c8 Revert "Add indexes and primary keys."
This reverts commit 3b33712dc9.
2013-03-19 01:36:51 +01:00
Thomas Tanghus
3b33712dc9 Add indexes and primary keys. 2013-03-19 01:35:12 +01:00
Frank Karlitschek
e6c2a91781 this is now 6.0 pre alpha 2013-03-09 20:19:34 +01:00
Frank Karlitschek
256595e7b2 5.0.0 2013-03-09 18:51:02 +01:00
Arthur Schiwon
988a67fc9a remove remaining br-tags that do not belong here 2013-03-09 13:45:37 +01:00
Michael Gapczynski
d7beac6d6f Merge branch 'master' into filecache_mtime
Conflicts:
	lib/files/view.php
	lib/util.php
	tests/lib/files/cache/cache.php
2013-03-08 15:28:45 -05:00
Frank Karlitschek
f9c24a0368 5.0.0 RC3 2013-03-08 10:01:22 +01:00
Arthur Schiwon
47d176ae69 Remove <br> from error messages, because they will be escaped and the used template has it's own <br> already 2013-03-07 17:28:28 +01:00
Frank Karlitschek
2b7ff7273d ownCloud 5 RC2 2013-03-02 04:06:27 +01:00
Lukas Reschke
3e3c039292 Escape the data only in the template 2013-03-02 20:21:51 +01:00
Thomas Mueller
39b9ed50d7 for this self test we don't care if the ssl certificate is self signed and the peer cannot be verified. 2013-03-01 20:34:16 +01:00