wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7711 commits 157 branches 562 tags 714 MiB
Commit graph

2335 commits

Author SHA1 Message Date
Jenkins for ownCloud
1a08ef6a06 [tx-robot] updated from transifex 2012-10-28 00:02:29 +02:00
Bart Visscher
fecfeac55d Fix introduced style errors 2012-10-27 17:45:15 +02:00
Bart Visscher
894d44e796 Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git' 
Conflicts:
	lib/base.php
 2012-10-27 16:33:10 +02:00
Björn Schießle
8a3eda16f2 fix function documentation 2012-10-27 15:53:10 +02:00
Bart Visscher
0120f3fd62 Merge branch 'routing' 
Conflicts:
	core/lostpassword/index.php
	core/lostpassword/resetpassword.php
 2012-10-27 11:58:02 +02:00
Bart Visscher
43e8293d9c Change Symfony/Component/Routing from submodule to composer fetching 2012-10-27 11:32:16 +02:00
Jakob Sack
d0bbd9416b Add BackgroundJob::setExecutionType() to public API 2012-10-27 10:15:39 +02:00
Jakob Sack
9cf9d41e51 Add a new backgroundjob class to access the type of background jobs easily 2012-10-27 10:08:56 +02:00
Jenkins for ownCloud
3bef19c623 [tx-robot] updated from transifex 2012-10-27 00:02:05 +02:00
Florian Hülsmann
a48734bcb5 fixed user/group sharing hooks 2012-10-26 23:15:37 +02:00
Bart Visscher
fe75793815 Split database setup code to functions 2012-10-26 22:48:57 +02:00
Florian Hülsmann
b7bf28d1c7 Hook emission on sharing stuff 2012-10-26 20:53:32 +02:00
Victor Dubiniuk
d428d72dab Fix mimetype detection with the 'file' utility 2012-10-26 21:02:04 +03:00
Robin Appelman
ad720c4c17 possible fix for bombarding the server with the htaccess test during setup 2012-10-26 18:24:06 +02:00
Georg Ehrke
1888ac0d41 add the possibility to add an preupdate.php 2012-10-26 13:10:56 +02:00
Jenkins for ownCloud
c7d64811d6 [tx-robot] updated from transifex 2012-10-26 02:05:56 +02:00
Thomas Tanghus
d9d8da0a5c Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-25 20:34:03 +02:00
Lukas Reschke
228a05a792 Check for iconv 2012-10-25 16:49:55 +02:00
Lukas Reschke
55277c8e5a Allow any characters in the groupname 
Fixes #82
 2012-10-25 11:54:31 +02:00
Jenkins for ownCloud
43bae1b473 [tx-robot] updated from transifex 2012-10-25 02:11:53 +02:00
Thomas Tanghus
2fc495a91a Also delete category/object relations when deleting a category. 2012-10-24 22:39:34 +02:00
Thomas Tanghus
675a56c5ed Merge branch 'master' of github.com:owncloud/core into vcategories_db 
Conflicts:
	lib/vcategories.php
 2012-10-24 21:55:25 +02:00
Lukas Reschke
515e1b467e Merge pull request #81 from fmms/master 
Codestyle add some needed spaces.
 2012-10-24 10:16:32 -07:00
Björn Schießle
0c2a4264c9 normalize path 2012-10-24 17:39:39 +02:00
Lukas Reschke
a7eb56c799 Merge pull request #76 from fmms/master 
checkstyle: some more cleanups
 2012-10-23 23:48:27 -07:00
Lukas Reschke
f112d8cd69 Merge pull request #75 from fmms/master 
More Checkstyle cleanup
 2012-10-23 15:07:14 -07:00
Felix Moeller
561cbb2de6 NoSpaceAfterComma II 2012-10-23 23:01:10 +02:00
Felix Moeller
e73b817a38 Checkstyle: NoSpaceAfterComma 2012-10-23 22:53:54 +02:00
Lukas Reschke
73f85c3b81 Merge pull request #62 from fmms/master 
More Checkstyle warnings
 2012-10-23 08:07:01 -07:00
