Michael Gapczynski
60feaf9abf
Merge branch 'master' into share_expiration
...
Conflicts:
core/js/share.js
lib/util.php
2012-09-12 01:06:57 -04:00
Michael Gapczynski
8f0354bcdd
Temporarily disable sharing with contacts and emails, will come in next release
2012-09-12 01:02:08 -04:00
Michael Gapczynski
b194ac3dde
Add expiration column to share table and bump version number
2012-09-12 01:01:45 -04:00
Jenkins for ownCloud
8c9c095d48
[tx-robot] updated from transifex
2012-09-12 02:02:58 +02:00
Thomas Mueller
5c1a79210f
added hint to restart the web server in case recetly installed php modules are still not available
2012-09-11 23:51:12 +02:00
Jörn Friedrich Dreyer
b6a106a920
allow using only dbname for oracle
2012-09-11 18:12:38 +02:00
Jörn Friedrich Dreyer
bf2d1e78f2
don't set values with oc_appconfig when oc is not installed yet, allows to render guest page for installation again
2012-09-11 13:16:34 +02:00
Michael Gapczynski
37f0b85d3f
Fix problem with non share collection item types being treated as collections
2012-09-11 00:37:31 -04:00
Jenkins for ownCloud
6a29bbda7a
[tx-robot] updated from transifex
2012-09-11 02:03:53 +02:00
Georg Ehrke
463b48b2e1
fix file upload
2012-09-10 14:41:27 +02:00
Jörn Friedrich Dreyer
86c3f9b8fe
Merge branch 'master' of github.com:owncloud/core
2012-09-10 14:14:49 +02:00
Jörn Friedrich Dreyer
db7a18455f
use tabs for indentation
2012-09-10 14:14:36 +02:00
Thomas Müller
5a65c5a46c
Respect coding style
2012-09-10 14:59:08 +03:00
Thomas Müller
0444877218
Respect coding style
2012-09-10 12:35:15 +03:00
Thomas Müller
c6cd1b77d3
Respect coding style
2012-09-10 12:32:49 +03:00
Thomas Müller
5721bd2786
Respect coding style
2012-09-10 12:31:57 +03:00
Thomas Müller
1a10955644
Respect coding style
2012-09-10 12:29:35 +03:00
Thomas Müller
2271a97992
Respect coding style
2012-09-10 12:28:09 +03:00
Thomas Müller
9a2bc5255b
Respect coding style
2012-09-10 12:26:20 +03:00
Thomas Müller
23f348c99f
Respect coding style
2012-09-10 12:25:42 +03:00
Thomas Müller
87e1a27fde
Respect coding style
2012-09-10 12:23:55 +03:00
Thomas Müller
f34588d1ff
Respect coding style
2012-09-10 12:21:54 +03:00
Michael Gapczynski
6c17a4cb77
Don't display actions for children in shared collections, show the parent collection the child is shared in
2012-09-09 14:44:08 -04:00
Michael Gapczynski
13d513c17c
Fix shared collection item searching
2012-09-09 11:50:12 -04:00
Michael Gapczynski
3e7951e1e6
Normalize the file path for shared children as a precaution
2012-09-08 23:42:24 -04:00
Michael Gapczynski
fe7f095b08
Insert id for unique user group share rows
2012-09-08 23:09:58 -04:00
Michael Gapczynski
b163bd514f
Fix fetching shared children items, fixes problem with displaying owner of a shared file inside a shared folder
2012-09-08 23:09:57 -04:00
Michael Gapczynski
f23f719d99
Fix unsharing from self for group shares and add test for it
2012-09-08 20:15:47 -04:00
Jenkins for ownCloud
5e790368bc
[tx-robot] updated from transifex
2012-09-09 02:03:35 +02:00
Robin Appelman
46422e6dbe
don't use regular expresions for a simple string replace
2012-09-08 23:40:23 +02:00
Robin Appelman
697061fa9f
add OC_Image::fitIn
2012-09-08 23:26:19 +02:00
Thomas Tanghus
abc930c57c
Suppress error message which would send headers for hosted sited where disk_free_space() has been disabled for security.
2012-09-08 17:58:59 +02:00
Georg Ehrke
2b42893fa9
style fixes for public util api
2012-09-08 16:18:47 +02:00
Georg Ehrke
89f3afe2fe
style fixes for public user api
2012-09-08 16:17:01 +02:00
Georg Ehrke
439ede2a1d
style fixes for public response api
2012-09-08 16:15:42 +02:00
Georg Ehrke
a16565a7fa
style fixes for public json api
2012-09-08 16:14:06 +02:00
Georg Ehrke
89e5b85fa7
style fixes for public files api
2012-09-08 16:02:11 +02:00
Georg Ehrke
6b2b8b10ee
style fixes for public db api
2012-09-08 16:00:32 +02:00
Georg Ehrke
221257d2fb
style fixes for public config api
2012-09-08 15:58:28 +02:00
Georg Ehrke
eca24f74f7
style fixes for public app api
2012-09-08 15:54:30 +02:00
Georg Ehrke
c692dfc1ab
style fixes for public app api
2012-09-08 15:52:29 +02:00
Jenkins for ownCloud
d5d2e89622
[tx-robot] updated from transifex
2012-09-08 02:05:41 +02:00
Bart Visscher
edcd297476
Move handling of core remotes to OC_TemplateLayout
2012-09-07 16:42:46 +02:00
Bart Visscher
631df21de6
Prevent loading all apps twice from overwriting the core scripts and styles
2012-09-07 16:20:13 +02:00
Bart Visscher
ceec5e593c
Remove redundant loadApps
2012-09-07 16:19:08 +02:00
Bart Visscher
5eba579827
Merge branch 'master' into routing
...
Conflicts:
apps/files/js/fileactions.js
lib/base.php
lib/helper.php
lib/ocs.php
2012-09-07 15:51:44 +02:00
Thomas Mueller
3829460ab8
adding space between) and {
2012-09-07 15:22:01 +02:00
Bart Visscher
285c198c36
EOL fixes
...
apps/files_external/lib/config.php
apps/files_versions/lib/versions.php
lib/connector/sabre/client.php
2012-09-07 14:10:00 +02:00
Bart Visscher
5e55b4d6e7
Whitespace fixes in lib
2012-09-07 14:08:29 +02:00
Bart Visscher
386d1ac49f
Fix setEtagHeader function
2012-09-07 13:42:22 +02:00
Bart Visscher
cd4b8dbacd
Change caching checks for minimized files
...
Only use a ETag, but include last modified time into this
Also added the filesize to this. And used the ETag for the
internal cache.
2012-09-07 13:42:22 +02:00
Bart Visscher
ff42da58b9
Global file cache should also be able to clear with prefix
2012-09-07 13:42:22 +02:00
Bart Visscher
9ea7817a40
Remove core.{css,js} cache on upgrade
2012-09-07 13:42:22 +02:00
Michael Gapczynski
73d726d1b2
Support for unshare from self, with a bunch of temporary fixes to overcome configuration problems with file actions
2012-09-07 00:02:22 -04:00
Jenkins for ownCloud
a94b56b57b
[tx-robot] updated from transifex
2012-09-07 02:07:22 +02:00
Frank Karlitschek
294cff27a7
add check for zlib
2012-09-07 01:39:11 +02:00
Robin Appelman
d4fd47d43f
clear user filecache after the user mount configuration has changed
2012-09-06 23:14:43 +02:00
Robin Appelman
2144b2f37a
clear the filecache if the mount configuration has changed
2012-09-06 23:10:33 +02:00
Bart Visscher
39577495e1
Add a directory separator to filter app directories with the same
...
prefix.
Fixes: oc-1663
2012-09-06 22:27:56 +02:00
Michael Gapczynski
837eb1871d
Don't delete the file anymore to replace it in the UI, just overwrite it
2012-09-05 22:13:50 -04:00
Jenkins for ownCloud
af3e767489
[tx-robot] updated from transifex
2012-09-06 02:06:37 +02:00
Thomas Mueller
ebb28412ca
no more require_once()
2012-09-05 23:28:59 +02:00
Thomas Müller
24977d0fd0
Respect coding style
2012-09-05 15:49:42 +03:00
Thomas Müller
e5cb638c09
Respect coding style
2012-09-05 15:42:06 +03:00
Thomas Müller
d5fd5cd584
Respect coding style
2012-09-05 15:40:21 +03:00
Tom Needham
28a11959d7
API: Fix /person/check api method
2012-09-05 12:32:54 +00:00
Thomas Müller
9eccc0121a
Respect coding style
2012-09-05 13:22:38 +03:00
Tom Needham
470b87f625
Fix ocs/person/check
2012-09-05 09:07:15 +00:00
Jenkins for ownCloud
e8fcc71129
[tx-robot] updated from transifex
2012-09-05 02:05:39 +02:00
Thomas Mueller
1e2d582123
fixing button to add additional site
2012-09-04 23:42:49 +02:00
Bart Visscher
41f135daee
Remove () from return statement
2012-09-04 21:27:36 +02:00
Thomas Müller
69ee842521
Fixing: http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-1617
2012-09-04 17:13:34 +03:00
Tom Needham
4224eb8831
API: remove OAuth auth check, respond in ocs formatted xml/json
2012-09-04 13:50:56 +00:00
Thomas Müller
7901fc33a8
fixing syntax error
2012-09-04 15:54:38 +03:00
Thomas Müller
aff08925c1
fixing syntax error - sorry for that
2012-09-04 15:46:43 +03:00
Thomas Müller
2028500c0a
fixing syntax error - sorry for that
2012-09-04 15:42:58 +03:00
Thomas Müller
e4e0b5a822
Respect coding style
2012-09-04 15:34:09 +03:00
Thomas Müller
d14f8fa681
Respect coding style
2012-09-04 15:21:52 +03:00
Tom Needham
37bb16becb
API: Add callback_fail, add OC_OAuth::init and bespoke request token method
2012-09-04 11:10:42 +00:00
Thomas Müller
9760b5e153
Respect coding style
2012-09-04 13:32:27 +03:00
Jenkins for ownCloud
b867b738e8
[tx-robot] updated from transifex
2012-09-04 02:03:21 +02:00
Bart Visscher
5153b8b293
Add url-params to url with new parameter in linkTo function
2012-09-03 21:51:32 +02:00
Bart Visscher
1a46192433
Add args parameter to linkTo(Absolute) function, to append the args automaticly
2012-09-03 21:51:32 +02:00
Frank Karlitschek
bb65e173d4
4.5 beta 2
2012-09-03 20:38:50 +02:00
Jenkins for ownCloud
d386e0172a
[tx-robot] updated from transifex
2012-09-03 02:07:40 +02:00
Michael Gapczynski
4c065deb55
Listen to post_deleteGroup hook in Share API
2012-09-02 20:01:09 -04:00
Michael Gapczynski
dc569ea300
Fix some warnings from Jenkins in the Share API
2012-09-02 19:30:01 -04:00
Michael Gapczynski
db37a454b3
Add parameter documentation
2012-09-02 18:29:55 -04:00
Michael Gapczynski
f0f2d93908
Restructure generateTarget for the post_addToGroup hook
2012-09-02 18:23:19 -04:00
Michael Gapczynski
a77c16371f
Make item targets be based off of the parent item target for reshares
2012-09-02 18:23:19 -04:00
Thomas Mueller
5f2751c672
in some cases no translations are loaded because $this->lang is empty not null
2012-09-02 14:15:03 +02:00
Robin Appelman
3c784ede83
use str_ireplace instead of duplicate str_replace
2012-09-02 13:58:01 +02:00
Jenkins for ownCloud
2bb7cb9f64
[tx-robot] updated from transifex
2012-09-02 02:02:53 +02:00
Michael Gapczynski
6c29334b48
Add support for share expiration
2012-09-01 18:53:48 -04:00
Robin Appelman
2508f64efe
set debug mode if an xdebug session is active
2012-09-01 20:52:13 +02:00
Jörn Friedrich Dreyer
2c1f732880
use null instead of -1 on all getUser()
2012-09-01 20:50:03 +02:00
Robin Appelman
828ca2ba36
translate UNIX_TIMESTAMP() into sqlite and pgsql equivilents
2012-09-01 20:38:14 +02:00
Robin Appelman
6d48f3fab8
we still need this for pgsql
2012-09-01 16:49:29 +02:00
Robin Appelman
a7255181ad
fix autoloader throwing errors for non-oc classes
2012-09-01 15:36:52 +02:00
Jenkins for ownCloud
c0c48cb3ee
[tx-robot] updated from transifex
2012-09-01 13:37:28 +02:00
Robin Appelman
3dacf149de
allow configuring user backends in config.php
2012-09-01 02:50:27 +02:00
Robin Appelman
f67aef608f
load authentication apps on login
2012-09-01 02:50:27 +02:00
Robin Appelman
ebd813ae95
don't throw errors in the autoloader when a class doesn't exist
2012-09-01 02:50:27 +02:00
Jenkins for ownCloud
ab090d5277
[tx-robot] updated from transifex
2012-09-01 02:04:00 +02:00
Michael Gapczynski
efa0478d2d
Remove share permission for encrypted files
2012-08-31 17:31:28 -04:00
Frank Karlitschek
72e80bf6bd
send the current owncloud version to the ocs server so that we can filter for compatible apps
2012-08-31 20:22:03 +02:00
Thomas Mueller
6f8efcfe61
l18n support lib/updater.php
2012-08-31 10:51:35 +02:00
Thomas Mueller
bd809574dc
fix translations within subfolder /lib
2012-08-31 00:43:50 +02:00
Thomas Mueller
58b1e841f1
fix translations within subfolder /lib
2012-08-30 23:51:44 +02:00
Robin Appelman
b5234a4f34
allow html inside app descriptions
2012-08-30 22:17:54 +02:00
Bart Visscher
b483f2aab8
Merge branch 'master' into routing
...
Conflicts:
apps/contacts/js/contacts.js
apps/contacts/lib/search.php
apps/files_archive/js/archive.js
apps/gallery/lib/tiles.php
apps/gallery/templates/index.php
lib/ocs.php
2012-08-30 21:49:28 +02:00
Tom Needham
67c2d56be8
Add ownCloud OAuth store backend. WIP
2012-08-30 14:02:31 +00:00
Tom Needham
0d1d2c0b61
Fix class name
2012-08-30 14:01:27 +00:00
Bart Visscher
598815b21e
More info about not compatible apps (app id)
2012-08-29 22:38:06 +02:00
Bart Visscher
c958d5ba80
Fix filesystem setup for shared public link with logged in user
2012-08-29 21:35:55 +02:00
Michael Gapczynski
301baf0215
$storage shouldn't be static in OC_Cache_File
2012-08-29 14:42:40 -04:00
Michael Gapczynski
8d490b9880
Fix shared storage working with user backend defined data directories
2012-08-29 14:39:13 -04:00
Bart Visscher
db18218a1b
Space before tab fixes
2012-08-29 20:34:44 +02:00
Bart Visscher
9e32e07306
Fix OC_Cache_File
2012-08-29 20:29:43 +02:00
Bart Visscher
0365f8fd01
Remove php close at end of file
2012-08-29 20:29:43 +02:00
Bart Visscher
52f2e7112e
Whitespace fixes in lib
2012-08-29 20:28:45 +02:00
Bart Visscher
cbaf858dea
Merge remote-tracking branch 'gitorious/master' into routing
...
Conflicts:
apps/files/js/fileactions.js
apps/files_archive/js/archive.js
2012-08-29 20:16:39 +02:00
Michael Gapczynski
26501a0bc8
Delete old link if user sets a password
2012-08-29 14:06:55 -04:00
Michael Gapczynski
e5cbc532c3
Fix password authentication for links and fix template problems for links by creating a new base layout
2012-08-29 11:54:49 -04:00
Thomas Mueller
d786194ddc
fixing: apps/files/ajax/scan.php
2012-08-29 01:39:42 +02:00
Bart Visscher
32721e7b07
Remember storage view in OC_Cache_File
2012-08-28 23:10:32 +02:00
Bart Visscher
53e51fe46b
Clean user cache on login
2012-08-28 23:07:28 +02:00
Bart Visscher
8a02a8852f
Add background job for global file cache cleanup
2012-08-28 23:07:28 +02:00
Michael Gapczynski
ff076caeee
Check usernames in the database as case insensitive, they are still stored case sensitive. Bug fix for oc-422 and oc-1514
2012-08-28 11:28:38 -04:00
Michael Gapczynski
fd2ca21fc2
Allow share_with column to be null for links
2012-08-28 09:51:00 -04:00
Frank Karlitschek
70b71338cd
beta 1
2012-08-28 07:22:31 +02:00
Michael Gapczynski
9cd55508c3
Add Share API settings to admin page
2012-08-27 20:39:31 -04:00
Michael Gapczynski
0ad16e84c5
Fix share collection query
2012-08-27 20:37:38 -04:00
Michael Gapczynski
0a9d1ed3a6
Initial previewer for public links
2012-08-27 20:37:38 -04:00
Jörn Friedrich Dreyer
3b83c7fa74
update now(), current_timestamp and backtick replacement
2012-08-27 18:37:16 +02:00
Bjoern Schiessle
2e796b563f
urldecode private- and public-key
2012-08-27 17:51:02 +02:00
Georg Ehrke
ead7de6bff
only mount every single homefolder when using sharing app
2012-08-27 16:10:37 +02:00
Georg Ehrke
b56a46bdea
fix filesharing for multiple data directories
2012-08-27 15:55:46 +02:00
Arthur Schiwon
0f379fd28a
OC_User: getHome is an optional method, taking it out of the Interface
2012-08-27 14:07:28 +02:00
Jörn Friedrich Dreyer
3970d0e636
Merge branch 'master' of github.com:owncloud/core
2012-08-27 14:00:17 +02:00
Jörn Friedrich Dreyer
15cdde74d3
return standard SQL values (sqlite3 understands CURRENT_...)
2012-08-27 13:33:24 +02:00
Georg Ehrke
16aff1045d
make use of OC_User::getHome in lib/migrate.php
2012-08-27 13:21:40 +02:00
Michael Gapczynski
18517f6adb
Fix share getItems() limit
2012-08-26 21:34:37 -04:00
Georg Ehrke
cd5c217c0d
use OC_User::getHome in lib/filesystem.php
2012-08-26 22:24:08 +02:00
Georg Ehrke
045c94ec3e
enable user backends to define their own place where to store the data
2012-08-26 22:04:31 +02:00
Georg Ehrke
5586054961
fix c&p fail from earlier commit today
2012-08-26 22:04:31 +02:00
Georg Ehrke
44f5033e29
Merge branch 'master' of github.com:owncloud/core
2012-08-26 16:30:30 +02:00
Georg Ehrke
8c8496aff9
don't allow group admins to change admin's accounts
2012-08-26 16:29:10 +02:00
Georg Ehrke
5a4854079f
implement getHome in OC_User
2012-08-26 16:24:25 +02:00
Jörn Friedrich Dreyer
39a9a4e73e
Merge branch 'master' of github.com:owncloud/core
2012-08-26 15:05:28 +02:00
jfd
9822cd30c0
fix sharing bug introduced with oracle support
2012-08-26 14:57:33 +02:00
Jenkins for ownCloud
bae07faa34
[tx-robot] updated from transifex
2012-08-26 01:20:16 +02:00
Jörn Friedrich Dreyer
4f5eff2b6f
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
2012-08-25 03:14:26 +02:00
jfd
1bfe26bb09
remove superflous LIMIT
2012-08-25 02:26:50 +02:00
jfd
379f27ed03
fix missing $
2012-08-25 02:17:44 +02:00
jfd
bc90a34b07
remove duplicate method
2012-08-25 02:13:32 +02:00
Jenkins for ownCloud
f57d527a7c
[tx-robot] updated from transifex
2012-08-25 02:08:36 +02:00
Jörn Friedrich Dreyer
fa3497f6ed
add backticks to SQL, use limit parameter instead of LIMIT SQL
2012-08-25 01:52:27 +02:00
Jörn Friedrich Dreyer
fd5af9aff4
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
2012-08-25 00:06:20 +02:00
Jörn Friedrich Dreyer
c8255a170c
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
...
Conflicts:
3rdparty/Sabre/CardDAV/Plugin.php
3rdparty/smb4php/smb.php
apps/bookmarks/ajax/addBookmark.php
apps/bookmarks/ajax/editBookmark.php
apps/bookmarks/appinfo/migrate.php
apps/calendar/ajax/calendar/edit.form.php
apps/calendar/ajax/changeview.php
apps/calendar/ajax/import/import.php
apps/calendar/ajax/settings/guesstimezone.php
apps/calendar/ajax/settings/setfirstday.php
apps/calendar/ajax/settings/settimeformat.php
apps/calendar/ajax/share/changepermission.php
apps/calendar/ajax/share/share.php
apps/calendar/ajax/share/unshare.php
apps/calendar/appinfo/app.php
apps/calendar/appinfo/remote.php
apps/calendar/appinfo/update.php
apps/calendar/appinfo/version
apps/calendar/js/calendar.js
apps/calendar/l10n/da.php
apps/calendar/l10n/de.php
apps/calendar/l10n/fi_FI.php
apps/calendar/l10n/gl.php
apps/calendar/l10n/he.php
apps/calendar/l10n/hr.php
apps/calendar/l10n/ja_JP.php
apps/calendar/l10n/lb.php
apps/calendar/l10n/lt_LT.php
apps/calendar/l10n/nb_NO.php
apps/calendar/l10n/pl.php
apps/calendar/l10n/pt_PT.php
apps/calendar/l10n/ro.php
apps/calendar/l10n/ru.php
apps/calendar/l10n/sv.php
apps/calendar/l10n/zh_CN.php
apps/calendar/l10n/zh_TW.php
apps/calendar/lib/app.php
apps/calendar/lib/calendar.php
apps/calendar/lib/object.php
apps/calendar/lib/share.php
apps/calendar/templates/part.choosecalendar.rowfields.php
apps/calendar/templates/part.import.php
apps/calendar/templates/settings.php
apps/contacts/ajax/activation.php
apps/contacts/ajax/addressbook/delete.php
apps/contacts/ajax/contact/add.php
apps/contacts/ajax/contact/addproperty.php
apps/contacts/ajax/contact/delete.php
apps/contacts/ajax/contact/deleteproperty.php
apps/contacts/ajax/contact/saveproperty.php
apps/contacts/ajax/createaddressbook.php
apps/contacts/ajax/cropphoto.php
apps/contacts/ajax/currentphoto.php
apps/contacts/ajax/importaddressbook.php
apps/contacts/ajax/oc_photo.php
apps/contacts/ajax/savecrop.php
apps/contacts/ajax/selectaddressbook.php
apps/contacts/ajax/updateaddressbook.php
apps/contacts/ajax/uploadimport.php
apps/contacts/ajax/uploadphoto.php
apps/contacts/appinfo/migrate.php
apps/contacts/appinfo/remote.php
apps/contacts/css/contacts.css
apps/contacts/import.php
apps/contacts/index.php
apps/contacts/js/contacts.js
apps/contacts/l10n/ca.php
apps/contacts/l10n/cs_CZ.php
apps/contacts/l10n/da.php
apps/contacts/l10n/de.php
apps/contacts/l10n/el.php
apps/contacts/l10n/eo.php
apps/contacts/l10n/es.php
apps/contacts/l10n/et_EE.php
apps/contacts/l10n/eu.php
apps/contacts/l10n/fa.php
apps/contacts/l10n/fi_FI.php
apps/contacts/l10n/fr.php
apps/contacts/l10n/he.php
apps/contacts/l10n/hr.php
apps/contacts/l10n/hu_HU.php
apps/contacts/l10n/ia.php
apps/contacts/l10n/it.php
apps/contacts/l10n/ja_JP.php
apps/contacts/l10n/ko.php
apps/contacts/l10n/lb.php
apps/contacts/l10n/mk.php
apps/contacts/l10n/nb_NO.php
apps/contacts/l10n/nl.php
apps/contacts/l10n/pl.php
apps/contacts/l10n/pt_BR.php
apps/contacts/l10n/pt_PT.php
apps/contacts/l10n/ro.php
apps/contacts/l10n/ru.php
apps/contacts/l10n/sk_SK.php
apps/contacts/l10n/sl.php
apps/contacts/l10n/sv.php
apps/contacts/l10n/th_TH.php
apps/contacts/l10n/tr.php
apps/contacts/l10n/zh_CN.php
apps/contacts/l10n/zh_TW.php
apps/contacts/lib/addressbook.php
apps/contacts/lib/hooks.php
apps/contacts/lib/vcard.php
apps/contacts/photo.php
apps/contacts/templates/part.contact.php
apps/contacts/templates/part.contacts.php
apps/contacts/templates/part.cropphoto.php
apps/contacts/templates/part.importaddressbook.php
apps/contacts/templates/part.selectaddressbook.php
apps/contacts/thumbnail.php
apps/files/ajax/download.php
apps/files/ajax/newfile.php
apps/files/ajax/timezone.php
apps/files/appinfo/update.php
apps/files/appinfo/version
apps/files/index.php
apps/files/js/fileactions.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files/l10n/ar.php
apps/files/l10n/bg_BG.php
apps/files/l10n/ca.php
apps/files/l10n/cs_CZ.php
apps/files/l10n/da.php
apps/files/l10n/de.php
apps/files/l10n/el.php
apps/files/l10n/eo.php
apps/files/l10n/es.php
apps/files/l10n/et_EE.php
apps/files/l10n/eu.php
apps/files/l10n/fa.php
apps/files/l10n/fi_FI.php
apps/files/l10n/fr.php
apps/files/l10n/gl.php
apps/files/l10n/he.php
apps/files/l10n/hr.php
apps/files/l10n/hu_HU.php
apps/files/l10n/ia.php
apps/files/l10n/id.php
apps/files/l10n/it.php
apps/files/l10n/ja_JP.php
apps/files/l10n/ko.php
apps/files/l10n/lb.php
apps/files/l10n/lt_LT.php
apps/files/l10n/mk.php
apps/files/l10n/ms_MY.php
apps/files/l10n/nb_NO.php
apps/files/l10n/nl.php
apps/files/l10n/nn_NO.php
apps/files/l10n/pl.php
apps/files/l10n/pt_BR.php
apps/files/l10n/pt_PT.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/sk_SK.php
apps/files/l10n/sl.php
apps/files/l10n/sr.php
apps/files/l10n/sr@latin.php
apps/files/l10n/sv.php
apps/files/l10n/th_TH.php
apps/files/l10n/tr.php
apps/files/l10n/uk.php
apps/files/l10n/zh_CN.php
apps/files/l10n/zh_TW.php
apps/files_archive/js/archive.js
apps/files_encryption/lib/cryptstream.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/tests/proxy.php
apps/files_external/appinfo/app.php
apps/files_external/lib/smb.php
apps/files_external/lib/streamwrapper.php
apps/files_external/tests/config.php
apps/files_external/tests/smb.php
apps/files_sharing/ajax/email.php
apps/files_sharing/ajax/getitem.php
apps/files_sharing/ajax/setpermissions.php
apps/files_sharing/ajax/share.php
apps/files_sharing/ajax/toggleresharing.php
apps/files_sharing/ajax/unshare.php
apps/files_sharing/ajax/userautocomplete.php
apps/files_sharing/js/settings.js
apps/files_sharing/js/share.js
apps/files_sharing/lib_share.php
apps/files_sharing/settings.php
apps/files_sharing/sharedstorage.php
apps/files_sharing/templates/settings.php
apps/files_versions/ajax/rollbackVersion.php
apps/files_versions/versions.php
apps/gallery/ajax/thumbnail.php
apps/gallery/appinfo/app.php
apps/gallery/appinfo/update.php
apps/gallery/appinfo/version
apps/gallery/css/styles.css
apps/gallery/index.php
apps/gallery/js/pictures.js
apps/gallery/l10n/ca.php
apps/gallery/l10n/cs_CZ.php
apps/gallery/l10n/de.php
apps/gallery/l10n/el.php
apps/gallery/l10n/es.php
apps/gallery/l10n/fi_FI.php
apps/gallery/l10n/fr.php
apps/gallery/l10n/it.php
apps/gallery/l10n/pl.php
apps/gallery/l10n/pt_PT.php
apps/gallery/l10n/ru.php
apps/gallery/l10n/sl.php
apps/gallery/l10n/sv.php
apps/gallery/l10n/th_TH.php
apps/gallery/l10n/tr.php
apps/gallery/l10n/zh_CN.php
apps/gallery/lib/album.php
apps/gallery/lib/hooks_handlers.php
apps/gallery/lib/managers.php
apps/gallery/lib/photo.php
apps/gallery/lib/tiles.php
apps/gallery/lib/tiles_test.php
apps/gallery/templates/index.php
apps/media/lib_ampache.php
apps/media/lib_collection.php
apps/media/lib_media.php
apps/remoteStorage/lib_remoteStorage.php
apps/tasks/ajax/addtaskform.php
apps/tasks/ajax/edittask.php
apps/user_ldap/appinfo/update.php
apps/user_ldap/group_ldap.php
apps/user_ldap/lib_ldap.php
apps/user_ldap/settings.php
apps/user_ldap/templates/settings.php
apps/user_ldap/user_ldap.php
apps/user_migrate/appinfo/app.php
apps/user_migrate/templates/settings.php
apps/user_webfinger/host-meta.php
config/config.sample.php
core/js/js.js
core/l10n/da.php
core/l10n/de.php
core/l10n/fi_FI.php
core/l10n/gl.php
core/l10n/he.php
core/l10n/hr.php
core/l10n/id.php
core/l10n/ja_JP.php
core/l10n/lb.php
core/l10n/lt_LT.php
core/l10n/nb_NO.php
core/l10n/pl.php
core/l10n/pt_PT.php
core/l10n/ro.php
core/l10n/ru.php
core/l10n/sv.php
core/lostpassword/index.php
core/templates/layout.user.php
core/templates/login.php
db_structure.xml
index.php
l10n/af/calendar.po
l10n/af/contacts.po
l10n/af/core.po
l10n/af/files.po
l10n/af/settings.po
l10n/ar/calendar.po
l10n/ar/contacts.po
l10n/ar/core.po
l10n/ar/files.po
l10n/ar/media.po
l10n/ar/settings.po
l10n/bg_BG/calendar.po
l10n/bg_BG/contacts.po
l10n/bg_BG/core.po
l10n/bg_BG/files.po
l10n/bg_BG/media.po
l10n/bg_BG/settings.po
l10n/ca/calendar.po
l10n/ca/contacts.po
l10n/ca/core.po
l10n/ca/files.po
l10n/ca/gallery.po
l10n/ca/settings.po
l10n/cs_CZ/calendar.po
l10n/cs_CZ/contacts.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/cs_CZ/gallery.po
l10n/cs_CZ/settings.po
l10n/da/calendar.po
l10n/da/contacts.po
l10n/da/core.po
l10n/da/files.po
l10n/da/settings.po
l10n/de/calendar.po
l10n/de/contacts.po
l10n/de/core.po
l10n/de/files.po
l10n/de/gallery.po
l10n/de/settings.po
l10n/el/calendar.po
l10n/el/contacts.po
l10n/el/core.po
l10n/el/files.po
l10n/el/gallery.po
l10n/el/settings.po
l10n/eo/calendar.po
l10n/eo/contacts.po
l10n/eo/core.po
l10n/eo/files.po
l10n/eo/media.po
l10n/eo/settings.po
l10n/es/calendar.po
l10n/es/contacts.po
l10n/es/core.po
l10n/es/files.po
l10n/es/gallery.po
l10n/es/settings.po
l10n/et_EE/calendar.po
l10n/et_EE/contacts.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/settings.po
l10n/eu/calendar.po
l10n/eu/contacts.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/settings.po
l10n/fa/calendar.po
l10n/fa/contacts.po
l10n/fa/core.po
l10n/fa/files.po
l10n/fa/settings.po
l10n/fi_FI/calendar.po
l10n/fi_FI/contacts.po
l10n/fi_FI/core.po
l10n/fi_FI/files.po
l10n/fi_FI/gallery.po
l10n/fi_FI/settings.po
l10n/fr/calendar.po
l10n/fr/contacts.po
l10n/fr/core.po
l10n/fr/files.po
l10n/fr/gallery.po
l10n/fr/media.po
l10n/fr/settings.po
l10n/gl/calendar.po
l10n/gl/contacts.po
l10n/gl/core.po
l10n/gl/files.po
l10n/gl/settings.po
l10n/he/calendar.po
l10n/he/contacts.po
l10n/he/core.po
l10n/he/files.po
l10n/he/settings.po
l10n/hr/calendar.po
l10n/hr/contacts.po
l10n/hr/core.po
l10n/hr/files.po
l10n/hr/settings.po
l10n/hu_HU/calendar.po
l10n/hu_HU/contacts.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/settings.po
l10n/hy/calendar.po
l10n/hy/contacts.po
l10n/hy/core.po
l10n/hy/files.po
l10n/hy/settings.po
l10n/ia/calendar.po
l10n/ia/contacts.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/settings.po
l10n/id/calendar.po
l10n/id/contacts.po
l10n/id/core.po
l10n/id/files.po
l10n/id/settings.po
l10n/it/calendar.po
l10n/it/contacts.po
l10n/it/core.po
l10n/it/files.po
l10n/it/gallery.po
l10n/it/settings.po
l10n/ja_JP/calendar.po
l10n/ja_JP/contacts.po
l10n/ja_JP/core.po
l10n/ja_JP/files.po
l10n/ja_JP/settings.po
l10n/ko/calendar.po
l10n/ko/contacts.po
l10n/ko/core.po
l10n/ko/files.po
l10n/ko/settings.po
l10n/lb/calendar.po
l10n/lb/contacts.po
l10n/lb/core.po
l10n/lb/files.po
l10n/lb/settings.po
l10n/lt_LT/calendar.po
l10n/lt_LT/contacts.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lt_LT/settings.po
l10n/mk/calendar.po
l10n/mk/contacts.po
l10n/mk/core.po
l10n/mk/files.po
l10n/mk/settings.po
l10n/ms_MY/calendar.po
l10n/ms_MY/contacts.po
l10n/ms_MY/core.po
l10n/ms_MY/files.po
l10n/ms_MY/settings.po
l10n/nb_NO/calendar.po
l10n/nb_NO/contacts.po
l10n/nb_NO/core.po
l10n/nb_NO/files.po
l10n/nb_NO/settings.po
l10n/nl/calendar.po
l10n/nl/contacts.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nl/settings.po
l10n/nn_NO/calendar.po
l10n/nn_NO/contacts.po
l10n/nn_NO/core.po
l10n/nn_NO/files.po
l10n/nn_NO/settings.po
l10n/pl/calendar.po
l10n/pl/contacts.po
l10n/pl/core.po
l10n/pl/files.po
l10n/pl/gallery.po
l10n/pl/settings.po
l10n/pt_BR/calendar.po
l10n/pt_BR/contacts.po
l10n/pt_BR/core.po
l10n/pt_BR/files.po
l10n/pt_BR/settings.po
l10n/pt_PT/calendar.po
l10n/pt_PT/contacts.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/gallery.po
l10n/pt_PT/settings.po
l10n/ro/calendar.po
l10n/ro/contacts.po
l10n/ro/core.po
l10n/ro/files.po
l10n/ro/settings.po
l10n/ru/calendar.po
l10n/ru/contacts.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/gallery.po
l10n/ru/settings.po
l10n/sk_SK/calendar.po
l10n/sk_SK/contacts.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sk_SK/settings.po
l10n/sl/calendar.po
l10n/sl/contacts.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sl/gallery.po
l10n/sl/settings.po
l10n/sr/calendar.po
l10n/sr/contacts.po
l10n/sr/core.po
l10n/sr/files.po
l10n/sr/settings.po
l10n/sr@latin/calendar.po
l10n/sr@latin/contacts.po
l10n/sr@latin/core.po
l10n/sr@latin/files.po
l10n/sr@latin/settings.po
l10n/sv/calendar.po
l10n/sv/contacts.po
l10n/sv/core.po
l10n/sv/files.po
l10n/sv/gallery.po
l10n/sv/media.po
l10n/sv/settings.po
l10n/templates/bookmarks.pot
l10n/templates/calendar.pot
l10n/templates/contacts.pot
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/gallery.pot
l10n/templates/media.pot
l10n/templates/settings.pot
l10n/th_TH/calendar.po
l10n/th_TH/contacts.po
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/gallery.po
l10n/th_TH/settings.po
l10n/tr/calendar.po
l10n/tr/contacts.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/gallery.po
l10n/tr/settings.po
l10n/uk/calendar.po
l10n/uk/contacts.po
l10n/uk/core.po
l10n/uk/files.po
l10n/uk/media.po
l10n/uk/settings.po
l10n/zh_CN/calendar.po
l10n/zh_CN/contacts.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/gallery.po
l10n/zh_CN/settings.po
l10n/zh_TW/calendar.po
l10n/zh_TW/contacts.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/settings.po
lib/app.php
lib/base.php
lib/connector/sabre/file.php
lib/connector/sabre/locks.php
lib/connector/sabre/node.php
lib/db.php
lib/filecache.php
lib/fileproxy/quota.php
lib/files.php
lib/filestorage/local.php
lib/filesystemview.php
lib/group/database.php
lib/helper.php
lib/installer.php
lib/json.php
lib/l10n.php
lib/migrate.php
lib/mimetypes.fixlist.php
lib/ocs.php
lib/preferences.php
lib/public/json.php
lib/public/util.php
lib/template.php
lib/user.php
lib/user/database.php
lib/util.php
lib/vcategories.php
ocs/providers.php
settings/admin.php
settings/ajax/lostpassword.php
settings/ajax/removeuser.php
settings/ajax/setbackgroundjobsmode.php
settings/ajax/setlanguage.php
settings/ajax/setquota.php
settings/ajax/togglegroups.php
settings/apps.php
settings/css/settings.css
settings/js/apps.js
settings/js/users.js
settings/l10n/bg_BG.php
settings/l10n/ca.php
settings/l10n/cs_CZ.php
settings/l10n/da.php
settings/l10n/de.php
settings/l10n/el.php
settings/l10n/eo.php
settings/l10n/es.php
settings/l10n/et_EE.php
settings/l10n/eu.php
settings/l10n/fa.php
settings/l10n/fi_FI.php
settings/l10n/fr.php
settings/l10n/gl.php
settings/l10n/he.php
settings/l10n/hr.php
settings/l10n/hu_HU.php
settings/l10n/it.php
settings/l10n/ja_JP.php
settings/l10n/ko.php
settings/l10n/lt_LT.php
settings/l10n/mk.php
settings/l10n/ms_MY.php
settings/l10n/nb_NO.php
settings/l10n/nl.php
settings/l10n/nn_NO.php
settings/l10n/pl.php
settings/l10n/pt_BR.php
settings/l10n/pt_PT.php
settings/l10n/ru.php
settings/l10n/sk_SK.php
settings/l10n/sl.php
settings/l10n/sv.php
settings/l10n/th_TH.php
settings/l10n/tr.php
settings/l10n/zh_CN.php
settings/personal.php
settings/templates/admin.php
settings/templates/users.php
2012-08-25 00:05:07 +02:00
Michael Gapczynski
36487246ed
Switch to using file cache ids instead of paths for file sharing
2012-08-24 10:05:37 -04:00
jfd
0c0ae928dc
escape all identifiers with backticks
2012-08-24 15:08:57 +02:00
Frank Karlitschek
f86f4c8bfd
4.0.7
...
and remove some ^M while at it
2012-08-24 15:00:53 +02:00
Michael Gapczynski
12df81fe0b
Check blacklist when renaming files
2012-08-24 15:00:52 +02:00
Lukas Reschke
5cb2d58c9f
Also check some other files
2012-08-24 15:00:52 +02:00
Jakob Sack
1dfa6f3d8f
Fix OC_Connector_Sabre_Locks for SQLite
2012-08-24 15:00:52 +02:00
Bjoern Schiessle
0ac8434670
fix for bug 879 - add parent directory to file cache if it does not exist yet.
...
For example this can happen if the sync client is used before the user created the root directory (e.g. through web login).
2012-08-24 14:58:47 +02:00
Jenkins for ownCloud
07a889631e
[tx-robot] updated from transifex
2012-08-24 02:07:18 +02:00
Thomas Tanghus
c90c358f0d
Only load js and css once.
2012-08-23 05:02:30 +02:00
Jenkins for ownCloud
082ed4ab71
[tx-robot] updated from transifex
2012-08-23 02:07:35 +02:00
Michael Gapczynski
885b8c481b
Check if files_sharing app is enabled, move file specific javascript to files_sharing app
2012-08-22 12:32:07 -04:00
Michael Gapczynski
3debb67458
Move share CSS to core, add script and style from inside Share API
2012-08-22 11:57:58 -04:00
Michael Gapczynski
9699ff03bd
Revert using item name, no longer allowing the same item source exist for a user
2012-08-22 11:57:58 -04:00
Jenkins for ownCloud
e6d87b2c4b
[tx-robot] updated from transifex
2012-08-22 02:08:16 +02:00
Frank Karlitschek
1d7018158e
4.5 alpha 1
2012-08-21 18:47:26 +02:00
Michael Gapczynski
09e851a9c4
Fix share ajax calls to use itemName/itemSource, show who shared a file with you
2012-08-20 21:22:22 -04:00
Michael Gapczynski
cb0464ca4e
Bump version number for Share API
2012-08-19 22:36:19 -04:00
Michael Gapczynski
82d81e8d39
Merge branch 'share_api'
...
Conflicts:
apps/contacts/lib/vcard.php
apps/files/index.php
lib/files.php
2012-08-19 22:29:01 -04:00
Michael Gapczynski
5eca531f99
Refactor again so we can tell what item is being reshared in case the same source shows up. This is the end of the share_api branch, moving to master.
2012-08-19 22:14:38 -04:00
Michael Gapczynski
f987e22d85
Large refactoring to allow for the same item to be shared to a group and again with a user in the group with different permissions
2012-08-19 16:30:38 -04:00
Robin Appelman
50cc5d5921
fix creating nested folders inside tar files
2012-08-19 05:54:16 +02:00
Robin Appelman
3da1339cd8
fix error when adding string data to an archive
2012-08-19 05:04:58 +02:00
Robin Appelman
154ce0f68d
also add getLocalFolder to OC_Filsystem and OC_FilesystemView
2012-08-19 02:42:15 +02:00
Robin Appelman
9b44d0cb32
add OC_FileStorage::getLocalFolder
2012-08-19 02:30:33 +02:00
Robin Appelman
5962469892
add OC_Archive::addRecursive
2012-08-18 22:42:35 +02:00
Frank Karlitschek
850ee93711
add impress mimetype
2012-08-17 12:39:05 +02:00
Robin Appelman
53a888cc81
more path normalization
2012-08-17 01:22:54 +02:00
Michael Gapczynski
df8a2e5361
File sharing cleanup, works perfectly I think :)
2012-08-16 12:20:14 -04:00
Jenkins for ownCloud
1e6dc67517
[tx-robot] updated from transifex
2012-08-16 02:09:15 +02:00
Michael Gapczynski
9cb3113f42
Fix problems exposed by tests
2012-08-15 11:59:08 -04:00
Michael Gapczynski
137e4cb342
Add tests for Share API, all tests passing :)
2012-08-15 11:55:54 -04:00
Bart Visscher
63af75586b
Merge branch 'master' into routing
2012-08-15 17:39:00 +02:00
Bjoern Schiessle
d039f11905
provide ocs calls and keymanager functions to get/set both keys (private, public) of a user together
2012-08-15 13:18:11 +02:00
Jenkins for ownCloud
da3896808a
[tx-robot] updated from transifex
2012-08-15 02:07:20 +02:00
Michael Gapczynski
ddfa760a5e
Change to correct function call getItemSharedWithBySource()
2012-08-14 17:06:41 -04:00
Michael Gapczynski
b440dfc67e
Remove setTarget() function, changing target names only leads to confusion
2012-08-14 17:05:38 -04:00
Michael Gapczynski
9661a63a72
Ensure permissions can't be escalated during a reshare
2012-08-14 16:54:38 -04:00
Michael Gapczynski
028c79fc9d
Use if instead of switch for detecting share type and throw exceptions when setting permissions
2012-08-14 16:30:13 -04:00
Michael Gapczynski
937d1b29d8
Retrieve all file dependent items when looking for file item type
2012-08-14 11:02:29 -04:00
Michael Gapczynski
4c7fd8cd01
Merge branch 'master' into share_api
...
Conflicts:
lib/group.php
lib/group/backend.php
lib/group/database.php
lib/group/interface.php
lib/public/user.php
lib/user.php
lib/user/backend.php
lib/user/database.php
lib/user/interface.php
2012-08-14 10:22:13 -04:00
Robin Appelman
1522f7f211
fix some minor problems with path noramlization
2012-08-14 03:07:14 +02:00
Robin Appelman
0c8ce0bb32
some basic path normalization
2012-08-14 02:44:45 +02:00
Michael Gapczynski
863d3a43b2
Catch exceptions and write to log when creating storage object fails
2012-08-13 17:10:58 -04:00
Bjoern Schiessle
34f93ac765
check if user has write access to a given file before updating the filekey
2012-08-13 11:31:15 +02:00
Lukas Reschke
e72a57f595
Also check for some other files
2012-08-13 00:57:01 +02:00
Michael Gapczynski
64ef1e2181
Change name of share function to shareItem, silly PHP 5.3.1 thinking it is a constructor...
2012-08-12 14:49:41 -04:00
Bart Visscher
16dacba490
Routing: And start using them from php
2012-08-12 16:53:00 +02:00
Bart Visscher
db4111f6d5
Routing: Add some core routes
2012-08-12 16:52:36 +02:00
Bart Visscher
8c02494744
Routing: Prepare load funtions to be called from OC_Router
2012-08-12 16:16:22 +02:00
Jakob Sack
4d3d4522f9
Backgroundjobs: Fix wrong var names
2012-08-12 12:14:27 +02:00
Jakob Sack
deef1f73db
Backgroundjobs: fix bug in QueuedTask
2012-08-12 09:02:20 +02:00
Michael Gapczynski
a1c88a3e39
Add search, limit, offset parameters to usersInGroups()
2012-08-11 16:25:28 -04:00
Michael Gapczynski
4f1b3631ba
Change limit parameter in OC_User as well
2012-08-11 16:25:28 -04:00
Michael Gapczynski
874f31b8d7
Make getting all users and groups the default
2012-08-11 16:25:27 -04:00
Michael Gapczynski
8d1eb674ec
Add search, limit, and offset parameters to getUsers() and getGroups()
2012-08-11 16:25:27 -04:00
Jakob Sack
1d7e3071e0
bump version to reate new tables
2012-08-11 17:32:17 +02:00
Lukas Reschke
0d8df3f55c
Revert "Combine install checks in lib/base.php"
...
This reverts commit aa9fbf6639
.
2012-08-11 17:07:35 +02:00
Michael Gapczynski
465767670b
Check blacklist when renaming files
2012-08-11 11:04:04 -04:00
Bart Visscher
1025e451a7
Add router match to OC::handleRequest
2012-08-11 01:36:16 +02:00
Bart Visscher
1763de08d0
Routing: Fix construction of RequestContext
2012-08-11 00:57:46 +02:00
Bart Visscher
c2160433cd
Merge branch 'master' into routing
...
Conflicts:
lib/base.php
2012-08-11 00:43:26 +02:00
Bart Visscher
87d1cdb945
Fix for running doing routing in lib/ocs.php
2012-08-11 00:04:43 +02:00
Bart Visscher
f63b9b44d8
Routing: combine all routes into one set
2012-08-10 23:31:21 +02:00
Bart Visscher
72b2324b68
Move loading of routes to OC::getRouter function
2012-08-10 23:31:11 +02:00
Bart Visscher
3722928c46
Change access to router object to getter function
2012-08-10 23:30:04 +02:00
Bart Visscher
ca1454ab1a
Routing: Method needs to be uppercase
2012-08-10 23:27:58 +02:00
Bart Visscher
3e8b6e816a
Create OC_Router in OC::init
2012-08-10 23:03:57 +02:00
Bart Visscher
9e80f0954d
Add loading of routes in OC_Router
2012-08-10 23:03:19 +02:00
Lukas Reschke
8ec45870a3
Validate cookie properly and prevent auth bypass
...
BIG (!) thanks to Julien CAYSSOL
2012-08-10 15:28:59 +02:00
Jakob Sack
0ea4fa298c
Backgroundjobs: don't try to access OC_Appconfig if ownCloud has not been installed
2012-08-10 13:53:40 +02:00
Jakob Sack
81b997b56e
Merge branch 'backgroundjobs'
2012-08-10 13:00:51 +02:00
Bart Visscher
82b10954e7
Simplify loading app php script files
2012-08-10 12:27:37 +02:00
Bart Visscher
5e7086adc9
Move login handling to OC class
2012-08-10 12:17:13 +02:00
Bart Visscher
83403784d1
Always load when the requested file is css
2012-08-10 11:43:04 +02:00
Bart Visscher
da07245f59
Move OC::loadfile and OC::loadapp next to OC::handleRequest
2012-08-10 11:43:04 +02:00
Bart Visscher
e3c732040b
Make OC::loadfile and OC::loadapp protected, only used in OC::handleRequest
2012-08-10 11:43:04 +02:00
Bart Visscher
0973969386
Cleanup OC::loadfile
2012-08-10 11:43:04 +02:00
Bart Visscher
667cd318fe
Use OC_Util::displayLoginPage and cleanup the function
2012-08-10 11:43:04 +02:00
Bart Visscher
aa9fbf6639
Combine install checks in lib/base.php
2012-08-10 11:43:04 +02:00
Jakob Sack
f46fdfd814
Backgroundjobs: Add reset counter in worker
2012-08-09 22:30:11 +02:00
Jakob Sack
a6a1f892f0
BackgroundJobs: fix bug
2012-08-09 22:07:18 +02:00
Michael Gapczynski
be03ee29f0
Bump up version number
2012-08-09 13:55:36 -04:00
Jakob Sack
28c1ec19ea
BackgroundJob: forgot to rename file
2012-08-09 19:26:49 +02:00
Jakob Sack
ceda0ae052
Backgroundjobs: rename ScheduledTask to QueuedTask
2012-08-09 19:04:04 +02:00
Michael Gapczynski
78cd1153f0
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/vcard.php
apps/files_sharing/sharedstorage.php
2012-08-09 11:38:22 -04:00
Robin Appelman
acd8381094
fix scanning of archives in some cases
2012-08-09 16:36:16 +02:00
Georg Ehrke
10d0861872
remove unstable lib
2012-08-09 12:37:26 +02:00
Jakob Sack
889f0a1c6d
rename appconfig keys for backgroundjobs
2012-08-09 10:40:39 +02:00
Michael Gapczynski
b830b3e24b
Start adding permission checks for addressbooks
2012-08-08 21:43:02 -04:00
Michael Gapczynski
2c5744f16c
Add back getItemSharedWithBySource(), some situtations require this ability
2012-08-08 20:56:55 -04:00
Jakob Sack
37ee88aa6d
Fixed bug in OC_BackgroundJob_Worker
2012-08-09 01:29:15 +02:00
Jakob Sack
13a0818fec
Be more precise regarding backgroundjobs mode
2012-08-09 01:02:05 +02:00
Jakob Sack
4107273a79
fix license text
2012-08-09 00:46:50 +02:00
Jakob Sack
088b3ea0bc
Add public interface to background jobs
2012-08-09 00:01:06 +02:00
Jakob Sack
443e198224
Renaming backgroundjobs on file system as well
2012-08-09 00:00:12 +02:00
Jakob Sack
6025d2ebc3
Rename Backgroundjobs to BackgroundJob
2012-08-08 23:59:30 +02:00
Jakob Sack
4f90860001
Add initial version of backgroundjobs library
2012-08-08 23:39:30 +02:00
Bart Visscher
3387454094
Move login code from index.php to OC class
2012-08-08 22:42:51 +02:00
Bart Visscher
9156fb73fd
Move handling request of index.php to OC class
2012-08-08 22:42:50 +02:00
Bart Visscher
7522a23693
Remove unused RUNTIME_NOSETUPFS var
2012-08-08 22:42:50 +02:00
Bjoern Schiessle
d4974b6d4a
set default dependencies in keymanager.php
...
fix calls in ocs.php
2012-08-08 14:15:35 +02:00
Bjoern Schiessle
0bf2a3e6d6
while loop not needed because of recursive call of put()
2012-08-08 11:29:44 +02:00
Bjoern Schiessle
dc927bd346
fix for bug 879 - add parent directory to file cache if it does not exist yet.
...
This can happen if the sync client is used before user created the root directory (e.g. through web login) for example.
2012-08-08 10:51:19 +02:00
Bart Visscher
b287b11ff2
adjust the query generation in getItems, to use placeholders
2012-08-07 21:49:31 +02:00
Michael Gapczynski
3533f43d12
Implement groupExists in group database backend
2012-08-07 14:48:55 -04:00
Bart Visscher
31003b475e
Decode the alternative path_info
2012-08-07 20:43:00 +02:00
Bart Visscher
7d20e98aec
Move getting the path info to OC_Request
2012-08-07 20:43:00 +02:00
Bart Visscher
34c076e2a8
Add comments the other functions in OC_Request
2012-08-07 20:43:00 +02:00
Bart Visscher
99ce7ba1df
Move serverHost and serverProtocol functions to OC_Request
2012-08-07 20:43:00 +02:00
Bart Visscher
c4f1a1de5b
Added function to make url absolute
2012-08-07 20:43:00 +02:00
Bart Visscher
6d0390dcca
Fix rewriting GET parameters with ? in REQUESTEDAPP
2012-08-07 20:43:00 +02:00
Michael Gapczynski
8d56c42fde
Add search and limit to getGroups search in groupExists implementation
2012-08-07 14:42:11 -04:00
Michael Gapczynski
b6bbbb4c47
Remove undefined return variable
2012-08-07 14:38:02 -04:00
Michael Gapczynski
a96a75c263
Select the correct column when searching for similar targets
2012-08-06 16:48:20 -04:00
Michael Gapczynski
5e95e2a131
Set filePath variable
2012-08-06 16:46:44 -04:00
Michael Gapczynski
1b21cde2b3
Throw more exceptions
2012-08-06 16:37:51 -04:00
Michael Gapczynski
14d13a740f
Load icons for addressbooks, fix statuses for types other than files
2012-08-06 15:24:08 -04:00
Michael Gapczynski
e954de6030
Make the file source path relative earlier
2012-08-06 14:15:37 -04:00
Michael Gapczynski
e280e3ecc9
Throw more exceptions
2012-08-06 14:09:58 -04:00
Michael Gapczynski
1db1d40414
Add additional check for post_deleteUser so we don't delete any non-user shares with the same name
2012-08-06 13:58:26 -04:00
Michael Gapczynski
ea23854328
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/app.php
apps/contacts/templates/part.chooseaddressbook.rowfields.php
2012-08-06 13:49:54 -04:00
Bart Visscher
fe6450002d
Change hardcoded urls to use linkTo function
2012-08-06 18:51:41 +02:00
Michael Gapczynski
3b2c853916
Lots of refactoring to share API
2012-08-06 11:27:13 -04:00
Thomas Tanghus
cc445e4e47
Small changes to allow updating main menu dynamically.
2012-08-05 01:42:17 +02:00
Thomas Tanghus
3b37181550
Use correct variable name.
2012-08-04 21:25:41 +02:00
Alessandro Cosentino
a6ce497dd9
OC_App::getAppVersion return blank if version is not specified
2012-08-04 13:39:36 -04:00
Jenkins for ownCloud
d7e77f6426
[tx-robot] updated from transifex
2012-08-04 02:04:21 +02:00
Michael Gapczynski
09bb3bfaf8
Preparing for proper collection implementation
2012-08-03 15:05:45 -04:00
Georg Ehrke
fc4a542dd0
add iWork mimetypes
2012-08-03 20:06:29 +02:00
Tom Needham
21f8646ffc
API: Fix merging of responses. Return 400 error when no OAuth operation sent.
2012-08-03 15:20:01 +00:00
Bart Visscher
e36e00dc00
Merge branch 'chunked_upload'
2012-08-03 15:58:17 +02:00
Tom Needham
6047a5fe51
API: Check if the consumer has permissions to access the requested method
2012-08-03 11:56:11 +00:00
Bjoern Schiessle
773d7b119d
OCS api calls cleanup
2012-08-03 13:52:41 +02:00
Tom Needham
a7906d813a
Move OAuth classes into lib/oauth
2012-08-03 11:47:05 +00:00
Bjoern Schiessle
d5808f07ca
return a list of all public keys for a given file
2012-08-03 11:49:55 +02:00
Jenkins for ownCloud
7dc799c167
[tx-robot] updated from transifex
2012-08-03 02:04:12 +02:00
Michael Gapczynski
e3d88270cc
OAuth server implementation using oauth library
2012-08-02 20:02:31 -04:00
Bart Visscher
4b9200f6f7
Routing: combine all routes into one set
2012-08-02 21:51:31 +02:00
Bart Visscher
6ba2623485
Move loading of routes to OC::getRouter function
2012-08-02 21:44:58 +02:00
Bart Visscher
37ef522b05
Quick fix for xml encoding arrays
2012-08-02 17:48:09 +02:00
Bart Visscher
7952c6a31c
Change access to router object to getter function
2012-08-02 17:47:38 +02:00
Michael Gapczynski
6c7baacf89
Throw exception for items already shared in a collection
2012-08-01 20:08:18 -04:00
Michael Gapczynski
92d683587a
Fix contact email share type redirection
2012-08-01 17:52:59 -04:00
Michael Gapczynski
4933128850
Throw exceptions in share API for UI to display
2012-08-01 17:52:29 -04:00
Michael Gapczynski
2201074e1f
Basic setup for sharing with contacts
2012-08-01 17:17:28 -04:00
Jörn Friedrich Dreyer
14c5d08a3f
reorder code for readability
2012-08-01 22:38:27 +02:00
Bart Visscher
93daa9e247
API: Complete respond function
2012-08-01 19:48:51 +02:00
Tom Needham
c11c2d0fd4
Logout the user at the end of a call to be stateless
2012-08-01 13:39:05 +00:00
Tom Needham
2afe5f9b2b
API: add OC_API::checkLoggedIn()
2012-08-01 13:37:00 +00:00
Jörn Friedrich Dreyer
c7be0db853
use dbname for non privileged user
2012-08-01 15:00:54 +02:00
Jörn Friedrich Dreyer
ab976863ae
fix sql
2012-08-01 15:00:07 +02:00
Jörn Friedrich Dreyer
e13f381189
add limit support to OC_DB & OCP/DB
2012-08-01 14:59:08 +02:00
Tom Needham
e315384b4d
Remove unnecessary include
2012-08-01 10:40:09 +01:00
Tom Needham
e7f7693b2f
Fix 3rdparty paths, initialise OAuth in correct order
2012-08-01 10:21:33 +01:00
Michael Gapczynski
b6aa5d2875
Include contacts in share with search
2012-07-31 21:05:00 -04:00
Jakob Sack
1fe9892292
Fix #476
2012-07-31 23:31:25 +02:00
Bart Visscher
7426217e76
Fix /privatedata/getattribute route
2012-07-31 23:26:15 +02:00
Jenkins for ownCloud
36ccaf51ed
[tx-robot] updated from transifex
2012-07-31 22:57:24 +02:00
Bart Visscher
71918a820f
API: set request method for registered urls
2012-07-31 22:34:35 +02:00
Bart Visscher
9d6a09f589
Routing: Method needs to be uppercase
2012-07-31 22:33:11 +02:00
Bart Visscher
28537037ae
Fixup OCS modules
2012-07-31 22:19:11 +02:00
Bart Visscher
c2bdb5c716
Fix require 3rdpartypath
2012-07-31 22:18:16 +02:00
Michael Gapczynski
94ce8f2168
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/app.php
apps/files_sharing/js/share.js
2012-07-31 15:00:04 -04:00
Michael Gapczynski
9e4c3b8342
Remove break, it broke the statuses :)
2012-07-31 14:21:46 -04:00
Jörn Friedrich Dreyer
795e78809f
add oracle to install & setup
2012-07-31 19:34:30 +02:00
jfd
ede464f058
escape all identifiers with backticks
2012-07-31 18:53:05 +02:00
Tom Needham
fcf3dbcfc1
Require a username for OC_OAuth::registerConsumer()
2012-07-31 15:02:51 +01:00
Tom Needham
ce41f3801e
Actually login the user when using OAuth
2012-07-31 14:59:07 +01:00
Tom Needham
78bbcc8aea
Basic OAuth class based on oauth-php. WIP
2012-07-31 14:35:07 +01:00
Tom Needham
5922599f48
Handle function not needed in lib/ocs.php
2012-07-31 14:35:07 +01:00
Bjoern Schiessle
9bab06537c
update file encryption key over webdav properties for client side encryption
2012-07-31 15:03:28 +02:00
Tom Needham
b05639e745
Fix error with namespacing
2012-07-31 10:10:15 +00:00
Tom Needham
cc6911e1f7
Make method static
2012-07-31 09:28:12 +00:00
Frank Karlitschek
aa60771736
4.0.6
2012-07-31 10:13:10 +02:00
Michael Gapczynski
2f1a990cad
Add search, limit, and offset parameters to getUsers() and getGroups()
2012-07-30 20:20:46 -04:00
Jakob Sack
8a92cd21d6
Remove OC_App::register call in OCP\App::register
2012-07-30 21:26:14 +02:00
Bart Visscher
0a9ca42c34
Fix OC_OCS_Privatedata::privateDataGet
2012-07-30 21:19:03 +02:00
Bart Visscher
7a24f0cd8d
Make calling ocs/v1.php/config work
2012-07-30 21:19:02 +02:00
Bart Visscher
180bd69dbb
Fix OC_API::register
2012-07-30 21:19:02 +02:00
Bart Visscher
95d3b83a77
Create OC_Router in OC::init
2012-07-30 21:19:02 +02:00
Bart Visscher
0271bfa3b7
Move loading of routes to OC_Router
2012-07-30 21:19:02 +02:00
Tom Needham
2f84a8d746
Merge the responses recursively
2012-07-30 16:04:09 +00:00
Tom Needham
3a0e3708a5
Add public class for registering api calls
2012-07-30 14:26:15 +00:00
Michael Gapczynski
b9bd54bd98
Add additional error handling for emailing private links
2012-07-30 10:07:20 -04:00
Michael Gapczynski
6b83470c96
Fix incorrect copy/paste for file_put_contents()
2012-07-30 10:07:19 -04:00
Michael Gapczynski
93c75f46e5
Forgot data parameter for file_put_contents() streams pre proxies
2012-07-30 10:07:19 -04:00
Michael Gapczynski
ea18d70c60
Run pre and post proxies for file_put_contents() streams
...
Conflicts:
lib/filesystemview.php
2012-07-30 10:07:19 -04:00
Michael Gapczynski
f328f53ec1
Fix filesystem hash, no longer using basicOperation()
...
Conflicts:
lib/filesystemview.php
2012-07-30 10:07:19 -04:00
Michael Gapczynski
099b16350f
Delete old session files, suggested by Torben Nehmer, see bug oc-736
2012-07-30 10:07:19 -04:00
Michael Gapczynski
89027545a0
Check if user is already logged in for DAV auth, instead of logging in and creating new sessions for every request
2012-07-30 10:07:18 -04:00
Tom Needham
c7c16ac49b
Improve merging of api responses
2012-07-30 13:39:06 +00:00
Tom Needham
b0dc4383e1
Clean code slightly
2012-07-30 12:57:35 +00:00
Tom Needham
b563dff10a
Record the app that is registering a call to use later with OAuth
2012-07-30 12:56:01 +00:00
Tom Needham
9ffaea480f
Add the format parameter inside OC_API
2012-07-30 12:44:34 +00:00
Tom Needham
9072106048
Move OCS methods to lib/ocs/.php
2012-07-30 12:42:18 +00:00
Tom Needham
e33174f115
Add core routes and include them in OC_API::call()
2012-07-30 10:56:21 +00:00
Bjoern Schiessle
1f2aa32d22
url needs to be case sensitive to be able to have files and paths as part of the URL
2012-07-30 12:39:28 +02:00
Bjoern Schiessle
23391b3694
get/set key files, take shared files into account
2012-07-30 12:38:38 +02:00
Bjoern Schiessle
e5704bf8bf
ocs call to get file key for client side enncryption
2012-07-30 10:07:52 +02:00
Jenkins for ownCloud
3430dcd367
[tx-robot] updated from transifex
2012-07-30 02:05:41 +02:00
Michael Gapczynski
5262cde6a6
Add additional error handling for emailing private links
2012-07-29 18:02:09 -04:00
Tom Needham
0836366d87
Methods to disable and enable users
2012-07-29 16:07:51 +00:00
Tom Needham
038af7e636
Add method to check if an app is shipped or not
2012-07-29 15:29:26 +00:00
Jenkins for ownCloud
18f6552a08
[tx-robot] updated from transifex
2012-07-29 02:06:29 +02:00
Tom Needham
9dbe5f3703
Load routes before calling actions
2012-07-28 21:57:24 +00:00
Tom Needham
c375774fca
Fix odd indentation issue
2012-07-28 21:50:40 +00:00
Tom Needham
20838bb9c2
Basic structure and functionality of api class
2012-07-28 21:40:11 +00:00
Jenkins for ownCloud
fa4052d6f1
[tx-robot] updated from transifex
2012-07-28 02:05:38 +02:00
Bart Visscher
896d27de36
Chunked upload: Support reusing local chunks
2012-07-27 19:35:33 +02:00
Bart Visscher
1ea33ff36b
Chunked upload: Refactor OC_FileChunking to object
2012-07-27 19:35:28 +02:00
Bart Visscher
2d85ef0e04
Chunked upload: Refactor to static class
2012-07-27 19:32:44 +02:00
Michael Gapczynski
4c822df28d
Fix incorrect copy/paste for file_put_contents()
2012-07-27 09:37:47 -04:00
Bjoern Schiessle
f752a27605
write keyfiles to server
2012-07-27 14:00:41 +02:00
Bart Visscher
a7a5433108
Merge branch 'master' into chunked_upload
...
Conflicts:
lib/connector/sabre/directory.php
2012-07-27 11:40:51 +02:00
Michael Gapczynski
ea2e76eecc
Forgot data parameter for file_put_contents() streams pre proxies
2012-07-26 23:10:21 -04:00
Michael Gapczynski
d006a551f4
Run pre and post proxies for file_put_contents() streams
2012-07-26 22:53:55 -04:00
Georg Ehrke
16928f4d59
fix spelling fail
2012-07-26 18:50:59 +02:00
Bart Visscher
d26f87e738
Smarter remove of etag properties for path
2012-07-26 17:56:32 +02:00
Bart Visscher
3725cd079b
Fix oc-1362: post_rename has no path param but newpath and oldpath
2012-07-26 17:41:57 +02:00
Bjoern Schiessle
bb229f7291
write private/public key from the client to the server
2012-07-26 17:19:55 +02:00
Georg Ehrke
e1d14ab461
Merge branch 'master' into subadmin
2012-07-26 16:47:05 +02:00
Georg Ehrke
e4679770c4
declare OCP\App::register as deprecated
2012-07-26 15:16:07 +02:00
Georg Ehrke
4e62e121a6
mark OCP\App::register as deprecated
2012-07-26 15:12:57 +02:00
Bjoern Schiessle
cb5d935b82
implemented publicKeyGet() and privateKeyGet() calls
2012-07-26 13:57:50 +02:00
Michael Gapczynski
586fe8f940
Change is_writable() call to isUpdatable()
2012-07-25 17:39:28 -04:00
Bart Visscher
783d67be62
Create uniqid ETag for directories
2012-07-25 23:09:03 +02:00
Bart Visscher
381e493a8c
Rename functions
...
getETagPropertyForFile -> getETagPropertyForPath
removeETagPropertyForFile -> removeETagPropertyForPath
2012-07-25 23:09:03 +02:00
Michael Gapczynski
30b58f5677
Merge branch 'master' into share_api
...
Conflicts:
apps/calendar/js/loader.js
apps/contacts/index.php
apps/contacts/js/loader.js
apps/files/js/files.js
apps/files_sharing/sharedstorage.php
lib/filesystemview.php
2012-07-25 17:08:18 -04:00
Michael Gapczynski
f25ccaff59
Fix filesystem hash, no longer using basicOperation()
2012-07-25 16:55:01 -04:00
Michael Gapczynski
4d17ed2f71
Make file actions permissions aware
2012-07-25 16:33:08 -04:00
Bart Visscher
b3848581bf
Small cleanup
2012-07-25 18:00:03 +02:00
Bart Visscher
5a0d476ab1
Convert new actions
2012-07-25 17:59:50 +02:00
Bart Visscher
d579defc66
Merge branch 'master' into routing
2012-07-25 17:51:36 +02:00
Bart Visscher
ac9dbd4b83
Add functions for the common HTTP methods
2012-07-25 17:45:29 +02:00
Arthur Schiwon
eefe6882f9
method not used externally, thus not needed in interface
2012-07-25 12:56:09 +02:00
Arthur Schiwon
6b320a2604
provide recursiveArraySearch as Helper function and make available through API
2012-07-25 12:56:08 +02:00
Arthur Schiwon
57c375ea24
Support for OCA namespace
2012-07-25 12:56:08 +02:00
Arthur Schiwon
81c0ca4ffb
remove only internally used function from interface
2012-07-25 12:56:08 +02:00
Arthur Schiwon
0196e6eada
Offer User and Group interfaces in public API
2012-07-25 12:56:08 +02:00
Arthur Schiwon
e499bc37c8
define an interface for the Group Backend
2012-07-25 12:56:08 +02:00
Arthur Schiwon
fdcbc23ed6
define an interface for the User Backend
2012-07-25 12:56:07 +02:00
Michael Gapczynski
ede2b8a55f
Missed a is_readable() call in local filestorage
2012-07-24 21:17:43 -04:00
Michael Gapczynski
f7b89f0475
Add CRUDS permissions calls to filesystem, deprecate is_readable() and is_writable()
2012-07-24 20:10:28 -04:00
Sam Tuke
9216289856
Wrote new methods for testing if a file is encrypted using AES or Blowfish
...
Added more unit tests for crypt class
Added new method for generating 16 character pseudo-random initialisation vectors
Started writing new methods for handling legacy keys and en/de/re cryption
Added comments to lib/filecache.php explaining expected $path type
2012-07-24 17:57:20 +01:00
Bart Visscher
0040b7109f
Merge branch 'master' into routing
...
Conflicts:
lib/ocs.php
2012-07-24 18:35:09 +02:00
Bjoern Schiessle
e32b2c8121
moved to ocs.php from master and added dummy functions for the keyserver
2012-07-24 18:22:57 +02:00
Bjoern Schiessle
2cf64daec4
moved to ocs.php from master and added dummy functions for the keyserver
2012-07-24 18:21:50 +02:00
Frank Karlitschek
d28be8de64
add the calls for the new keyserver. Still not connectect to the encryption system
2012-07-24 15:18:52 +02:00
Robin Appelman
856d9c0b54
some indention fixes
2012-07-24 00:39:59 +02:00
Robin Appelman
e49666d36b
add option to clear user backends
2012-07-23 22:31:48 +02:00
Frank Karlitschek
21631be2ff
make it generic and implement a dummy call for quota set
2012-07-23 19:43:28 +02:00
Bart Visscher
768b44b9b6
Convert routing to ownCloud fluid interface
2012-07-23 18:58:52 +02:00
Frank Karlitschek
e7e1f234dd
first part of the new new OCS CLOUD module. So far only quota is implemented.
...
The specification is developed here:
http://www.freedesktop.org/wiki/Specifications/open-collaboration-services-1.7#CLOUD
will be moved to
http://www.freedesktop.org/wiki/Specifications/open-collaboration-services
as soon as everything is done.
2012-07-23 18:34:21 +02:00
Bjoern Schiessle
73734c98e0
- remove namespace from file property name (webdav)
...
- update script to fix broken properties in the database
2012-07-23 11:00:37 +02:00
Bjoern Schiessle
bd63fddbf4
fix broken properties in the database
2012-07-23 10:34:01 +02:00
Bjoern Schiessle
c0e37c7d69
quick fix for broken properties
2012-07-23 10:25:35 +02:00
Bart Visscher
9e70f64d44
Fix oc-1163: gzdecode function not always defined
...
This function is only found in newer php versions
2012-07-22 17:27:30 +02:00
Robin Appelman
b1010160b3
CSRF protection for eventsource
2012-07-22 16:37:49 +02:00
Robin Appelman
59ab8b14c7
cache fileid's in oc_cache
2012-07-22 03:24:34 +02:00
Robin Appelman
6843beeae9
add option to only get fast cache
2012-07-22 03:21:20 +02:00
Robin Appelman
51566e87c7
add prefix option to OC_Cache::clear
2012-07-22 02:31:48 +02:00
Robin Appelman
2b74778958
add method to OC_Cache to check whether a fast cache (apc/xdebug/etc) is available
2012-07-22 02:23:24 +02:00
Robin Appelman
2a73678fef
use file extension for determining mimetypes on default
...
should be more reliable for files that "look like" other types based on their magic numbers such as odf and docx files
also a lot faster then the old way
2012-07-22 01:53:20 +02:00
Thomas Tanghus
0eade1b0d5
Code style. One down...
2012-07-21 22:00:27 +02:00
Bart Visscher
d0cae6a99a
Very basic conversion of ocs to Symfony Routing Component
2012-07-21 19:43:50 +02:00
Georg Ehrke
f9d3388854
Merge branch 'master' into calendar_import
2012-07-21 17:37:10 +02:00
Georg Ehrke
11725efd7e
add some hooks for subadmins
2012-07-21 16:43:39 +02:00
Georg Ehrke
5508a95065
Merge branch 'master' into subadmin
2012-07-21 13:14:52 +02:00
Bart Visscher
5381cc7418
Fix missing parameter decleration, thanks Jenkins :-)
2012-07-21 01:18:51 +02:00
Robin Appelman
8a19e134df
fix ununsed variables
2012-07-21 00:20:27 +02:00
Robin Appelman
aa118a4c64
remove obsolete oc_filesystem::mountall
2012-07-21 00:20:26 +02:00
Bart Visscher
0b338a7a41
Add missing public to function definition
2012-07-21 00:13:30 +02:00
Bart Visscher
14af503374
Fix parameter order in OC_Filestorage_Common->hash
2012-07-21 00:13:30 +02:00
Bart Visscher
cdd9ffc8a5
Add ETag support to the Sabre file connector.
...
This is based on the md5 of the file, can be changed later
2012-07-21 00:13:30 +02:00
Bjoern Schiessle
53bdb049cb
adapted to new SabreDav version
2012-07-20 23:31:08 +02:00
Thomas Tanghus
0af454a23b
Trying to get documentation to "Do The Right Thing" (TM)
2012-07-20 23:11:06 +02:00
Tom Needham
29d16f61fa
Fix strict standards warnings
2012-07-20 19:27:51 +00:00
Thomas Tanghus
de8ed98541
Added some more documentation to OCP\JSON.
2012-07-20 21:20:51 +02:00
Thomas Tanghus
10337c059c
Added some documentation for OCP\JSON::callCheck()
2012-07-20 20:15:39 +02:00
Robin Appelman
d393638cc8
forgot to make one function abstract
2012-07-20 19:03:33 +02:00
Robin Appelman
c9be9ab251
remove unused variables
2012-07-20 18:56:18 +02:00
Robin Appelman
7152b8b4ee
remove unused and depricated getFolderSize
2012-07-20 18:32:40 +02:00
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
Robin Appelman
e52ab59b40
Revert "use readfile() instead iof fopen() for file download over webdav."
...
This reverts commit 9af74a9c80
.
2012-07-19 18:13:10 +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
Frank Karlitschek
10bf36a6ae
4.0.5
2012-07-19 09:10:18 +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
Michael Gapczynski
1ff2dd8f63
Listen to post_deleteUser, post_addToGroup, and post_removeFromGroup hooks
2012-07-14 14:06:57 -04:00
Michael Gapczynski
cc6c940b9a
Implement post_removeFromGroup()
2012-07-14 11:55:22 -04:00
Michael Gapczynski
82dea705d4
Add option to delete() to check the owner of the first search of reshares
2012-07-14 11:53:02 -04:00
Michael Gapczynski
0e9ab5cf2a
Fix post_deleteUser(), column name changed and item_source is no longer needed
2012-07-14 11:02:16 -04:00
Michael Gapczynski
459bcd8d5e
Update documentation
2012-07-14 10:55:34 -04:00
Michael Gapczynski
bbbfc2c565
Fix delete(), it was going in an infinite loop
2012-07-14 10:52:31 -04:00
Michael Gapczynski
8de69fcb18
Update documentation
2012-07-14 10:19:18 -04:00
Michael Gapczynski
51a4518396
Add support for CRUDS permissions
2012-07-14 09:35:39 -04: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
Bjoern Schiessle
80ed5412f1
if the '/Shared' was the modified directory, than scan it.
2012-07-13 11:57:14 +02:00
Michael Gapczynski
f638340d1f
Add check for folder item type as well
2012-07-12 14:29:51 -04:00
Michael Gapczynski
63b6f20e05
Move already shared with check out of user and group cases, and add check for already shared with inside a collection
2012-07-12 12:11:04 -04:00
Michael Gapczynski
ecae3ea430
Rename parents to collectionTypes, getCollectionItemTypes() shouldn't include the original item type
2012-07-12 12:10:50 -04:00
Michael Gapczynski
bdcfa4bb63
Add check if file is found in file cache
2012-07-11 20:43:48 -04:00
Michael Gapczynski
4bf13adff2
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/addressbook.php
apps/files_sharing/js/share.js
apps/files_sharing/sharedstorage.php
2012-07-11 20:25:59 -04:00
Michael Gapczynski
632fc6ec61
Fix log write() parameters in wrong order
2012-07-11 19:38:57 -04:00
Lukas Reschke
ac5abc5603
Handling exceptions
2012-07-11 19:38:57 -04:00
Michael Gapczynski
e887fd7ba8
Catch exceptions from PHPMailer
2012-07-11 19:38:57 -04:00
Michael Gapczynski
71491612e3
Move line counter so we only count lines towards the offset that are equal or above the log level
2012-07-11 19:38:56 -04:00
Michael Gapczynski
bc3462f022
Improvements and bug fix for log reading, fixes bug oc-982
2012-07-11 19:38:56 -04: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
Michael Gapczynski
ccb5e99395
Generate random token for private links (more entropy than past private links)
2012-07-11 12:18:59 -04:00
Bjoern Schiessle
9af74a9c80
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-11 12:04:20 +02: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
Michael Gapczynski
a7416b1cd8
Add back returning only the item if the limit is 1 and now check that the format is set to none
2012-07-10 21:30:16 -04:00
Michael Gapczynski
c21ff29a53
Fix getItems() calls
2012-07-10 21:29:34 -04:00
Michael Gapczynski
7c908a0016
Sharing files working using share API
2012-07-10 18:56:22 -04: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
Robin Appelman
b470869114
when checking for updates in the filecache, explicitly state that we are querying a folder
2012-07-10 14:42:15 +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
Bart Visscher
e8010209bb
Custom chunking support
2012-07-08 22:11:36 +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
Michael Gapczynski
96dea9507a
Return false for single item checks and an empty array for multiple item checks
2012-07-03 14:03:04 -04:00
Michael Gapczynski
5e8ef33190
Clean up in the dropdown for unsharing
2012-07-03 14:00:09 -04:00
Bjoern Schiessle
aec6eea235
use filesystem abstraction layer to copy file versions
2012-07-03 18:25:49 +02:00
Michael Gapczynski
4185bd6292
Load shared addressbooks inside OC_Contacts_Addressbook instead of the index, add public functions getItemShared(With)BySource() for contacts app
2012-07-03 11:11:01 -04: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
Michael Gapczynski
77b582e4e6
Change getItems() return to a 3-dimensional array to handle multiple shares of the same item
2012-07-02 15:29:34 -04: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
Michael Gapczynski
dd56416a39
Remove the method getItemsSharedStatuses, it is easy enough to just pass the format instead
2012-07-02 14:23:13 -04:00
Lukas Reschke
90331a3fa1
Remove forced download
2012-07-02 12:20:43 +02:00
Lukas Reschke
0465129eba
Remove the forced download§
2012-07-02 12:19:48 +02:00
Lukas Reschke
47bad20132
Restoring stable4...
2012-07-02 10:47:45 +02:00
Lukas Reschke
e29681e233
Applying the fix
2012-07-02 10:29:04 +02:00
Lukas Reschke
5223724809
Wrong file - Sorry!
2012-07-02 10:28:11 +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
4235ce0b63
Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4
2012-07-02 10:22:33 +02:00
Lukas Reschke
134d5d93c8
Don't display error messages
2012-07-02 10:21:38 +02:00
Georg Ehrke
8b5cae3c6c
fix a small PHP fail
2012-07-01 21:50:53 +02:00
Lukas Reschke
fa7d4c2b39
Disable mimesniffing
2012-07-01 13:53:06 +02:00
Lukas Reschke
4e63981da9
Disable mimesniffing
2012-07-01 13:45:20 +02:00
Michael Gapczynski
3e8a34f906
Don't select all columns for FORMAT_STATUSES
2012-06-30 21:15:10 -04:00
Michael Gapczynski
c073216d8d
Don't overwrite the item variable when checking if the item is already shared
2012-06-30 20:57:31 -04: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
Michael Gapczynski
75c111a33b
Have getItems() return an empty array instead of false, so apps only need to do an array_merge()
2012-06-30 18:00:01 -04:00
Michael Gapczynski
7a649fc65a
Switch back to registering just the class and not the object, better for performance
2012-06-30 17:25:21 -04: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
45e964c7aa
Return login errors for PostgreSQL setup
2012-06-27 20:25:46 -04: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
Michael Gapczynski
cb19fdd55b
Show users and groups shared with in dropdown
2012-06-27 01:05:37 +02:00
Michael Gapczynski
d95d738723
Fix FORMAT_STATUSES
2012-06-27 01:05:36 +02:00
Michael Gapczynski
9fdfcc29fe
Fix group sharing
2012-06-27 01:05:36 +02:00
Bart Visscher
d332e1e9c1
Documentation fix
2012-06-27 01:05:36 +02:00
Michael Gapczynski
c41cb192c9
Fix which line needs '' wrapped around the array values
2012-06-27 01:05:36 +02:00
Michael Gapczynski
243faf6334
Fix searching for parent item types, search for file source instead of item source for the file item type in case the item was converted
2012-06-27 01:05:36 +02:00
Michael Gapczynski
32f9901bcd
Fix retrieving supported file extensions from backend and remove the dependsOn and supportedFileExtensions parameters from registerBackend()
2012-06-27 01:05:36 +02:00
Michael Gapczynski
28b7793d5b
Fixes and change database table from sharing to share
2012-06-27 01:05:36 +02:00
Michael Gapczynski
f21fdf14f9
Forgot I got rid of the class field backendTypes, use the array keys of the backends field instead
2012-06-27 01:05:36 +02:00
Michael Gapczynski
bc68f14c4b
Prepare drop down UI for share API
2012-06-27 01:05:36 +02:00
Michael Gapczynski
8198114615
Some more changes to getItems() and fixes in shared storage
2012-06-27 01:05:36 +02:00
Michael Gapczynski
5f1aa1b92e
Fix additional getItems calls due to parameter change
2012-06-27 01:05:36 +02:00
Michael Gapczynski
71350bc618
I'm having trouble making up my mind... translateItem -> getItems() -> formatItems(). It may change again. Preparing shared storage for new api.
2012-06-27 01:05:36 +02:00
Michael Gapczynski
10986f00dc
Use share type and share with in db instead of separate columns for user and group
2012-06-27 01:05:36 +02:00
Michael Gapczynski
bd8769a7c5
Fixes for registering and fetching backends
2012-06-27 01:05:36 +02:00
Michael Gapczynski
c7e0449a75
Finish parent folder implementation, change recursive delete process
2012-06-27 01:05:36 +02:00
Michael Gapczynski
0cc7ae904d
Initial work on a share API
2012-06-27 01:05:36 +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
Frank Karlitschek
d163fe02cd
4.0.4
2012-06-26 21:51:32 +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
Thomas Tanghus
b1f3364eee
Maybe fix out of memory..?
2012-06-25 19:42:38 +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
Frank Karlitschek
ac358ed1b3
4.0.3a
...
Two important fixes after 4.0.3
2012-06-24 11:38:54 +02:00
Robin Appelman
44e36ecf49
fix 'files' entries showing up in Files before the users files are scanned properly
2012-06-23 23:42:54 +02:00
Robin Appelman
f1e4c845ce
fix duplicates showing up in the filecache
2012-06-23 23:32: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
a8868fa007
work with non existing apps directory. thanks toAntonio for the hint
2012-06-23 16:20:31 +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
Brice Maron
33165e3915
Do not close php tag on config file
2012-06-22 21:01:12 +00:00
Brice Maron
b5e3e150eb
Correction of path looking for apps and css
2012-06-22 20:58:52 +00:00
Georg Ehrke
243f910ae4
Merge branch 'master' into oc_error
2012-06-22 21:37:03 +02:00
Bart Visscher
ebfc5b2762
Add compatability function for APC cache
2012-06-22 17:21:57 +02:00
Bart Visscher
f655981baf
Fix initialization of OC_Filesystem setup from DAV
2012-06-22 17:21:56 +02:00
Bart Visscher
50667dcb82
Convert OC_L10N_String to a string in OC_JSON::encodedPrint
2012-06-22 17:21:56 +02:00
Bart Visscher
432aa58bab
Spelling fixes
2012-06-22 17:21:56 +02:00
Bart Visscher
60f558cdbb
Fix initialization of OC_Filesystem setup from DAV
2012-06-22 17:20:10 +02:00
Brice Maron
2d2366bb57
Avoid fetch ocs info if the appstore is disabled
2012-06-22 16:06:46 +02:00
Brice Maron
06e20fe4b8
Correct css inclusion with minimizer
2012-06-22 15:21:44 +02:00
Brice Maron
115c30bdb4
Enhance hint about writable app directory
2012-06-22 13:57:54 +02:00
Brice Maron
8c2803a7c1
Correct image path and apps path replacement
2012-06-22 13:12:03 +02:00
Brice Maron
72fe463f7f
Correct OC_Config writer. Use var_export (has support for array,...)
2012-06-22 12:46:21 +02:00
Brice Maron
df60d6d5d2
Fixes for multi app dir :
...
Url should be given as relative path (to webroot)
Correct link construction from js
2012-06-22 12:24:56 +02:00
Brice Maron
e5d458c068
Correct File cache error with postgresql
2012-06-22 10:46:49 +02:00
Thomas Mueller
ba2d203a54
some path fixes for multi-dir app
2012-06-22 09:56:54 +02:00
Frank Karlitschek
ca6339c480
4.0.3
2012-06-22 09:25:41 +02:00
Brice Maron
b5953e7a83
Provide solution for smoother migration for apps to multi-app dir
2012-06-21 22:22:36 +00:00
Brice Maron
f46623da6c
Do not search apps if oc is not yet installed
2012-06-21 21:29:18 +00:00
Bart Visscher
bae592d69b
Prefer requested app before redirecting to default page
2012-06-21 20:15:23 +02:00
Bart Visscher
a7e427a3cc
Remember result of OC_User::isLoggedIn, can be very expensive to check
2012-06-21 20:14:53 +02:00
Bart Visscher
8aa7ed39a5
Only check for apps owncloud version requirment when there is a new owncloud version
2012-06-21 20:13:30 +02:00
Brice Maron
a5938e4e37
Merge branch 'master' into multi_app_dir
2012-06-21 20:19:31 +00:00
Brice Maron
84b9ac2678
Correct writable check for app dir
2012-06-21 19:35:34 +00:00
Brice Maron
d22f805b63
Correct inclusion paths
2012-06-21 19:19:39 +00:00
Brice Maron
e5c56b2433
Merge branch 'master' into multi_app_dir
...
Conflicts:
lib/app.php
lib/base.php
lib/minimizer/css.php
lib/minimizer/js.php
lib/template.php
lib/util.php
2012-06-21 17:15:35 +00:00
Sam Tuke
a9a913c273
Implemented deleteAll() method in OC_FilesystemView (interface) and OC_Filestorage_Common (logic)
...
Made OC_Filestorage_Local and OC_Filestorage_Shared extend OC_Filestorage_Common
Set searchInDir() to protected instead of private in OC_Filestorage_Local and OC_Filestorage_Shared
Added class documentation to OC_Filestorage_Common
Cleaned up OCA_Versions::expireAll()
2012-06-21 18:15:22 +01:00
Robin Appelman
56de98ed8c
fix saved file size for uploaded files
2012-06-21 18:22:18 +02:00
Robin Appelman
da9107fe69
fix saved file size for uploaded files
2012-06-21 18:07:56 +02:00
Robin Appelman
7b4cb44af8
truncate decrypted files based on size
2012-06-21 17:51:54 +02:00
Robin Appelman
d0455c5819
truncate decrypted files based on filelength
2012-06-21 17:38:00 +02:00
Frank Karlitschek
5212fa3fa7
check if the data directory is accessible via http. Show a big security warning if yes
2012-06-21 14:18:43 +02:00
Frank Karlitschek
e95055b2bd
check if the data directory is accessible via http. Show a big security warning if yes
2012-06-21 14:07:04 +02:00
Georg Ehrke
96d0b9834a
fix mimetype for cdr files - bugfix for oc 559
2012-06-21 09:58:38 +02:00
Georg Ehrke
43674b1759
fix mimetype for cdr files - bugfix for oc 559
2012-06-21 09:58:04 +02:00
Georg Ehrke
4d312f7849
Merge branch 'master' into oc_error
2012-06-21 09:08:38 +02:00
Michael Gapczynski
cc3835d657
Only call OC_FileCache::get('/Shared') if it exists in the file cache, prevents premature addition of the Shared folder to the file cache
...
Conflicts:
lib/fileproxy/quota.php
2012-06-20 19:39:17 -04:00
Michael Gapczynski
6524f6ad30
Only call OC_FileCache::get('/Shared') if it exists in the file cache, prevents premature addition of the Shared folder to the file cache
2012-06-20 19:24:45 -04:00
Robin Appelman
9ba467d629
fix encryption for binary files
2012-06-20 20:18:42 +02:00
Robin Appelman
e3f1507374
use absolute path for file proxies
2012-06-20 20:18:41 +02:00
Georg Ehrke
7d0d1ebd4f
Merge branch 'master' into oc_error
2012-06-20 20:14:15 +02:00
Sam Tuke
72215a818d
added new user settings interface for deleting old file versions
...
fixed OCA_VersionsexpireAll() to use native PHP readdir()
removed local storage implementation of readdir()
2012-06-20 18:25:12 +01:00
Sam Tuke
d6bf62ea4e
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-20 16:26:02 +01:00
Sam Tuke
c244daac89
removed readdir to fix bug oc-1054
2012-06-20 16:24:49 +01:00
Bart Visscher
0086639891
Merge branch 'audit'
2012-06-20 17:20:39 +02:00
Bart Visscher
7a3d606cac
Prefer requested app before redirecting to default page
2012-06-20 17:10:49 +02:00
Bart Visscher
6404476bec
Delay setup of FS until OC_Filesystem is used
2012-06-20 17:10:49 +02:00
Bart Visscher
5c8e774cea
Small code reorder
2012-06-20 17:10:48 +02:00
Bjoern Schiessle
902c649dad
use new sanitize HTML function backported
...
Conflicts:
lib/template.php
2012-06-20 16:59:51 +02:00
Bjoern Schiessle
d9607df26f
backport of sanitizeHTML() function
2012-06-20 16:43:31 +02:00
Bjoern Schiessle
6644511124
remove unnecessary comment
2012-06-20 16:29:19 +02:00
Georg Ehrke
a054541df4
Merge branch 'master' into oc_error
2012-06-20 13:29:17 +02:00
Robin Appelman
c4d1363419
don't show other users file if the filesystem is not index already
2012-06-20 11:35:45 +02:00
Robin Appelman
13a9ef36fb
don't show other users file if the filesystem is not index already
2012-06-20 11:34:17 +02:00
Bart Visscher
0524f6fd3c
Fix webdav property name compare
2012-06-19 23:18:07 +02:00
Bart Visscher
2d4e1b45ce
Load app before running update script
2012-06-19 23:17:40 +02:00
Bart Visscher
cff1b6e699
Don't use substr to get first char of string
2012-06-19 23:16:17 +02:00
Bart Visscher
bb649dd0d5
Smarter code for OC_FileProxy
...
Conflicts:
lib/fileproxy.php
2012-06-19 23:15:33 +02:00
Bart Visscher
598a090db4
Add cache for getStorage and getInternalPath functions.
...
These are called for almost every file operation.
2012-06-19 23:13:24 +02:00
Bart Visscher
e728635c8a
Add stat cache to OC_Connector_Sabre_Node and OC_Connector_Sabre_File
...
Speeds up access of directories with large number of files.
2012-06-19 23:13:21 +02:00
Bart Visscher
98bc916016
Make check for writable apps dir configurable
...
Conflicts:
config/config.sample.php
2012-06-19 23:11:14 +02:00
Bart Visscher
f54ef5a464
Remove OC::$CONFIG_DATADIRECTORY, not used
2012-06-19 22:54:14 +02:00
Bart Visscher
d8b32c2f0e
Move check code from setupFS to checkServer
2012-06-19 22:54:13 +02:00
Thomas Mueller
637f8398ba
fixes oc-668
2012-06-19 22:37:25 +02:00
Sam Tuke
28a72e0e3c
Fixed deleteAll function for deleting all old versions of files (expireAll)
...
Added new readdir() method to all storage classes and handlers (only working implementation in local.php)
2012-06-19 19:42:40 +01:00
Bjoern Schiessle
f11e4d7cd6
removing sanitizeHTML() function from template.php since I moved it to util.php
...
to make it more generic.
2012-06-19 19:29:43 +02:00
Bart Visscher
4b6f6291c5
Remember result of OC_User::isLoggedIn, can be very expensive to check
2012-06-19 17:54:19 +02:00
Bjoern Schiessle
089ae980c4
use new sanitize HTML function
2012-06-19 17:24:55 +02:00
Bjoern Schiessle
d2936bd90c
introducing a sanitize HTML function for the internal and the public API. This
...
allows to easily convert strings to HTML before displaying them on the web page
to reduce the risk of xss vulnerabilities.
2012-06-19 17:20:19 +02:00
Georg Ehrke
ccacb6f918
Merge branch 'master' into oc_error
2012-06-19 11:30:18 +02:00
Bjoern Schiessle
1b142a1155
quota calculation fixed
2012-06-19 09:36:50 +02:00
Bjoern Schiessle
0469f529fa
quota calculation fixed
2012-06-19 09:35:13 +02:00
Victor Dubiniuk
db7542b640
Reverting 249190c89b
. Fixed in master
2012-06-19 00:56:48 +03:00
Thomas Mueller
c1df0539a0
fixes oc-668
2012-06-18 23:33:02 +02:00
Victor Dubiniuk
249190c89b
Fix mime-type detection
2012-06-19 00:20:33 +03:00
Bart Visscher
d4044d0283
Delay loading of translations until they are used
2012-06-18 23:07:32 +02:00
Brice Maron
cfb3b633f5
Force sanitize function to use UTF8 (for php lower than 5.4)
2012-06-18 19:52:05 +00:00
Bjoern Schiessle
92bb59c95d
fixed broken function call
2012-06-18 17:30:21 +02:00
Bjoern Schiessle
814cab97cf
ignore "Shared"-directory when calculating free space
...
Conflicts:
lib/fileproxy/quota.php
2012-06-18 17:27:42 +02:00
Bjoern Schiessle
e6384251eb
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-18 17:25:00 +02:00
Bjoern Schiessle
d496a5e19f
ignore "Shared"-directory when calculating free space
2012-06-18 17:23:54 +02:00
Georg Ehrke
6bd0a158f7
Merge branch 'master' into oc_error
2012-06-18 15:59:39 +02:00
Bart Visscher
2f00384b51
Use TemplateLayout functions for finding js and css files in minimizer
2012-06-18 15:40:48 +02:00
Bart Visscher
3000e8f9d5
Prepare template js and css functions for use in the js and css minimizers
2012-06-18 15:40:48 +02:00
Bart Visscher
180243d92a
Move page layout handling to its own class
2012-06-18 15:40:48 +02:00
Bart Visscher
332603a263
Move formfactor code to OC_Template
2012-06-18 15:40:48 +02:00
Georg Ehrke
e31c9a7b6f
Merge branch 'master' into oc_error
2012-06-18 14:34:49 +02:00
Bart Visscher
977cd0df6b
Fix errors for minimizer
2012-06-18 11:33:24 +02:00
Bart Visscher
a5a1a9fd4a
Forgot a file
2012-06-18 11:12:53 +02:00
Bart Visscher
617de811f7
Cache the minimized output also on the server
2012-06-18 11:11:46 +02:00
Georg Ehrke
06c610c2ee
Merge branch 'master' into oc_error
2012-06-17 08:36:33 +02:00
Robin Appelman
549541215e
get the correct metadate from updated folders to put in the cache
2012-06-17 02:15:11 +02:00
Michael Gapczynski
e8dd86ce0d
Revert "Set default charset to utf-8."
...
This reverts commit 709dbd82a6
.
2012-06-16 19:48:03 -04:00
Robin Appelman
b38e46276f
when checking if the content of a folder has been updated, exlicitly state that we are checking a folder
...
solves some issues with external storages not updating correctly
2012-06-17 01:31:57 +02:00
Bart Visscher
6f93176a4b
Be smarter when checking single app language availability
2012-06-16 20:52:10 +02:00
Bart Visscher
6e9cd63fa1
Only check for apps owncloud version requirment when there is a new owncloud version
2012-06-16 20:52:10 +02:00
Georg Ehrke
12f6205fa8
Merge branch 'master' into oc_error
2012-06-16 17:10:53 +02:00
Thomas Tanghus
709dbd82a6
Set default charset to utf-8.
2012-06-16 17:01:12 +02:00
Georg Ehrke
14f6d4dcba
Merge branch 'master' into oc_error
2012-06-16 09:35:57 +02:00
Tom Needham
c1744d2eb6
Move user import to personal settings. Fix user migration between servers.
2012-06-15 23:17:31 +00:00
Tom Needham
8484e16516
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-15 23:14:48 +00:00
Tom Needham
e37ef6dd47
Move user import to personal settings. Fix user migration between servers.
2012-06-15 23:14:40 +00:00
Bart Visscher
6d3ae575b6
Remove $DOCUMENTROOT, not used
2012-06-16 00:11:36 +02:00
Bart Visscher
e11c5a23d5
Optimize WebDav access by preloading dav custom properties
2012-06-15 21:21:42 +02:00
Bart Visscher
e905b14758
Spelling fix
2012-06-15 21:21:42 +02:00
Bart Visscher
463a506fcb
Fix webdav property name compare
2012-06-15 21:21:42 +02:00
Bart Visscher
27efdbd58f
Use setter for FileinfoCache
2012-06-15 21:21:42 +02:00
Georg Ehrke
2c8a61ae9c
Merge branch 'master' into oc_error
2012-06-15 20:48:37 +02:00
Robin Appelman
f06c08a637
cleanup oc_filecache, splitting it in several parts and using the new hasUpdated
2012-06-15 19:56:15 +02:00
Robin Appelman
a9a424a519
also add hasUpdated to oc_filesystem and oc_filesystemview
2012-06-15 17:42:39 +02:00
Robin Appelman
449760f665
add hasUpdated to oc_filestorage
2012-06-15 16:43:24 +02:00
Bart Visscher
400769ab40
Optimize WebDav access using OC_FileCache
2012-06-15 16:04:07 +02:00
Bart Visscher
2b228fba34
Load app before running update script
2012-06-15 11:18:44 +02:00
Bart Visscher
0d3f5f736f
Disable minizing when DEBUG is true
2012-06-15 11:18:44 +02:00
Brice Maron
4753cc3ebd
Merge branch 'master' into multi_app_dir
...
Conflicts:
apps/bookmarks/ajax/addBookmark.php
config/config.sample.php
lib/app.php
remote.php
2012-06-14 21:16:59 +00:00
Brice Maron
6da5a2fdd4
Add possibility to choose the installation folder
2012-06-14 21:00:02 +00:00
Thomas Tanghus
625cd822c3
Backport CSRF prevention.
2012-06-14 13:52:22 +02:00
Thomas Tanghus
8fd9cbcc54
White-space fix.
2012-06-14 13:23:12 +02:00
Thomas Tanghus
a34db3fbe0
Don't add slash if it's there already.
2012-06-14 13:23:12 +02:00
Bart Visscher
12b34d2dda
Whitespace fix
2012-06-13 21:39:12 +02:00
Michael Gapczynski
b5889d6ffe
Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127
...
Conflicts:
apps/files_external/templates/settings.php
lib/template.php
2012-06-13 15:17:46 -04:00
Thomas Tanghus
9e7c28835b
Allow same host redirects (/somepath).
2012-06-13 18:32:07 +02:00
Thomas Tanghus
89464721c7
Added JSON methods for CSRF prevention. Make request token accessible from template and add js var.
2012-06-13 17:33:19 +02:00
Frank Karlitschek
9e9c40eabd
fix time call
2012-06-13 17:27:49 +02:00
Georg Ehrke
9f82edc157
Merge branch 'master' into oc_error
2012-06-13 15:30:04 +02:00
Bartek Przybylski
db1353655b
check for view before trying to invoke method on object
2012-06-13 00:32:44 +02:00
Thomas Mueller
521294d0bf
fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-987
2012-06-12 23:16:26 +02:00
Michael Gapczynski
790ae70e32
Create directory for mount point if it doesn't already exist
2012-06-12 15:25:34 -04:00
Lukas Reschke
2b22c538c8
Make some apps compatible
2012-06-11 19:07:51 +02:00
Lukas Reschke
6d68b7620c
Check for string
2012-06-11 18:12:46 +02:00
Thomas Tanghus
2ee809fd86
Allow same host redirects (/somepath).
2012-06-11 15:21:37 +02:00
Lukas Reschke
18e44ba2f3
Some updates...
2012-06-11 15:03:45 +02:00
Lukas Reschke
b63795ccb8
Handling arrays
2012-06-11 14:36:11 +02:00
Lukas Reschke
c009bc4b87
Revert
2012-06-11 13:27:32 +02:00
Lukas Reschke
6817a6b102
First try of implementing assignHTML
2012-06-11 12:45:07 +02:00
Frank Karlitschek
cd16c5e479
implement a simple request token session garbage collector
2012-06-11 12:13:08 +02:00
Thomas Tanghus
a21fd725d6
Categories: Turned the debugging down a bit.
2012-06-11 03:07:20 +02:00
Thomas Tanghus
1cb1980d62
Categories: Turned the debugging down a bit.
2012-06-11 03:05:33 +02:00
Michael Gapczynski
3c57fb935b
Mount personal mount points into filesystem
2012-06-10 16:34:44 -04:00