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

1467 commits

Author SHA1 Message Date
Robin Appelman
39086ef63e dont try to create mountpoints automatically 2012-07-20 17:58:06 +02:00
Robin Appelman
48306a3c4f fix unused variables 2012-07-20 17:58:05 +02:00
Robin Appelman
0e111e1a17 fix increasing folder sizes in filecache for custom roots 2012-07-20 17:58:05 +02:00
Robin Appelman
57ed83f266 fix eventsource fallback when more then one eventsource is active 2012-07-20 17:58:05 +02:00
Georg Ehrke
fdb167a046 Merge branch 'master' into subadmin 2012-07-20 17:20:14 +02:00
Robin Appelman
445f52ef8b dont check for filecache updates when getting quota info over webdav 2012-07-20 16:35:51 +02:00
Georg Ehrke
ea79ff191c Merge branch 'master' into subadmin 2012-07-20 15:22:12 +02:00
Robin Appelman
98e769d269 dont use the mtimes stored in zip archives since they dont update correctly 2012-07-20 00:52:10 +02:00
Georg Ehrke
abb9f52dd7 add isGroupAccessible in OC_SubAdmin 2012-07-19 19:17:01 +02:00
Georg Ehrke
05bc541276 add some doc for lib/subadmin.php 2012-07-19 16:43:46 +02:00
Robin Appelman
33b8de91ea allow a more flexible way of using user backends 2012-07-19 16:31:55 +02:00
Georg Ehrke
6e139f16e4 add isUserAccessible method to OC_SubAdmin class 2012-07-19 16:30:58 +02:00
Georg Ehrke
a5bebb86a5 add checkSubAdminUser method to OC_JSON class 2012-07-18 17:11:09 +02:00
Georg Ehrke
f0c82686fd Merge branch 'master' into subadmin 2012-07-18 00:04:17 +02:00
Robin Appelman
f047fdbfaa revert to using fopen for webdav instead of readfile 2012-07-16 19:58:05 +02:00
Georg Ehrke
ccb1c57745 add warning in log if OC_L10N::tA was called 2012-07-16 19:35:40 +02:00
Michael Gapczynski
72ebc2a32a Delete old session files, suggested by Torben Nehmer, see bug oc-736 2012-07-15 15:22:31 -04:00
Michael Gapczynski
b1a7826d56 Check if user is already logged in for DAV auth, instead of logging in and creating new sessions for every request 2012-07-15 15:17:27 -04:00
Georg Ehrke
d49b789348 Merge branch 'master' into calendar_import 2012-07-15 16:56:38 +02:00
Georg Ehrke
4700222ea9 Merge branch 'master' into subadmin 2012-07-15 16:33:17 +02:00
Georg Ehrke
e707e94857 subadmins can now add users 2012-07-15 16:31:28 +02:00
Robin Appelman
b45d3ced79 fix remote and public.php 2012-07-13 22:44:35 +02:00
Thomas Mueller
967c6d7d3c allow command line based installation/setup 2012-07-13 13:25:43 +02:00
Michael Gapczynski
281bf62af9 Fix log write() parameters in wrong order 2012-07-11 15:56:18 -04:00
Lukas Reschke
8afcddf44f Handling exceptions 2012-07-11 21:52:51 +02:00
Michael Gapczynski
66da0a2151 Catch exceptions from PHPMailer 2012-07-11 15:36:27 -04:00
Georg Ehrke
0cb9f5e159 fix merge conflicts 2012-07-11 10:50:18 +02:00
Georg Ehrke
5575493900 Merge branch 'master' into calendar_import 2012-07-11 10:47:30 +02:00
Bjoern Schiessle
e7a0c4f0bb use readfile() instead iof fopen() for file download over webdav. 
fopen() didn't work for large files on some servers while readfile()
seems to work for all files on all configurations.
 2012-07-10 19:22:06 +02:00