Lukas Reschke
d18ea0e76c Merge pull request #40 from scambra/dateformat-fixes 
Dateformat fixes
 2012-10-23 08:06:28 -07:00
Robin Appelman
7fdbce6ac1 use strtotime on non-nummeric times in oc_filesystem::touch 2012-10-23 16:36:09 +02:00
scambra
9601352d46 fix strftime in windows, use %#d instead of %e in windows 2012-10-23 16:24:54 +02:00
icewind1991
ab944094e2 Merge pull request #12 from scambra/fixes 
check free space using folder's owner
 2012-10-23 07:02:21 -07:00
icewind1991
fbe059afd3 Merge pull request #59 from fmms/master 
Starting point to take care of Checkstyle warnings
 2012-10-23 06:58:15 -07:00
Lukas Reschke
726409b272 Merge pull request #58 from fmms/master 
Translate headings in search results (fixes #55)
 2012-10-23 04:43:25 -07:00
Arthur Schiwon
b43b85c849 get effective username after webdav login, fixes oc-2108 2012-10-23 13:38:46 +02:00
Lukas Reschke
b66dd3ebef Merge pull request #38 from scambra/datepicker-l10n 
Translate Datepicker
 2012-10-22 23:53:24 -07:00
Felix Moeller
36d0d75901 Codestyle: FunctionCallArgumentSpacing 2012-10-23 08:35:54 +02:00
Felix Moeller
ff5f9370c4 Checkstyle: MultiLineCondition 2012-10-23 08:25:30 +02:00
Felix Moeller
ddfcc96ab5 Checkstyle: LowerCaseConstant 2012-10-23 08:20:17 +02:00
Felix Moeller
2d61f03452 More Checkstyle cleanup 
This is for all LowerCaseConstant warnings
 2012-10-23 08:01:09 +02:00
Thomas Tanghus
befdd6b63b Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-23 06:23:03 +02:00
Jenkins for ownCloud
bc2a648f2d [tx-robot] updated from transifex 2012-10-23 02:06:03 +02:00
Felix Moeller
6a00a6b9ed Make Jenkins more happy. 
This is NoSpaceAfterComma
 2012-10-23 00:28:12 +02:00
Lukas Reschke
65619af05b Disable enhancedauth by default 
Admins can still enable it via config.php
 2012-10-22 23:04:39 +02:00
Felix Moeller
03581ef463 Correct a first issue Checkstyle is complaining about ... 
This is BracketsNotRequired
 2012-10-22 21:40:33 +02:00
Felix Moeller
37296b8b6d Adding the t() function to have the labels in the search results translated 
This should solve #55
 2012-10-22 20:55:05 +02:00
Thomas Müller
126d16f16d Fixing undefined $language 2012-10-22 17:09:34 +03:00
Thomas Tanghus
69cf89c5f6 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-22 15:41:39 +02:00
Thomas Tanghus
b5817dcc2e Added missing backtick to sql query. 2012-10-22 15:41:00 +02:00
Björn Schießle
d68b89cae4 add parameter to specify user for which OC_Filesystem should be initialized. 
(needed to share files via public links where no user is logged in)
 2012-10-22 14:55:53 +02:00
Jenkins for ownCloud
d8e945466d [tx-robot] updated from transifex 2012-10-22 02:06:18 +02:00
Bart Visscher
051dde08db Check for file exists before loading app version file 2012-10-20 23:49:55 +02:00
Thomas Tanghus
26618704a9 Fix accidentally creating new categories with the id as name. 2012-10-20 13:45:18 +02:00
Thomas Tanghus
ab167c3e2c Filter out special Favorites category. 2012-10-20 13:42:57 +02:00
Jenkins for ownCloud
cfbd310d34 [tx-robot] updated from transifex 2012-10-20 02:03:53 +02:00
Thomas Tanghus
2456401672 Remove redundant class wrapping. 2012-10-19 18:11:13 +02:00
Thomas Tanghus
10e29da8be Use self::prepare() instead of self::$connection->prepare. 2012-10-19 17:21:23 +02:00
Thomas Tanghus
394e4e4d5f Removed useless ORDER BY from query. 2012-10-19 16:15:47 +02:00
scambra
41b597e179 Translate formatDate using jquery datepicker 2012-10-19 13:56:19 +02:00
scambra
a24d8db4b2 translate datepicker 2012-10-19 13:56:19 +02:00
Thomas Tanghus
1803260285 Renamed OC_VCategories::add() to addMulti() and let the add() method return the id of the newly created category. 2012-10-19 13:21:05 +02:00
Thomas Tanghus
0e4ed2887c Return result from OC_DB::insertIfNotExist(). 2012-10-19 13:20:08 +02:00
Thomas Tanghus
afa3f49c93 Make categories var static. 2012-10-19 02:26:36 +02:00
Thomas Tanghus
4827de4a27 White space fix. 2012-10-19 00:20:27 +02:00
Thomas Tanghus
3b6cfe4977 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-19 00:17:28 +02:00
Thomas Tanghus
8a777022e4 Formatting 2012-10-19 00:16:53 +02:00
Thomas Tanghus
09e26145b7 Add favorite handling methods to OC_VCategories. 2012-10-19 00:15:58 +02:00
Thomas Tanghus
1f7baeb974 Use consts all places and rename some daft method names. 2012-10-19 00:13:34 +02:00
Björn Schießle
08ee2fcf93 check if mount point was already loaded to avoid redundant read operations 2012-10-18 17:30:01 +02:00
Björn Schießle
65b0824d35 typo from previous commit fixed 2012-10-18 17:15:30 +02:00
Björn Schießle
2499c24b8b load system wide configured mount points before accessing shared files 2012-10-18 17:15:30 +02:00
Björn Schießle
00ed2e87c9 check for mount points if file was shared from a different user 2012-10-18 17:15:30 +02:00
Thomas Müller
e4c0bb59e5 Merge pull request #39 from scambra/date-l10n-fixes 
Date l10n fixes
 2012-10-18 08:09:58 -07:00
Jörn Friedrich Dreyer
a7d8519550 when using oracle use LOWER() to make searching files case insensitive 2012-10-18 14:19:34 +02:00
Bart Visscher
6081bfa2bc Merge branch 'master' into routing 
Conflicts:
	lib/search/provider/file.php
	settings/ajax/changepassword.php
	settings/settings.php
 2012-10-17 16:38:11 +02:00
Susinthiran Sithamparanathan
b2b84f3a6f Update Sabre to version 1.7.1 2012-10-17 16:17:36 +02:00
Bart Visscher
44287d680b Check for file exists before loading app version file 2012-10-17 14:06:25 +02:00
Thomas Tanghus
26e92094a6 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-17 12:30:14 +02:00
Bart Visscher
04824162d9 core.js and core.css don't need to be absolute 2012-10-17 10:52:16 +02:00
Thomas Tanghus
8cd268fc82 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-17 00:16:37 +02:00
Jenkins for ownCloud
fd6adc7d08 [tx-robot] updated from transifex 2012-10-16 23:39:13 +02:00
Michael Gapczynski
c00f5d164f Fix unshareAll() 2012-10-16 16:27:23 -04:00
Lukas Reschke
379b775a56 Delete user files in /data/ after deleting a user 2012-10-16 22:05:06 +02:00
Michael Gapczynski
012ea1ed83 Add unshareAll() function to Share API 2012-10-16 15:38:52 -04:00
icewind1991
247626b5c2 Merge pull request #36 from scambra/filecache-fixes 
delete fscache on deleting user
 2012-10-16 11:46:50 -07:00
scambra
d8eb62232e don't duplicate locales with country code 2012-10-16 20:31:46 +02:00
scambra
ec253f1354 Use strftime to format date with translated month names 2012-10-16 20:19:35 +02:00
Lukas Reschke
de7b46c66a Use get_magic_quotes_gpc() to determine if magic_quotes is enabled 
set_magic_quotes_runtime gives a PHP warning
 2012-10-16 19:42:17 +02:00
scambra
e8441becdb delete fscache on deleting user 2012-10-16 17:34:35 +02:00
Thomas Tanghus
102dd1242e Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-16 16:57:25 +02:00
Lukas Reschke
e7c9d5fe54 Set oc_token to httponly 2012-10-16 13:53:40 +02:00
Lukas Reschke
59404b5675 Merge pull request #31 from visit1985/persistentcookies 
reresubmit: improved persistent cookies :)
 2012-10-16 04:46:22 -07:00
