b8275691e7
Merge branch 'master' into oc_error
2012-06-04 10:35:50 +02:00
e90cbcaf5b
http user backend
2012-06-03 02:51:05 +02:00
993ebc4c90
Verify user exists when checking if logged in, fix for bug oc-863
2012-06-02 20:06:52 -04:00
cc84bd2993
Fix typo in log message
2012-06-01 15:15:05 -04:00
66f1957e3b
Improve efficiency of retrieving log file entries
2012-06-01 14:39:50 -04:00
3d7143c730
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-01 19:01:00 +01:00
4aa96de537
add a check for pdo
2012-06-01 20:00:33 +02:00
2ccf3da411
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-01 19:00:28 +01:00
07e1e3a945
check if apps folder is writable
2012-06-01 19:54:07 +02:00
4b4d13165a
Minor change to comment
2012-06-01 16:46:18 +01:00
7203f6951e
Extended class comment
2012-06-01 16:34:09 +01:00
dcb06393a8
fix propper error reporting
2012-06-01 16:30:47 +02:00
ad6562d14f
sort users and groups. fixes oc-779
2012-06-01 14:18:14 +02:00
75d56f24f2
try to switch magic quotes off.
...
it´s evil and deprecated
2012-06-01 12:41:38 +02:00
93295994dc
fix oc-769
2012-06-01 12:15:03 +02:00
24d14783d7
added a serverProtocol function that correctly returns the used protocol even if the ssl connection is terminated at a reverse_proxy or at a load balancer
2012-06-01 10:38:44 +02:00
a72e6cc113
fix oc-780
2012-05-31 21:28:58 +02:00
d4ea853fcf
use our own serverHost call so that ownCloud works with reverse proxy servers
2012-05-31 20:26:09 +02:00
ec0c0f3907
Added & improved documentation
2012-05-31 17:57:34 +01:00
ef60dcc23e
fixed typo
2012-05-31 17:38:35 +01:00
6b3df8ae9c
Improved class comment block
2012-05-31 17:32:34 +01:00
8744b09959
added extensive class comment based on icewind's January list email
2012-05-31 17:02:35 +01:00
fc400e06c3
fixed typos in var names
2012-05-31 14:53:52 +01:00
43fcae0409
clarified comment
2012-05-31 14:50:41 +01:00
a33f580db1
Remove OC_App::register function
...
The data supplied is never used in OwnCloud. Removed the call from all the apps, and made the public API function empty.
2012-05-31 13:01:30 +02:00
4434016a8b
Whitespace fixes
2012-05-31 13:01:30 +02:00
54001ec7d8
Merge branch 'master' into oc_error
2012-05-31 12:21:06 +02:00
22a04d8e93
don´t hardcode /tmp
2012-05-30 14:14:32 +02:00
49689dbc7a
Merge branch 'master' into oc_error
2012-05-29 19:48:07 +02:00
fbe58755e5
Restrict requested app to apps directory
2012-05-29 12:31:47 -04:00
94c633b6b7
Merge branch 'master' into oc_error
2012-05-26 22:54:49 +02:00
982cde0bb1
check during ownCloud upgrade if all the installed apps are compatible with the new ownCloud version. Disable them if not
2012-05-26 20:37:10 +02:00
a945fa10a6
update copyright
2012-05-26 19:14:24 +02:00
dfd5a9759c
only enable compatible apps
2012-05-25 11:31:46 +02:00
79bf933319
Merge branch 'master' into oc_error
2012-05-25 10:30:44 +02:00
9c2a6fb551
Add HEAD request management for files ajax/download.php
2012-05-24 22:48:10 +00:00
24318354f2
changed the default from Berlin to UTC.
...
Greetings form Berlin by the way ;-)
2012-05-24 00:49:21 +02:00
60fdc13ae6
enable running unit tests from cli
2012-05-22 20:22:53 +02:00
d2e2a2b2c0
prevent apps from printing output from app.php
2012-05-22 13:10:42 +02:00
cb23bae8d9
dont throw errors when apps dont have types configured
2012-05-20 18:52:03 +02:00
f00b57f8be
files app is always enabled
2012-05-20 18:52:03 +02:00
c0db603d29
this is 5 pre alpha now
2012-05-19 18:21:33 +02:00
7e49a33d64
getStorage belongs to files not to apps.
2012-05-19 10:44:08 +02:00
08f7d4c552
document the public classes a bit more
2012-05-19 10:36:57 +02:00
a2cc772aa5
dont run update scripts for apps that arent enabled
2012-05-19 02:00:46 +02:00
b096fd9ed8
log upgrades
2012-05-19 01:55:20 +02:00
df64b9b0e9
strict standards fixes for sqlite3
2012-05-19 01:39:41 +02:00
90cbc32c77
Fix redirect after login, prevent open redirects
2012-05-18 16:56:48 -04:00
16224e5e8b
"fopen(" interferes with our own classes.
...
remove it for now and let´s fix this later
2012-05-18 18:22:37 +02:00
2d3c709163
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-05-18 15:56:15 +02:00
db77dc91bc
only try to install apps that are compatible with oC4
2012-05-18 15:54:36 +02:00
2e9115efe0
increase to RC2
2012-05-18 15:54:17 +02:00
a6ff909911
this code looks wrong to me but i'm putting it back while we find out what the right code should look like
2012-05-18 15:39:28 +02:00
1a874b4c56
make redirect safe by restricting it to current host
2012-05-18 15:32:41 +02:00
9b5e8a2c63
fix redirect to desired page after login
2012-05-18 15:11:01 +02:00
48505c5626
improve tar archive backend
2012-05-18 01:54:59 +02:00
3d713e711b
Merge branch 'master' into oc_error
2012-05-17 22:17:31 +02:00
c1ba4deb72
when scanning a folder that is a mountpoint, use the root of the mount for checking if a folder is writable instead of the folder
2012-05-17 01:47:58 +02:00
aac9629e88
add support for custom ports for mysql/pgsql by adding :portnumber to the database host
2012-05-17 01:06:22 +02:00
5fe7200a7f
update documentation of oc_user::checkpassword
2012-05-17 00:57:43 +02:00
2c99924f7d
make sure the group exists in the backend before adding a user to it
2012-05-17 00:47:43 +02:00
22dd155e4d
Merge branch 'unstable' of gitorious.org:owncloud/owncloud into unstable
2012-05-16 18:30:35 +01:00
9acd1065b0
made initial testing version of expireAll for version control \ngave some old vars new camelcase names
2012-05-16 18:30:26 +01:00
c645a7d0f8
Fix empty jsfiles and cssfiles in layout template
2012-05-16 18:53:46 +02:00
ce1e4425c2
Combine and minimize core and default app js files
2012-05-16 18:53:46 +02:00
f71fec8cdc
Combine and minimize core and default app css files
2012-05-16 18:53:46 +02:00
2faae817f1
Template: Fix var name
2012-05-16 18:53:46 +02:00
6d20fe4012
Template: Make getFormFactorExtension function public
2012-05-16 18:53:46 +02:00
b39f01fce6
Comment spelling fix
2012-05-16 18:52:40 +02:00
5d72681d10
Better place to check caching headers
2012-05-16 18:52:40 +02:00
01b366df80
avoid corrupt ZIP files on lighttpd, should fix oc-467
2012-05-15 11:57:24 +02:00
583dce5276
removing executable bit - again
2012-05-15 00:52:00 +02:00
6779f28af4
cache app types during install or update
2012-05-14 22:49:31 +02:00
bda2dbec1f
Prevent Clickjacking by adding additional headers:
...
header('X-Frame-Options: Sameorigin');
header('X-XSS-Protection: 1; mode=block');
header('X-Content-Type-Options: nosniff');
Thanks to Lukas Reschke for reporting this issue (and many more).
2012-05-14 15:34:28 +02:00
e7c106d91e
selective app loading for remote/public
2012-05-14 00:28:28 +02:00
a332c39472
Check if path_info is empty as well, fixes bug oc-632. Thanks to die3lustigen2.
2012-05-13 15:26:30 -04:00
8d475debe0
additional logging when db upgrade fails
2012-05-13 21:21:39 +02:00
1a2ab2ef68
prevent user creation with empty password
2012-05-13 20:53:56 +02:00
a5f0ac811f
Merge branch 'master' into oc_error
2012-05-13 19:13:31 +02:00
3926e2d4f3
VCategories: Made a small check for categories that seems to resolv the problems in Calender. Also reverts the changes from 9e6221b229.
2012-05-13 15:07:07 +02:00
9e6221b229
VCategories: Suppress error messages stemming from import from file app.
2012-05-13 09:16:53 +02:00
af77ce9a9b
This is RC now
2012-05-13 05:11:10 +02:00
9eb91a111d
update to jquery 1.7.2
2012-05-12 00:37:19 +02:00
5b7c69f978
Change sqlite escaping of identifier to double quote. Fixing some issues
2012-05-11 19:45:53 +00:00
919681f3e6
Make processed css files cachable
2012-05-11 21:33:02 +02:00
97233b77cd
Remove DOCUMENTROOT static var, and make SUBURI var private
2012-05-11 21:31:51 +02:00
847832ae77
also set remote/public paths on installing apps
2012-05-11 20:58:23 +02:00
d12021e3c4
fix sqlite3 driver against updated MDB2
2012-05-11 20:56:02 +02:00
cf3940425f
don't do the initial scanning of the users home folder trough the update system
2012-05-11 20:49:19 +02:00
0622fa79ba
add temporary filestorage backend for testing purposed
2012-05-11 20:33:56 +02:00
b40f9670ae
allow clearing hooks and fileproxies
2012-05-11 20:33:56 +02:00
736739bbbd
load remote and public paths from info.xml during upgrade instead of setting them every time
2012-05-11 20:33:56 +02:00
c99d7dd94f
the ',last' breaks all other rewrite rules and is also not there in the committed .htaccess, so removing it. anybody know why it was there?
2012-05-11 17:59:21 +02:00
347ce2aafa
match setup script to .htaccess from repo
2012-05-11 17:30:27 +02:00
4462b26160
oops, typo in lib/setup.php
2012-05-11 17:09:10 +02:00
2dff357a4e
add new htaccess things into setup script too
2012-05-11 17:06:04 +02:00
8f2217ca2e
make default app choosable
2012-05-11 13:56:52 +02:00
709b0a1ddc
Check if app is enabled before exporting its data
2012-05-10 23:06:53 +00:00
de95bf62a2
Prevent any null bytes related exploits, thanks to Lukas Reschke
2012-05-10 11:44:06 -04:00
d9fbdae758
Prevent XSS exploit by checking if path-info is set, thanks to Lukas Reschke
2012-05-10 10:26:12 -04:00
b055ebc1fc
added documentation to OCP namespace
2012-05-10 14:19:17 +01:00
c2230580c1
Remove unused OC static variable CONFIG_DATADIRECTORY_ROOT
2012-05-10 09:14:27 +02:00
b022ccb863
Whitespace fixes
2012-05-10 09:14:26 +02:00
e77ba0280a
Implement default functions in OC_Group backend
...
Simplifies calling these functions, and makes code simpler
functions:
inGroup
getUserGroups
getGroups
usersInGroup
2012-05-10 09:14:26 +02:00
ac2e0cd6e4
Implement default functions in OC_User backend
...
Simplifies calling these functions, and makes code simpler
functions:
deleteUser
getUsers
userExists
2012-05-10 09:14:26 +02:00
a9d7c67bf2
The log message is not always shown in html
...
The log message can also be logged with syslog, here we don't want to have html-entities. Also the log messages through json are displayed as text not html.
2012-05-10 09:13:09 +02:00
798e6aa40b
Merge commit 'refs/merge-requests/100' of git://gitorious.org/owncloud/owncloud into merge-requests/100
2012-05-09 17:50:14 -04:00
03f66c6351
also scan new folders when checking for updates
...
it might cause long load times but seems the best for now
2012-05-09 20:35:12 +02:00
bc60b8d87a
fix bug in public api
2012-05-09 18:33:40 +02:00
bba434ca37
fixed typo in lib/public/util.php:106 (varname to )
2012-05-09 15:17:40 +02:00
051442bc76
Sanitize redirect urls
2012-05-08 17:41:50 -04:00
9c47346373
Protect admin from evil log messages
2012-05-08 19:41:31 +00:00
52717d2a1b
remove comments
2012-05-08 17:07:50 +02:00
9921ca11b5
Add protection for non-authorized char in installation form
2012-05-07 22:12:30 +00:00
43978abd80
increase to 4 beta
2012-05-07 22:58:22 +02:00
10d291d6b3
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-05-07 22:56:34 +02:00
40b823bc8b
some more docu fixes
2012-05-07 22:55:44 +02:00
4dbc2093c6
Create a function for linking to remote.php
2012-05-07 21:47:14 +02:00
5b7cefb1e5
make ampache work with remote.php
2012-05-07 20:26:09 +02:00
d032345191
fix validation of getfile parameter - i hate this bloody merge conflicts
2012-05-07 13:23:55 +02:00
640ba1828f
Start of audit app
...
Audit the filesystem action
2012-05-07 09:04:07 +02:00
cde60dba0f
Fix typo.
2012-05-07 04:46:09 +02:00
aa0c3ddcfe
Fix updateFolder() in OC_FileCache
2012-05-06 20:11:10 -04:00
e0db22cc07
Provide feedback when user creation fails
2012-05-06 18:04:48 -04:00
1945cd6946
ported the oc_template class
2012-05-06 23:00:36 +02:00
5d55c709dd
some more documentation cleanups. much more is needed.
...
And greeting from the Atlanta airport. ;-)
2012-05-06 22:02:16 +02:00
2edf59c026
first part of documentation update. lot´s more to come
2012-05-06 21:46:39 +02:00
35177e00c0
Merge commit 'refs/merge-requests/109' of git://gitorious.org/owncloud/owncloud into merge-requests/109
2012-05-06 16:13:13 +02:00
e459309511
Fixed escaping of filename when determining MIME type
2012-04-25 10:33:52 +02:00
f991948a71
Fix loading by apptype in webdav
2012-05-05 21:58:10 +02:00
d46bea8867
fixing file headers with copy right
2012-05-05 18:13:40 +02:00
c0e67fa24a
fix opening encrypted files from the browser
2012-05-05 16:49:48 +02:00
9bcc5c11a8
porting the hooks and starting with the templates
2012-05-05 10:18:45 +02:00
4a89eb77c1
Escape strings for DB and User creation at setup. Fix oc-124
2012-05-04 22:54:55 +00:00
eab4a05d78
implement missing getusers call
2012-05-04 11:13:07 +02:00
a22a79cddd
fix filecache for postgresql
2012-05-03 23:17:03 +02:00
9e03ea4a28
ensure the files app is always loaded
2012-05-03 20:47:18 +02:00
97a8af7f25
ported oc_db
2012-05-03 13:06:08 +02:00
43caa3b3b9
ported oc_json
2012-05-03 12:23:29 +02:00
351740601a
port oc_response
2012-05-03 10:46:27 +02:00
e5ef3e1340
move archive library to core so we can properly depend on it
2012-05-02 23:48:23 +02:00
31d623f426
Fix log viewing bug
2012-05-02 15:26:42 -04:00
10bbbc8cd2
new checkAppEnabled call
2012-05-02 18:54:31 +02:00
da03d05700
create folder 'remote' for the remote services like caldav, carddav and webdav
2012-05-02 16:41:23 +02:00
82a61e2e1a
port oc_preferences
2012-05-02 15:54:34 +02:00
ff66600bc0
port appconfig
2012-05-02 14:11:29 +02:00
8e99475886
first part of the config stuff
2012-05-02 13:28:56 +02:00
8c7f854671
move all the files stuff into a files class
2012-05-02 12:54:31 +02:00
6750998984
files is not internal any more, part II
2012-05-02 11:26:22 +02:00
d71600213a
files is not internal any more
2012-05-02 11:14:11 +02:00
c9eaffd336
send downloadfile piece by piece. saves RAM and is better suited for large files.
2012-05-02 11:02:13 +02:00
2fe646dcec
ported the oc_app calls
2012-05-02 00:50:26 +02:00
93b63cf375
ported the rest of the OC_Helper calls
2012-05-02 00:20:45 +02:00
e48f511606
port linkto and serverHost
2012-05-01 23:19:39 +02:00
31e32e3c10
ported checkLoggedIn and checkAdmin
2012-05-01 22:59:38 +02:00
e2fb094693
some more porting
2012-05-01 21:07:08 +02:00
d0554bef06
finish porting of the LOG calls or the apps to the public api
2012-05-01 17:38:27 +02:00
7ded9cf520
Checks if config folder is writable on begin of the installation.
2012-05-01 16:35:46 +02:00
d3ce2cacd6
OC_User: handle success properly
2012-05-01 14:40:56 +02:00
8a69116e94
OC_User: don't say password changed when it is not true
2012-05-01 13:40:01 +02:00
0195d5b439
some more work on the public API
2012-05-01 09:39:12 +02:00
04c6582af1
load the files app in a way that doesn´t break oC3 configurations
2012-04-30 13:58:48 +02:00
e1268cd5f4
we require php 5.3 now. so please notify the user if an old version is in use
2012-04-30 13:28:31 +02:00
f0701f75a9
tiny typo
2012-04-30 13:08:08 +02:00
07f2e316e4
removing executable bit from various files
2012-04-30 12:05:57 +02:00
c7e7767f58
don´t hardcode files app. we have no a standard info.xml in files
2012-04-29 21:27:02 +02:00
4d3ef9a824
improve rescanning folders
2012-04-29 16:11:17 +02:00
e3adbcb7d5
remove non existing files from the cache when rescanning a folder
2012-04-29 15:09:47 +02:00
09a5c59cca
only install shipped apps on setup that should be enabled by default
2012-04-29 14:38:56 +02:00
3aedbc5f95
remove debug message
2012-04-27 22:22:58 +02:00
06e9ac8591
fix parsing of app parameter and fix external app
2012-04-27 22:22:03 +02:00
993d655aad
Merge branch 'master' into movable_apps_2
2012-04-27 10:30:50 +02:00
ee0cb68f5e
some csrf fixes. needs testing
2012-04-27 01:18:21 +02:00
74b5e22a68
some more csrf fixes
2012-04-26 23:17:46 +02:00
5483c1be42
hide fails
2012-04-26 21:58:43 +02:00
5fda0e4b3b
make *DAV work with movable apps
2012-04-26 21:56:29 +02:00
2b10371bde
fix merge conflicts
2012-04-26 18:08:49 +02:00
40f95ffdf3
fix security check for the path of the requested file
2012-04-26 17:55:00 +02:00
ebcaa46482
fix loading of css files that are core related
2012-04-26 15:19:27 +02:00
3f64eb25ab
some fixes fore movable apps
2012-04-26 14:52:55 +02:00
d76552a009
Merge branch 'sabredav_1.6'
2012-04-25 10:39:31 +02:00
476043ecb9
add a proper 404
2012-04-25 10:17:20 +02:00
cc2bfd313d
minor filecache improvements
2012-04-25 00:12:12 +02:00
9015c46e31
emit the correct hooks for file_put_contents and some readfile improvements
2012-04-25 00:12:12 +02:00
60b924c954
initial mount configuration work
2012-04-25 00:12:12 +02:00
f17eea506a
fix merge conflicts
2012-04-24 21:59:56 +02:00
fb84d0aff8
fix php fail
2012-04-24 21:37:19 +02:00
9b29bc96de
remove debug message
2012-04-24 21:36:54 +02:00
0b06eff3a0
another fix for linkto function
2012-04-24 20:17:00 +02:00
29b9e27078
fix linkto function in OC_Helper
2012-04-24 20:14:42 +02:00
6848b069c9
OC_App::getStorage() failed if app dir didn't exist.
2012-04-24 01:44:07 +02:00
95c220a246
remove debug code in lib base
2012-04-23 20:31:03 +02:00
19109afa79
fix bug in lib base
2012-04-23 20:11:21 +02:00
42a570788b
Merge branch 'master' into movable_apps
2012-04-23 19:56:07 +02:00
6d92ebca45
use native functions of php to parse the string into the Var
2012-04-23 17:09:28 +02:00
9226cb7a6a
rename var file to getfile to prevent fails in files app
2012-04-23 16:36:24 +02:00
aaedb23f05
fix bug in lib/helper.php and fix file upload
2012-04-23 16:28:37 +02:00
f5c9fe9ece
first step to an public api of ownCloud for the apps. In the future they shouldn´t call internall classes, functions or session variables because this will change and break in upcoming versions. Apps should only call this public interface that we will kepp stable over different releases. The namespace is OCP for ownCloud public. This is just the first step. more coming soon
2012-04-23 15:50:30 +02:00
e888f4d9bc
Merge branch 'master' into sabredav_1.6
2012-04-22 13:20:50 +02:00
6b9072de58
fix merge conflicts
2012-04-22 13:20:25 +02:00
4c2cf35050
fix merge conflicts
2012-04-22 13:19:12 +02:00
0918fc7d91
fix merge conflicts
2012-04-21 23:21:50 +02:00
a86d89f5ca
Add a static code checker for evil patterns in apps.
...
Disabled by default for now.
We will check for private api calls here later once the public api is in place
2012-04-21 22:47:56 +02:00
6bfe2289be
improve the app installer.
...
show a label if an app is an internal app or a third party app from the app store.
show a preview image of the app if available
2012-04-21 15:30:58 +02:00
711aa229b8
Merge branch 'master' into movable_apps
2012-04-20 22:41:39 +02:00
99a473bd62
support file calls with parameter
2012-04-20 22:33:30 +02:00
0f5864d864
support searching the knowledge base
2012-04-20 21:49:57 +02:00
2fbc92bd4b
new OC_Mail class to handle all mail sending. The benefit is that is way mor flexible than the standard mail command. can be configured to use a remote smtp relay for example. also port the lostpassword code
2012-04-20 20:49:35 +02:00
2e85313701
optimize code
2012-04-19 22:26:36 +02:00
909282c81e
remove parameters in file var before call require once
2012-04-19 22:25:21 +02:00
85019887df
add loading of files
2012-04-19 16:44:49 +02:00
bdb3962b8d
add function to get mimetype from string
2012-04-18 20:54:28 +02:00
dfc92675e0
make menu work with movable apps
2012-04-18 17:25:44 +02:00
eb29c577c2
Merge branch 'master' into movable_apps
2012-04-18 12:20:09 +02:00
3e0e6e35f4
open app thru index.php
2012-04-18 08:20:51 +02:00
57b8ff890c
check if PHP mod GD is installed
2012-04-17 19:09:41 +02:00
d24abc3b9d
check if PHP mod JSON is installed
2012-04-17 19:06:45 +02:00
5720bd296d
merge log into admin
2012-04-16 12:21:48 +02:00
464c751f30
fix creating unique filenames
2012-04-16 10:58:40 +02:00
fa97c59f95
fix group backend
2012-04-16 10:36:21 +02:00
b61f6438ba
return user specific paths from oc_filecache::getpath
2012-04-16 10:06:52 +02:00
77cefdedb8
Merge branch 'master' into sabredav_1.6
2012-04-15 22:28:11 +02:00
c8cb870a27
Merge branch 'master' into oc_error
2012-04-15 22:27:47 +02:00
68b1ae1a36
OC_Group_Backend.php misses function groupexists
...
Fix http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-182
2012-04-15 17:11:03 +02:00
ea99e1184d
Add well-known redirects to htaccess
...
Fixes:
http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-232
http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-445
2012-04-15 17:11:03 +02:00
a0d917fe98
fixing oc-375 - a number is appended tp the filename
2012-04-15 17:00:49 +02:00
dae34edf4f
fix filecache rename hook
2012-04-15 16:06:55 +02:00
7ddd043427
renamed extention to extension, also now only showing lowercase
2012-04-15 13:34:30 +02:00
a6a8e2c553
add public api to get the file id from the cache
2012-04-15 11:44:04 +02:00
c5b8a3eb94
fix installing shipped apps
2012-04-15 11:05:55 +02:00
fd16784bcc
fix bug where users could use wildcards in username to login
...
e.g. user Peter could probably login using username Pet%
fixed same problem in the migration script
2012-04-15 10:30:22 +02:00
f241615693
fix getAppVersion error
2012-04-15 00:05:28 +02:00
ba5e60e2e4
firefighting Robin-breakage
2012-04-14 19:05:01 +02:00
4410f15dd8
don't rely on the old version in info.xml anymore
2012-04-14 19:01:59 +02:00
fbb314ef4b
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-14 18:56:55 +02:00
f16cfbab5e
improved installation instructions
2012-04-14 18:44:32 +02:00
85cb171cb8
improved updater wording
2012-04-14 18:41:09 +02:00
402c6da968
Typo fix (breif->brief)
2012-04-14 18:31:42 +02:00
4976daca7a
Fix default database type string
2012-04-14 18:31:41 +02:00
dec139716e
cache app types in the db
2012-04-14 17:53:02 +02:00
5608867edc
use the correct array indexes...
2012-04-14 17:52:49 +02:00
b1bcc60d83
reuse OC_L10N objects
2012-04-14 16:44:15 +02:00
721311c909
some minor optimizations
2012-04-14 16:29:11 +02:00
926b2b78fe
keep version numbers in their own files for faster reading
2012-04-14 16:29:11 +02:00
bfdbdd9b20
remove outdated file
2012-04-14 16:29:11 +02:00
c069aa62a4
Fix annoying error in log
2012-04-14 12:31:48 +00:00
d8864d4f4b
show error when installing an app has failed
2012-04-14 12:57:10 +02:00
d3bf013761
prevent users with the same name but different casing from being created
2012-04-14 12:57:10 +02:00
137dce87fc
remove outdated code
2012-04-14 11:42:11 +02:00
3babb8c22c
improve flexibility of search providers a bit
2012-04-14 11:29:54 +02:00
d8e54acbf3
test cases for user backends
2012-04-14 10:43:28 +02:00
9ef34cd831
typo
2012-04-13 23:02:42 +02:00
74f0bebfc8
don't fail on missing extension
2012-04-13 23:02:42 +02:00
b9bdad5165
make sure temporary files are being removed, fixes oc-450
2012-04-13 23:02:42 +02:00
e5e7d4a73a
fix merge conflicts
2012-04-13 16:44:31 -04:00
77a9e343aa
Merge branch 'master' into sabredav_1.6
2012-04-13 16:42:10 -04:00
b95f561bf2
file settings: let people set no more than upper boundary for file uploads, but they should can really go up to the limit
2012-04-13 11:25:38 +02:00
1bd27891e2
make upload size settings work probably. do not replace whole .htaccess, only replace what is needed. Consistent, human readable input on admin settings page.
2012-04-13 10:43:44 +02:00
1d8fdf52d5
allow multiply group backends
2012-04-13 01:59:05 +02:00
69d584331d
OC_VCategories: sort categories in natural order using usort
...
Use usort to sort, so that the json encoding is an array.
2012-04-12 23:10:49 +02:00
815649dbd7
Implement default categories in OC_VCategories
2012-04-12 23:10:49 +02:00
b86f2069ff
Fix a session fixation vulnerability
...
- regenerate the session for every successful login
- properly destroy a session
Further information can be found on:
https://en.wikipedia.org/wiki/session_fixation
2012-04-12 19:15:38 +02:00
7e7de25710
UTF8 locale by default
2012-04-12 17:54:20 +02:00
156bdae2fe
Use OC_Helper::serverHost() in OC_Helper::linkToAbsolute()
2012-04-12 17:51:17 +02:00
7b5395675d
Add method OC_Helper::serverHost()
...
This method returns the server host, even if the website uses one or
more reverse proxies.
2012-04-12 17:51:17 +02:00
0466437fa7
tests for oc_filesystem
2012-04-12 15:55:56 +02:00
637db92e60
increase version to show that we are not the same as stable
2012-04-11 09:20:28 +02:00
613e15035e
Merge branch 'master' into sabredav_1.6
2012-04-10 22:44:13 -04:00
17af1ba893
Silence error for missing appinfo info file
2012-04-10 21:04:35 +02:00
8e188cd96f
Copy over all file app data for imported user
2012-04-08 19:16:03 +00:00
e5ebbacc9e
Fix sqlite version detection
2012-04-08 18:52:31 +00:00
5e314e8eff
Emit hooks for user creation
2012-04-07 22:00:32 +00:00
c0869887cf
Return JSON for import and export methods of OC_Migrate
2012-04-07 21:55:16 +00:00
9edf45a324
Merge branch 'master' into migration
2012-04-07 17:31:30 +00:00
d2886f2020
Hide instance import as it eats data
2012-04-07 17:27:09 +00:00
96c99125da
mimetype filter for filepicker
2012-04-05 23:18:44 +02:00
8a2c5dda6d
Merge commit 'refs/merge-requests/102' of git://gitorious.org/owncloud/owncloud into merge-requests/102
2012-04-04 21:36:50 +02:00
acdce2b1e0
Check blacklist before saving to filesystem
2012-04-03 22:31:34 +00:00
ff4b0c4d7f
Move writable check into local filestorage so shared files can be renamed
2012-04-01 13:30:41 -04:00
cce59df2ae
the core apps don't have types
2012-04-01 19:22:23 +02:00
39e8981bc2
oc_db is not pdo
...
also pgsql does not like double quotes
2012-04-01 17:32:13 +02:00
b758725bf7
Try to configure php to enable big file uploads.
...
This doesn´t work always depending on the webserver and php configuration.
Let´s try to overwrite some defaults anyways
2012-04-01 17:02:32 +02:00
6545e48787
Show the different editions to the user. Used in the status call, on the personal settings page and in the updater to update to the next available version from the same edition.
2012-04-01 11:20:12 +02:00
6bb48b2731
Check file handle exists before trying to read file
2012-04-01 02:38:26 -04:00
eba6a65908
try to use transactions to replace db
2012-04-01 00:25:47 +00:00
ffbd72bbcf
Fix user app data export
2012-04-01 00:07:39 +00:00
a248cc73e6
Merge branch 'master' into migration
2012-03-31 23:56:16 +00:00
daf742c086
Fix owncloud log
2012-03-31 23:55:41 +00:00
ce89ff15aa
Remove db tmp file after export creation
2012-03-31 23:20:08 +00:00
f7d8a8c571
Merge branch 'master' into migration
2012-03-31 22:44:50 +00:00
d20eea9761
Use ajax to download file, OC_Dialogs for errors
2012-03-31 22:41:43 +00:00
2f68b08491
fix eventsource for ie
2012-03-31 16:40:42 +02:00
ebc7a6a0a6
dont send to much when scanning large folders
2012-03-31 16:28:22 +02:00
9d2f8aa717
send more progress updates when scanning large folders
2012-03-31 16:24:53 +02:00
b72d7f1ab3
make sure output buffering is dissabled when using eventsource
2012-03-31 16:20:32 +02:00
20fc23c82b
Move logfile determination to init function
2012-03-30 23:41:54 +02:00
3300d6ea53
checkUpgrade has to be after template initialization
...
The error path of checkUpgrade uses the template
2012-03-30 23:41:54 +02:00
a7438189f3
Move more from base init to separate functions
2012-03-30 23:41:53 +02:00
3a4521a012
Add support for logging to syslog
2012-03-30 23:41:53 +02:00
926e777061
filter notice and deprecated errors and write a proper error handler function
2012-03-30 23:37:47 +02:00
65eee1f69d
clean pre-path_hash fscache entries
2012-03-30 19:44:49 +02:00
ef1e359c7c
Merge branch 'master' into sabredav_1.6
2012-03-30 18:48:30 +02:00
7e53d82ff3
Merge branch 'master' into oc_error
2012-03-30 18:43:09 +02:00
7552390031
add path_hash to the filesystem cache
2012-03-30 18:12:33 +02:00
523fdda399
add the option to only load apps of a specific type
2012-03-30 14:39:07 +02:00
a07c6b1a2e
optimizations for loadApps
2012-03-30 14:08:18 +02:00
7bc9fa765c
optimizations for updateApps
2012-03-30 14:08:18 +02:00
90286353e2
Merge branch 'master' into sabredav_1.6
2012-03-29 23:20:03 +02:00
e45e48ff3d
Merge branch 'master' into oc_error
2012-03-29 23:18:47 +02:00
d049d9bd0c
initial commit for OC_Exception
2012-03-29 23:16:19 +02:00
73eca66a89
Fix comments
2012-03-29 10:17:08 +00:00
60ba5508a4
add support for installing apps from a subfolder in the zip/tgz file
2012-03-29 00:11:29 +02:00
d6a9af3138
add support for installing apps from tgz
2012-03-29 00:07:28 +02:00
d8e9db207f
add tempory folder utility to OC_Helper
2012-03-28 23:47:44 +02:00
e5c009599d
remove check for variable which was set one line above - bugfix for oc-324
2012-03-28 16:38:42 +02:00
ef33219e4f
import method returns each apps' import status
2012-03-27 21:21:14 +00:00
31d268fe92
check for sqlite
2012-03-27 20:55:53 +00:00
553f4533c0
look for migrate.php in appinfo folder
2012-03-27 20:45:37 +00:00
b201e51528
Stop error on export
2012-03-27 20:43:44 +00:00
c8acd4a594
Merge branch 'master' into migration
2012-03-27 20:19:38 +00:00
536a3ecb42
Merge branch 'master' into sabredav_1.6
2012-03-27 20:54:16 +02:00
c92fc9bf65
return path of tmp file like filestorage/common does. Fixes broken folder-/multifile-download.
2012-03-27 02:24:52 +02:00
24bc639222
Do not use always the same name for download-zip to avoid collisions.
2012-03-27 01:19:34 +02:00
bcef775d6b
Overwrite Download-ZIP if it already exists. We do not want to show alien content.
2012-03-27 01:18:38 +02:00
266699ddf9
fix square images not getting proper thumbnails
2012-03-27 00:42:15 +02:00
73c6db5c8e
crop and resize in a single step when creating thumbnail
...
also so more explicit memory cleanup
2012-03-26 23:53:48 +02:00
0ba9332358
some more memory cleanup in OC_Image
2012-03-26 22:33:37 +02:00
0c19e44a61
some more memory cleanup in OC_Image
2012-03-26 22:28:51 +02:00
ac0c5ba6da
Merge branch 'master' into sabredav_1.6
2012-03-25 14:02:40 +02:00
d139e3c3cd
Move Google Docs storage backend to files_remote app
2012-03-24 15:28:05 -04:00
26fcb35a89
Implement fopen() for Google Docs storage backend
2012-03-24 14:50:17 -04:00
109d806617
make sure we can load OC_Config when we need it
2012-03-23 18:55:26 +01:00
7cad6ccce0
don´t show ugly error message
2012-03-23 16:48:16 +01:00
a191b75c31
make it possible to connect to other ocs appstores and other ocs knowledgebase servers.
...
also make it possible to switch the app store and the knowledgebase off completely.
2012-03-23 15:52:41 +01:00
7ed8f39744
as preperation for the sgf viewer app i added a file icon for .sgf files (saved go games), and an according mimetype.
2012-03-23 13:34:07 +01:00
8e8c4a8edc
Merge branch 'master' into sabredav_1.6
2012-03-22 20:40:04 +01:00
892343c7c1
Fix instance import
2012-03-21 16:30:59 +00:00
7c815054c7
Config file is more appropriate here
...
adjust default value
2012-03-21 13:05:15 +01:00
8f8d486f35
Merge branch 'master' into sabredav_1.6
2012-03-21 09:42:53 +01:00
0fa5e196ef
Try to use old uid when importing
2012-03-20 20:32:01 +00:00
514c9ad8e7
Added unified import method.
2012-03-20 20:19:21 +00:00
89c39b47bc
add microsoft office mimetypes to the fixlist - bugfix for oc-357
2012-03-20 18:46:56 +01:00
632b3cbbbb
Cleanup the template code for redundant code
2012-03-19 21:56:55 +01:00
3d8a09b147
Split the init function in lib/base.php a bit
2012-03-19 21:56:55 +01:00
145d6f3566
Add OC_Migration_Content class to help app devs. Restructure OC_Migrate.
2012-03-19 20:44:20 +00:00
fa104fee17
fix mimetype detection
2012-03-19 12:42:33 +01:00
b13ab2b17e
enable admin to turn off ZIP downloads
...
user interface offers multi-file/folder downloads only if available
make function name more clear
2012-03-19 11:56:02 +01:00
33b06c4484
Merge branch 'master' into sabredav_1.6
2012-03-19 08:33:36 +01:00
77f6872ea4
Shorten export zip names
2012-03-17 17:45:39 +00:00
bc085c3ff4
Create new user, create new data dir, copy files, import app data
2012-03-17 16:25:14 +00:00
Georg Ehrke
Robin Appelman
Michael Gapczynski
Sam Tuke
Frank Karlitschek
Bart Visscher
Brice Maron
Florian Hülsmann
Michiel de Jong
Arthur Schiwon
Thomas Mueller
Thomas Tanghus
Tom Needham
Sam Tuke
Philipp Roggan
Daniel
Jernej Virag
Marvin Thomas Rabe
Frank Karlitschek
Frank Karlitschek
Jan-Christoph Borchardt
Bartek Przybylski
Florian Preinstorfer
Grundik
Daniele E. Domenichelli
Nils Jansen