Johannes Willnecker
570ea787f1 fixed typo 2012-07-10 16:58:37 +02:00
Johannes Willnecker
3e53bf4a86 Fix for oc-972, oc-1144 and oc-1191 2012-07-10 16:58:37 +02:00
Georg Ehrke
d0b625352c some work on subadmins 2012-07-09 21:51:19 +02:00
Jörn Friedrich Dreyer
e59a1806cf remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00
Bjoern Schiessle
82a57f0ce3 revert performance improvements in userExists() because it breaks new user creation 2012-07-09 10:31:50 +02:00
Bjoern Schiessle
7d41d3aba8 webdav ssl cleanup 2012-07-09 09:40:33 +02:00
Thomas Tanghus
6116dc6b65 Added default parameter $reset to allow for incremental rescan. 2012-07-09 00:14:42 +02:00
Lukas Reschke
b46d3019ca Uninitialized variable 2012-07-07 15:52:49 +02:00
Lukas Reschke
ec7bb86b28 Fixes a problem with the user creation ("User already existed" even if the user don't exists.) Thanks to Phil Reinhardt for pointing this out. 2012-07-07 15:00:02 +02:00
Michael Gapczynski
f955e5e9b2 Move line counter so we only count lines towards the offset that are equal or above the log level 2012-07-06 17:29:45 -04:00
Michael Gapczynski
466d7c0d99 Improvements and bug fix for log reading, fixes bug oc-982 2012-07-06 15:51:01 -04:00
Bjoern Schiessle
e91b4bc2ac allow user to upload his own root certificate for secure webdav mount 2012-07-06 15:58:38 +02:00
Bjoern Schiessle
ba8dee0520 introduce subclassed client.php and revert changes to 3rdparty 2012-07-06 12:26:54 +02:00
Georg Ehrke
9a10efd80f Merge branch 'master' into calendar_import 2012-07-06 11:01:12 +02:00
Bjoern Schiessle
5bf050b13b moved performance improvement from isLoggedIn() to userExists() to avoid webdav problems 2012-07-05 15:55:46 +02:00
Georg Ehrke
c067930856 Merge branch 'master' into subadmin 2012-07-05 11:32:59 +02:00
Georg Ehrke
aa95cf2c98 Merge branch 'master' into calendar_import 2012-07-05 11:30:37 +02:00
Bart Visscher
280c59e914 More helpfull debug msg for redirectToDefaultPage 2012-07-04 17:51:07 +02:00
Bart Visscher
621b83df72 Remove referer check, this is unreliable. The header doesnt need te exist, or can be wrong 2012-07-04 17:51:07 +02:00
Georg Ehrke
657eef354a Merge branch 'master' into calendar_import 2012-07-04 13:03:30 +02:00
Brice Maron
3b09aa8578 Correct Postgresql connection with space in password. Work around php bug 2012-07-04 10:13:00 +00:00
Georg Ehrke
f98bd1ad66 Merge branch 'master' into calendar_import 2012-07-03 22:35:46 +02:00
Bjoern Schiessle
aec6eea235 use filesystem abstraction layer to copy file versions 2012-07-03 18:25:49 +02:00
Georg Ehrke
641e77327e Merge branch 'master' into calendar_import 2012-07-03 16:48:30 +02:00
Bjoern Schiessle
4bc9e4e012 wrong var name fixed 2012-07-03 16:43:57 +02:00
Georg Ehrke
cfcfdd674e Merge branch 'master' into calendar_import 2012-07-03 13:43:52 +02:00
Brice Maron
8a1c279183 Escape pg connection string on setup 2012-07-03 09:20:42 +02:00
Arthur Schiwon
52822652bc provide multibyte aware helper functions mb_str_replace, mb_substr_replace and mb_array_change_key_case for handling with UTF 8 2012-07-02 20:31:19 +02:00
Lukas Reschke
90331a3fa1 Remove forced download 2012-07-02 12:20:43 +02:00
Lukas Reschke
f8cebed348 Don't display error messages 2012-07-02 10:24:22 +02:00
Georg Ehrke
e4960c3bb4 fix a small PHP fail 2012-07-02 10:23:32 +02:00
Lukas Reschke
4e63981da9 Disable mimesniffing 2012-07-01 13:45:20 +02:00
Tom Needham
b2cb7d54d1 Fixed app path 2012-06-30 22:56:47 +00:00
Tom Needham
cfc78d44bb Return correct json response, fix syntax 2012-06-30 22:56:47 +00:00
Georg Ehrke
4890bbb30d Merge branch 'master' into calendar_import 2012-06-30 22:08:36 +02:00
Florian Hülsmann
4ed55315e7 fixed linkTo() 2012-06-30 16:53:41 +02:00
Georg Ehrke
246894243a Merge branch 'master' into calendar_import 2012-06-29 21:46:09 +02:00
Bjoern Schiessle
94add1c000 typo fixed 2012-06-29 16:49:22 +02:00
Bjoern Schiessle
b95996c02c - when creating a new text file or directory which name already exist use the same pattern as for file uploads in such a case (add a (N) to the name) 
- don't allow renaming if a file/directory with the name already exists
 2012-06-29 15:23:04 +02:00
Bart Visscher
1ccbbfad53 Spelling fix 2012-06-28 22:11:04 +02:00
Bart Visscher
bf09edcbf1 Remember the app root information. 2012-06-28 22:11:04 +02:00
Bart Visscher
19bb4e83c9 Remove redundant code from OC_Helper::linkTo 2012-06-28 22:11:04 +02:00
Brice Maron
b2cbf1199d Pg setup enhancement 
do not create a db if already existing .. and reset the user password instead of creating if the user already exists
 2012-06-28 19:38:03 +00:00
Michael Gapczynski
81953e7bb5 Return login errors for PostgreSQL setup 2012-06-27 20:24:06 -04:00
Tom Needham
7284e57c91 Migration: fix app paths 2012-06-27 20:43:33 +00:00
Brice Maron
2706988225 Set table prefix if not set in postgresql install 2012-06-27 16:08:46 -04:00
Bart Visscher
2d8a380a21 Fix recursion when running an update script 2012-06-27 14:56:34 +02:00
Georg Ehrke
726bec73f0 Merge branch 'master' into oc_error 2012-06-27 14:06:31 +02:00
Georg Ehrke
153ce2f9ab Merge branch 'master' into calendar_import 2012-06-27 14:02:05 +02:00
Robin Appelman
12f7cb8767 fix running tests from cli 2012-06-27 13:21:45 +02:00
Robin Appelman
420d23a875 fix webdav errors for empty folders 2012-06-27 13:08:16 +02:00
Bart Visscher
dab58f3464 Cache result of OC_App::getAppVersions 2012-06-27 01:05:12 +02:00
Bart Visscher
2f0b4983e9 Move app upgrade check to loading of apps 2012-06-27 01:05:12 +02:00
Thomas Tanghus
a25ae4b4b6 Make Categories a bit quieter. 2012-06-27 01:03:53 +02:00
Georg Ehrke
4e53db3d9c Merge branch 'master' into oc_error 2012-06-26 14:17:32 +02:00
Thomas Tanghus
ac4e19218e All is good ;-) 2012-06-26 02:47:59 +02:00
Bart Visscher
c6b9f613bb Cache: try to set the fast cache in the Broker 2012-06-25 21:05:10 +02:00
Bart Visscher
fe0f281b4f Fix setting ETag header on cache miss 2012-06-25 21:05:10 +02:00
Bart Visscher
531c1c509c Cache: Add APC and XCache to global cache handler 2012-06-25 21:05:10 +02:00
Bart Visscher
4e4a1a4274 Cache: Use getUserCache cache in OC_Cache 2012-06-25 21:05:10 +02:00
Bart Visscher
cae089df91 Cache: Create global cache in OC_Cache 2012-06-25 21:05:10 +02:00
Brice Maron
09a9f5400e Trim url and path of appsroot to have and standart type of path fix oc-1107 2012-06-25 15:50:27 +02:00
Frank Karlitschek
a4c47c674d write sql errors into the error log for better debugging 2012-06-25 11:55:51 +02:00
Brice Maron
564cd82599 Fix the fix about filecache and postgres 2012-06-24 20:49:48 +00:00
Brice Maron
2a6a155e23 Correct File cache error with postgresql 2012-06-24 19:52:30 +00:00
Thomas Tanghus
b182e6c86a Trim trailing whitespace from version. 2012-06-24 15:07:44 +02:00
Georg Ehrke
51c5e7035e Merge branch 'master' into oc_error 2012-06-23 19:54:20 +02:00
Florian Hülsmann
d450560b39 remove trailing slash in %appswebroot% placeholder 2012-06-23 16:59:55 +02:00
Frank Karlitschek
2c1c1ba88c close only if exist 2012-06-23 16:21:47 +02:00
Frank Karlitschek
7c5ff900d0 work with non existing apps directory. thanks to Antonio for the hint 2012-06-23 16:17:59 +02:00
Brice Maron
d39d7fb9ff Remove references to /apps/ and correct inclusion of settings 2012-06-22 22:05:39 +00:00