Lukas Reschke
e299c241df Make enhanced auth configurable 2012-10-16 01:08:05 +02:00
Lukas Reschke
c85c35dfae Don't add the enhanced auth time to the configuration 2012-10-16 01:04:34 +02:00
Lukas Reschke
5c0407306c Set a standard value for enhanced auth time 2012-10-16 01:04:20 +02:00
Lukas Reschke
6f2e8788ca Make enhanced auth time configurable 2012-10-16 01:02:03 +02:00
Lukas Reschke
f4142bd2a8 Move isUserVerified to OC_Util 2012-10-16 00:47:38 +02:00
Lukas Reschke
77e18b01ba Move the ( to the right position 2012-10-16 00:47:38 +02:00
Lukas Reschke
91d4b23efe Fix PHP notice 2012-10-16 00:47:38 +02:00
Lukas Reschke
1a187d1ca5 Fix PHP notice 2012-10-16 00:47:38 +02:00
Lukas Reschke
097f429816 Add isUserVerified() 2012-10-16 00:47:38 +02:00
Victor Dubiniuk
ddcd738357 Merge branch 'extended_log' 
PHP errors logging into the owncloud log
 2012-10-16 01:30:45 +03:00
Lukas Reschke
c9ac1364d1 "deny from all" instead directory 2012-10-15 23:35:27 +02:00
Lukas Reschke
3eb43c1fbe Show a warning in the installer if .htaccess is not working 2012-10-15 23:25:15 +02:00
Thomas Tanghus
9c9f5ef2d6 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-15 21:41:38 +02:00
Michael Göhler
8be9c04a3a 128byte is not 128bit - now we realy use 256bit (same as PHPSESSID) 2012-10-15 20:04:22 +02:00
Lukas Reschke
fa71e51e67 Use /dev/urandom instead of /dev/random 
The usage of /dev/urandom is enough secure
 2012-10-15 19:21:37 +02:00
Lukas Reschke
6e045b9ea1 Check if $_Post 2012-10-15 17:42:38 +02:00
Lukas Reschke
1c865f702c Change verifyUser so that external json files can call it 2012-10-15 17:42:38 +02:00
Lukas Reschke
4d7b0e9bb3 verifyUser() for the json part 2012-10-15 17:42:38 +02:00
Lukas Reschke
d33bec09fe Verify password page for users 2012-10-15 17:42:38 +02:00
Lukas Reschke
f08ff3b6e6 Correct formatting 2012-10-15 15:25:40 +03:00
Lukas Reschke
c930ac9f88 Merge pull request #30 from visit1985/logonpage 
extend logon page to display multiple error messages
 2012-10-15 03:52:11 -07:00
Michael Göhler
22fa23b4da extend configkey column to hold 128bit values 2012-10-14 22:37:05 +02:00
Michael Göhler
ae1f33db54 implement fixed php session timeout and session id regeneration 2012-10-14 22:36:26 +02:00
Michael Göhler
b92fd984aa removed username and password from token generation 2012-10-14 22:36:26 +02:00
Michael Göhler
a6c4046f48 fixed typo and redundant method call 2012-10-14 22:36:25 +02:00
Michael Göhler
d8fe6fbb40 added a warning message to the log when a cookie is rejected 2012-10-14 22:36:25 +02:00
Michael Göhler
382f8d060c fixed wrong variable usage 2012-10-14 22:36:25 +02:00
Michael Göhler
38b9bffaea call unsetMagicInCookie if token is invalid 2012-10-14 22:36:25 +02:00
Michael Göhler
eb79ccafe3 forgot a class name 2012-10-14 22:36:25 +02:00
Michael Göhler
2ea06f67bd delete all tokens on password change 2012-10-14 22:36:25 +02:00
Michael Göhler
45f1c3f120 further improvements on multiple login token support 
outdated tokens are deleted before checking against cookies
if an invalid token is used we delete all stored tokens for saveness
used token will be replaced by a new one after successful authentication
 2012-10-14 22:36:25 +02:00
Michael Göhler
ee5d0f328f improve token security 
switched from time() to internal method OC_Util::generate_random_bytes()
 2012-10-14 22:36:25 +02:00
Bart Visscher
4b799a6982 Make the lifetime of the remember login cookie 2012-10-14 22:36:25 +02:00
Bart Visscher
7f3e0b5566 Cleanup login tokens on login success 2012-10-14 22:36:25 +02:00
Bart Visscher
1012d317e3 Add support for multiple login cookie tokens 2012-10-14 22:36:25 +02:00
Bart Visscher
4af5b016cc Whitespace cleanup 2012-10-14 21:04:08 +02:00
Michael Göhler
7095b3a083 extend logon page to display multiple error messages 2012-10-14 19:57:24 +02:00
Lukas Reschke
2c427f050e Show a warning in the installer if no secure RNG is available 2012-10-14 17:18:30 +02:00
Lukas Reschke
d6c4b83f13 Fallback to /dev/random if openssl_random_pseudo_bytes not available 2012-10-14 16:14:45 +02:00
Jenkins for ownCloud
c88cf5cae5 [tx-robot] updated from transifex 2012-10-14 02:08:47 +02:00
Robin Appelman
93cbd96662 don't increase the size of the users home folder twice 2012-10-13 14:52:58 +02:00
Jenkins for ownCloud
d386bc8737 [tx-robot] updated from transifex 2012-10-13 02:08:50 +02:00
Lukas Reschke
77fbdb2ca8 Fix the require path 2012-10-13 01:10:04 +02:00
Björn Schießle
e38b736a1e fix bug #1977: remove etags from database after version rollback so that the client can detect the changes 2012-10-12 17:37:59 +02:00
Björn Schießle
079f0788d2 this is no longer needed, commit cb91e27ab3 should fix the issue 2012-10-12 17:35:57 +02:00
Björn Schießle
d4fd83301a remove unneeded variable 2012-10-12 16:33:57 +02:00
Björn Schießle
cb91e27ab3 check if directory already exist before executing mkdir 2012-10-12 16:31:03 +02:00
Bart Visscher
9a35bd76fb Use resolved path for require_once in autoloader 2012-10-12 15:47:41 +02:00
Bart Visscher
351f724193 whitespace fixes 2012-10-12 15:47:41 +02:00
Robin Appelman
d589869a34 disable log when running tests 2012-10-12 15:45:05 +02:00
Björn Schießle
d7f43945e7 nortmalize path before adding it to the fscache to avoid multiple fscache entries for the same file 2012-10-12 10:26:49 +02:00
Jenkins for ownCloud
b761143047 [tx-robot] updated from transifex 2012-10-12 02:07:10 +02:00
Thomas Tanghus
c721eefe8e Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-11 22:25:20 +02:00
Björn Schießle
86d978be78 add *.ai files to the mimetypes list 2012-10-11 16:14:29 +02:00
Björn Schießle
4d451f649d fixed offset calculation (bug #1961) 2012-10-11 12:42:57 +02:00
Thomas Tanghus
7a30f46543 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-10 23:00:46 +02:00
Bart Visscher
2c3674ea87 Add logging when stripping apps from autoload include path 2012-10-10 21:06:15 +02:00