Tom Needham
9626d9ce31
Code cleanup and add copyright info
2012-12-31 16:08:21 +00:00
Tom Needham
6eb194b702
Merge branch 'master' into ocs_api
...
Conflicts:
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
2012-12-31 15:47:15 +00:00
Tom Needham
218a5ea890
Remove unused methods
2012-12-31 14:16:29 +00:00
Michael Gapczynski
aea8b0ff5c
Merge branch 'filesystem' into filesystem-etags
...
Conflicts:
lib/files/cache/updater.php
2012-12-30 21:26:48 -05:00
Michael Gapczynski
96e08a1d96
Fix function name
2012-12-30 21:23:17 -05:00
Michael Gapczynski
3ee3323b87
Fix retrieving of cache and scanner in Updater class
2012-12-30 20:27:38 -05:00
Michael Gapczynski
77f12c526b
Update etags in parent folders
2012-12-30 19:54:51 -05:00
Michael Gapczynski
83064aca51
Remove old etag code
2012-12-30 19:23:31 -05:00
Michael Gapczynski
a5cb7363a5
Use etags from file cache in SabreDAV connector
2012-12-30 19:18:05 -05:00
Jenkins for ownCloud
329bddab48
[tx-robot] updated from transifex
2012-12-31 00:05:31 +01:00
Michael Gapczynski
2c23e143d3
Store etags in the file cache
2012-12-30 16:32:55 -05:00
Jenkins for ownCloud
66e57f5fb1
[tx-robot] updated from transifex
2012-12-30 00:05:52 +01:00
Michael Gapczynski
7980bccaab
Fall back to default log file if logfile config file not found, suppress writing errors, fixes issue #826
2012-12-29 19:30:31 +00:00
Michael Gapczynski
cfc3526b25
Fix data for shared root folder
2012-12-29 11:45:13 -05:00
Michael Gapczynski
8bdfb04056
Fix shared folders
2012-12-28 15:06:12 -05:00
Jenkins for ownCloud
e9c51b319e
[tx-robot] updated from transifex
2012-12-28 00:20:34 +01:00
Michael Gapczynski
b035626709
Retrieve storage correctly, filename is not the mountpoint
2012-12-27 16:53:32 -05:00
Michael Gapczynski
65f1e52107
Change old is_readable to isReadable, fixes downloads
2012-12-27 15:49:48 -05:00
Jenkins for ownCloud
27f9ea2abb
[tx-robot] updated from transifex
2012-12-27 00:05:17 +01:00
Michael Gapczynski
1910057900
Fix shared statuses inside folders
2012-12-26 16:20:10 -05:00
Michael Gapczynski
b4515d874e
Only folders have Create permission
2012-12-26 15:36:50 -05:00
Robin Appelman
7e36f730ec
merge master into filesystem
2012-12-25 14:29:29 +01:00
Jenkins for ownCloud
7d52c39419
[tx-robot] updated from transifex
2012-12-24 00:12:16 +01:00
Frank Karlitschek
15da11effe
Merge pull request #845 from owncloud/sqlite_error
...
Try to fix #836
2012-12-22 15:22:09 -08:00
Thomas Müller
986f5d9f3e
fixing variable name
2012-12-21 00:04:58 +01:00
Thomas Müller
39d874cd90
the maximum upload size is now part of the response of the upload and delete operation.
...
the maximum upload size is updated within the browser once an upload or delete operation has been finished
2012-12-20 17:16:53 +01:00
irgsmirx
1e3231c732
Update lib/util.php
...
getUrlContent should take proxy setting into consideration when not using curl, as well
2012-12-20 12:01:11 +01:00
Thomas Müller
7d811e57e6
setting the timezone is now part of the login process and true part of the core.
2012-12-20 11:10:45 +01:00
root
a64a923d56
call it "proxy" instead of "curlproxy"
...
Thanks Bart for the hint.
This also switches "==" to "<>" and not the code actually works ;-)
2012-12-19 18:50:19 +01:00
Frank Karlitschek
f012135992
make it more readable as deepdiver suggested
2012-12-19 18:50:19 +01:00
Frank Karlitschek
019da9943a
add curl proxy support. Fixes #504
...
https://github.com/owncloud/core/issues/504
2012-12-19 18:50:19 +01:00
Frank Karlitschek
b162e72f94
Merge pull request #961 from owncloud/check_locale
...
add a check and a warning if setlocale is working
2012-12-19 08:53:43 -08:00
Frank Karlitschek
d7fbe47583
Merge pull request #868 from owncloud/new_doc_system
...
New doc system
2012-12-19 06:40:37 -08:00
Frank Karlitschek
196f1c3786
add a check and a warning if setlocale is working
2012-12-19 15:10:33 +01:00
Thomas Mueller
186147d1ee
refs #933 send content length header - this will allow the browser to show the progressbar
2012-12-19 11:22:01 +01:00
Randolph Carter
d2828bab07
fixes default email sender address
2012-12-19 01:09:14 +01:00
Jenkins for ownCloud
a4b0df419e
[tx-robot] updated from transifex
2012-12-18 00:14:58 +01:00
Jörn Friedrich Dreyer
b6eb95349e
fix utf8 filenames in ie download response header according to rfc5987, see http://stackoverflow.com/questions/93551/how-to-encode-the-filename-parameter-of-content-disposition-header-in-http
2012-12-17 16:46:07 +01:00
Michael Gapczynski
39eebebd99
Fall back to default log file if logfile config file not found, suppress writing errors, fixes issue #826
2012-12-16 19:43:32 -05:00
Tom Needham
3c98f36121
Merge branch 'master' into ocs_api
2012-12-16 22:29:00 +00:00
Robin Appelman
4301cd7f61
wrap hooks into a try, catch to prevent a faulty app from crashing the request
2012-12-16 20:29:36 +01:00
Michael Gapczynski
bf05ff351f
Initial support for file sharing with filesystem branch
2012-12-15 19:44:59 -05:00
Robin Appelman
b12abb2c94
use numeric ids for storages in the filecache
2012-12-15 23:35:07 +01:00
Michael Gapczynski
8951769cae
Check sub storage isn't null or false
2012-12-15 17:16:26 -05:00
Tom Needham
39b5199775
API: PUT and DELETE variables are now accessed from the parameters array
2012-12-15 12:37:44 +00:00
Robin Appelman
cf3665057c
make sure folders that are not fully scanned are at least shallow scanned when we open them
...
the fact that they are in the cache does not mean they are scanned
2012-12-15 03:21:39 +01:00
Robin Appelman
4be039e6cb
Filecache Watcher: use scan or scanFile based on the current item, not the cached item
2012-12-15 03:10:56 +01:00
Robin Appelman
bc52f12162
dont insert and entry in the filecache during upgrade if the id already exists in the filecache
...
most likely the result from an incompelte upgrade
2012-12-15 02:29:34 +01:00
Robin Appelman
c6a5ce54a7
these functions should be static
2012-12-15 02:22:09 +01:00
Robin Appelman
946d58eaa8
merge master into filesystem
2012-12-15 02:21:26 +01:00
Bart Visscher
df7d6cb26c
More style fixes
2012-12-15 00:43:46 +01:00
Bart Visscher
68562dafb4
More whitespace fixes
2012-12-15 00:43:46 +01:00
Bart Visscher
2ef2dc4dda
Fix "There must be a single space between the closing parenthesis and the opening brace"
2012-12-15 00:43:46 +01:00
Bart Visscher
85bd28c508
Fix some of "Closing brace must be on a line by itself"
2012-12-15 00:43:46 +01:00
Bart Visscher
f39454ed12
Fix "Line indented incorrectly"
2012-12-15 00:43:46 +01:00
Bart Visscher
8256650da8
Fix "No space found after comma in function call"
2012-12-15 00:43:46 +01:00
Tom Needham
5fe6129698
Merge master into ocs_api, fix conflicts.
2012-12-14 15:15:05 +00:00
Arthur Schiwon
627da205b3
implement getCurrentUser in Sabre Auth Connector, fixes #508
2012-12-14 01:06:09 +01:00
Arthur Schiwon
4466e06e7d
use username, not passed loginname, might differ
2012-12-14 01:06:00 +01:00
Frank Karlitschek
79b8d67627
remove PgeNavi. It's no longer used
2012-12-13 19:26:05 +01:00
blizzz
680ff3a51b
Merge pull request #584 from wardragon/ldap_access_userExists_fix
...
Really fix OCP\Share::shareItem with LDAP users
2012-12-12 16:59:43 -08:00
Tom Needham
1475ff63dd
API: Add check to see if the user is authorised to run the api method
2012-12-12 21:04:23 +00:00
Tom Needham
228a75ebaa
API: Include totalitems and itemsperpage meta data when needed.
2012-12-12 20:58:40 +00:00
Thomas Mueller
84420035df
throwing InsufficientStorage in case the quota is reached
2012-12-12 20:09:57 +01:00
Tom Needham
3cc3405536
API: Remove old code. Move remaining methods to OC_OCS_Result.
2012-12-12 18:06:07 +00:00
Sam Tuke
063f225a26
Merge branch 'master' into files_encryption
...
Encryption unit tests still failing, needs work
Conflicts:
3rdparty/Archive/Tar.php
3rdparty/MDB2/Driver/Datatype/Common.php
3rdparty/MDB2/Driver/mysql.php
3rdparty/Sabre/CalDAV/CalendarQueryValidator.php
3rdparty/Sabre/CalDAV/Plugin.php
3rdparty/Sabre/CalDAV/Version.php
3rdparty/Sabre/CardDAV/AddressBook.php
3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
3rdparty/Sabre/CardDAV/Plugin.php
3rdparty/Sabre/CardDAV/Version.php
3rdparty/Sabre/DAV/Client.php
3rdparty/Sabre/DAV/Locks/Plugin.php
3rdparty/Sabre/DAV/Server.php
3rdparty/Sabre/DAV/Tree/Filesystem.php
3rdparty/Sabre/DAV/Version.php
3rdparty/Sabre/HTTP/BasicAuth.php
3rdparty/Sabre/HTTP/Version.php
3rdparty/Sabre/VObject/Component/VEvent.php
3rdparty/Sabre/VObject/DateTimeParser.php
3rdparty/Sabre/VObject/RecurrenceIterator.php
3rdparty/Sabre/VObject/Version.php
3rdparty/class.phpmailer.php
3rdparty/class.smtp.php
3rdparty/css/chosen-sprite.png
3rdparty/css/chosen.css
3rdparty/css/chosen/chosen.css
3rdparty/fullcalendar/css/fullcalendar.css
3rdparty/fullcalendar/css/fullcalendar.print.css
3rdparty/fullcalendar/js/fullcalendar.js
3rdparty/fullcalendar/js/fullcalendar.min.js
3rdparty/fullcalendar/js/gcal.js
3rdparty/js/chosen/VERSION
3rdparty/js/chosen/chosen.jquery.js
3rdparty/js/chosen/chosen.jquery.min.js
3rdparty/openid/class.openid.v3.php
3rdparty/openid/phpmyid.php
3rdparty/php-cloudfiles/cloudfiles.php
3rdparty/smb4php/smb.php
3rdparty/timepicker/css/jquery.ui.timepicker.css
3rdparty/timepicker/js/i18n/i18n.html
3rdparty/timepicker/js/i18n/jquery.ui.timepicker-de.js
3rdparty/timepicker/js/i18n/jquery.ui.timepicker-ja.js
3rdparty/timepicker/js/jquery.ui.timepicker.js
3rdparty/timepicker/releases.txt
README
apps/files/admin.php
apps/files/ajax/autocomplete.php
apps/files/ajax/move.php
apps/files/ajax/newfile.php
apps/files/ajax/scan.php
apps/files/ajax/timezone.php
apps/files/ajax/upload.php
apps/files/appinfo/filesync.php
apps/files/appinfo/update.php
apps/files/css/files.css
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/es_AR.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/lv.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/oc.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/ru_RU.php
apps/files/l10n/si_LK.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/vi.php
apps/files/l10n/zh_CN.GB2312.php
apps/files/l10n/zh_CN.php
apps/files/l10n/zh_TW.php
apps/files/templates/admin.php
apps/files/templates/index.php
apps/files/templates/part.breadcrumb.php
apps/files/templates/part.list.php
apps/files_encryption/appinfo/app.php
apps/files_encryption/appinfo/info.xml
apps/files_encryption/js/settings.js
apps/files_encryption/l10n/fa.php
apps/files_encryption/l10n/sl.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/cryptstream.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/settings.php
apps/files_encryption/templates/settings.php
apps/files_encryption/tests/encryption.php
apps/files_encryption/tests/proxy.php
apps/files_encryption/tests/stream.php
apps/files_external/l10n/cs_CZ.php
apps/files_external/l10n/et_EE.php
apps/files_external/l10n/lt_LT.php
apps/files_external/l10n/nl.php
apps/files_external/l10n/ru.php
apps/files_external/l10n/sk_SK.php
apps/files_external/l10n/sl.php
apps/files_external/l10n/vi.php
apps/files_external/lib/config.php
apps/files_external/lib/ftp.php
apps/files_external/lib/smb.php
apps/files_external/lib/streamwrapper.php
apps/files_external/lib/swift.php
apps/files_external/lib/webdav.php
apps/files_external/tests/ftp.php
apps/files_sharing/appinfo/update.php
apps/files_sharing/css/public.css
apps/files_sharing/js/share.js
apps/files_sharing/l10n/de.php
apps/files_sharing/l10n/et_EE.php
apps/files_sharing/l10n/ja_JP.php
apps/files_sharing/l10n/nb_NO.php
apps/files_sharing/l10n/ru.php
apps/files_sharing/l10n/sl.php
apps/files_sharing/l10n/vi.php
apps/files_sharing/lib/share/file.php
apps/files_sharing/lib/share/folder.php
apps/files_sharing/lib/sharedstorage.php
apps/files_sharing/public.php
apps/files_sharing/templates/public.php
apps/files_versions/l10n/et_EE.php
apps/files_versions/l10n/lt_LT.php
apps/files_versions/l10n/nb_NO.php
apps/files_versions/l10n/nl.php
apps/files_versions/l10n/ru.php
apps/files_versions/l10n/sl.php
apps/files_versions/l10n/vi.php
apps/files_versions/lib/hooks.php
apps/files_versions/lib/versions.php
apps/user_ldap/appinfo/database.xml
apps/user_ldap/appinfo/update.php
apps/user_ldap/group_ldap.php
apps/user_ldap/l10n/da.php
apps/user_ldap/l10n/et_EE.php
apps/user_ldap/l10n/pt_PT.php
apps/user_ldap/l10n/sl.php
apps/user_ldap/l10n/vi.php
apps/user_ldap/l10n/zh_CN.php
apps/user_ldap/lib/access.php
apps/user_ldap/lib/connection.php
apps/user_ldap/settings.php
apps/user_ldap/templates/settings.php
apps/user_ldap/tests/group_ldap.php
apps/user_ldap/user_ldap.php
apps/user_webdavauth/appinfo/app.php
apps/user_webdavauth/appinfo/info.xml
apps/user_webdavauth/settings.php
apps/user_webdavauth/templates/settings.php
apps/user_webdavauth/user_webdavauth.php
autotest.sh
core/ajax/appconfig.php
core/ajax/share.php
core/ajax/translations.php
core/ajax/vcategories/add.php
core/ajax/vcategories/delete.php
core/ajax/vcategories/edit.php
core/css/share.css
core/js/eventsource.js
core/js/js.js
core/js/oc-vcategories.js
core/js/share.js
core/l10n/ar.php
core/l10n/bg_BG.php
core/l10n/ca.php
core/l10n/cs_CZ.php
core/l10n/da.php
core/l10n/de.php
core/l10n/el.php
core/l10n/eo.php
core/l10n/es.php
core/l10n/es_AR.php
core/l10n/et_EE.php
core/l10n/eu.php
core/l10n/fa.php
core/l10n/fi_FI.php
core/l10n/fr.php
core/l10n/gl.php
core/l10n/he.php
core/l10n/hi.php
core/l10n/hr.php
core/l10n/hu_HU.php
core/l10n/ia.php
core/l10n/id.php
core/l10n/it.php
core/l10n/ja_JP.php
core/l10n/ko.php
core/l10n/ku_IQ.php
core/l10n/lb.php
core/l10n/lt_LT.php
core/l10n/lv.php
core/l10n/mk.php
core/l10n/ms_MY.php
core/l10n/nb_NO.php
core/l10n/nl.php
core/l10n/nn_NO.php
core/l10n/oc.php
core/l10n/pl.php
core/l10n/pt_BR.php
core/l10n/pt_PT.php
core/l10n/ro.php
core/l10n/ru.php
core/l10n/ru_RU.php
core/l10n/si_LK.php
core/l10n/sk_SK.php
core/l10n/sl.php
core/l10n/sr.php
core/l10n/sr@latin.php
core/l10n/sv.php
core/l10n/th_TH.php
core/l10n/tr.php
core/l10n/uk.php
core/l10n/vi.php
core/l10n/zh_CN.GB2312.php
core/l10n/zh_CN.php
core/l10n/zh_TW.php
core/lostpassword/index.php
core/lostpassword/resetpassword.php
core/templates/layout.base.php
core/templates/layout.guest.php
core/templates/layout.user.php
cron.php
db_structure.xml
files/webdav.php
index.php
l10n/.tx/config
l10n/af/calendar.po
l10n/af/contacts.po
l10n/af/core.po
l10n/af/files.po
l10n/ar/calendar.po
l10n/ar/contacts.po
l10n/ar/core.po
l10n/ar/files.po
l10n/ar/files_encryption.po
l10n/ar/lib.po
l10n/ar/media.po
l10n/ar/settings.po
l10n/ar_SA/core.po
l10n/ar_SA/files.po
l10n/bg_BG/calendar.po
l10n/bg_BG/contacts.po
l10n/bg_BG/core.po
l10n/bg_BG/files.po
l10n/bg_BG/lib.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/lib.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/files_external.po
l10n/cs_CZ/gallery.po
l10n/cs_CZ/lib.po
l10n/cs_CZ/settings.po
l10n/da/calendar.po
l10n/da/contacts.po
l10n/da/core.po
l10n/da/files.po
l10n/da/lib.po
l10n/da/settings.po
l10n/da/user_ldap.po
l10n/de/calendar.po
l10n/de/contacts.po
l10n/de/core.po
l10n/de/files.po
l10n/de/files_sharing.po
l10n/de/gallery.po
l10n/de/lib.po
l10n/de/settings.po
l10n/de_DE/core.po
l10n/de_DE/files.po
l10n/de_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/lib.po
l10n/el/settings.po
l10n/eo/calendar.po
l10n/eo/contacts.po
l10n/eo/core.po
l10n/eo/files.po
l10n/eo/lib.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/lib.po
l10n/es/settings.po
l10n/es_AR/core.po
l10n/es_AR/files.po
l10n/es_AR/lib.po
l10n/es_AR/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/files_external.po
l10n/et_EE/files_sharing.po
l10n/et_EE/files_versions.po
l10n/et_EE/lib.po
l10n/et_EE/settings.po
l10n/et_EE/user_ldap.po
l10n/eu/calendar.po
l10n/eu/contacts.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/lib.po
l10n/eu/settings.po
l10n/eu_ES/core.po
l10n/eu_ES/files.po
l10n/fa/calendar.po
l10n/fa/contacts.po
l10n/fa/core.po
l10n/fa/files.po
l10n/fa/files_encryption.po
l10n/fa/lib.po
l10n/fa/settings.po
l10n/fi/core.po
l10n/fi/files.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/lib.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/lib.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/lib.po
l10n/gl/settings.po
l10n/he/calendar.po
l10n/he/contacts.po
l10n/he/core.po
l10n/he/files.po
l10n/he/lib.po
l10n/he/settings.po
l10n/hi/core.po
l10n/hi/files.po
l10n/hi/lib.po
l10n/hi/settings.po
l10n/hr/calendar.po
l10n/hr/contacts.po
l10n/hr/core.po
l10n/hr/files.po
l10n/hr/lib.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/lib.po
l10n/hu_HU/settings.po
l10n/hy/calendar.po
l10n/hy/contacts.po
l10n/hy/core.po
l10n/hy/files.po
l10n/ia/calendar.po
l10n/ia/contacts.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/lib.po
l10n/ia/settings.po
l10n/id/calendar.po
l10n/id/contacts.po
l10n/id/core.po
l10n/id/files.po
l10n/id/files_encryption.po
l10n/id/files_external.po
l10n/id/files_sharing.po
l10n/id/files_versions.po
l10n/id/lib.po
l10n/id/settings.po
l10n/id/user_ldap.po
l10n/id_ID/core.po
l10n/id_ID/files.po
l10n/it/calendar.po
l10n/it/contacts.po
l10n/it/core.po
l10n/it/files.po
l10n/it/gallery.po
l10n/it/lib.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/files_sharing.po
l10n/ja_JP/lib.po
l10n/ja_JP/settings.po
l10n/ko/calendar.po
l10n/ko/contacts.po
l10n/ko/core.po
l10n/ko/files.po
l10n/ko/lib.po
l10n/ko/settings.po
l10n/ku_IQ/core.po
l10n/ku_IQ/files.po
l10n/ku_IQ/lib.po
l10n/ku_IQ/settings.po
l10n/lb/calendar.po
l10n/lb/contacts.po
l10n/lb/core.po
l10n/lb/files.po
l10n/lb/lib.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/files_external.po
l10n/lt_LT/files_versions.po
l10n/lt_LT/lib.po
l10n/lt_LT/settings.po
l10n/lv/core.po
l10n/lv/files.po
l10n/lv/lib.po
l10n/lv/settings.po
l10n/mk/calendar.po
l10n/mk/contacts.po
l10n/mk/core.po
l10n/mk/files.po
l10n/mk/lib.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/lib.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/files_sharing.po
l10n/nb_NO/files_versions.po
l10n/nb_NO/gallery.po
l10n/nb_NO/lib.po
l10n/nb_NO/settings.po
l10n/nb_NO/user_ldap.po
l10n/nl/calendar.po
l10n/nl/contacts.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nl/files_external.po
l10n/nl/files_versions.po
l10n/nl/gallery.po
l10n/nl/lib.po
l10n/nl/settings.po
l10n/nl/user_ldap.po
l10n/nn_NO/calendar.po
l10n/nn_NO/contacts.po
l10n/nn_NO/core.po
l10n/nn_NO/files.po
l10n/nn_NO/lib.po
l10n/nn_NO/settings.po
l10n/oc/core.po
l10n/oc/files.po
l10n/oc/lib.po
l10n/oc/settings.po
l10n/pl/calendar.po
l10n/pl/contacts.po
l10n/pl/core.po
l10n/pl/files.po
l10n/pl/gallery.po
l10n/pl/lib.po
l10n/pl/settings.po
l10n/pl_PL/core.po
l10n/pl_PL/files.po
l10n/pl_PL/lib.po
l10n/pl_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/lib.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/lib.po
l10n/pt_PT/settings.po
l10n/pt_PT/user_ldap.po
l10n/ro/calendar.po
l10n/ro/contacts.po
l10n/ro/core.po
l10n/ro/files.po
l10n/ro/lib.po
l10n/ro/settings.po
l10n/ru/calendar.po
l10n/ru/contacts.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/files_external.po
l10n/ru/files_sharing.po
l10n/ru/files_versions.po
l10n/ru/gallery.po
l10n/ru/lib.po
l10n/ru/settings.po
l10n/ru_RU/core.po
l10n/ru_RU/files.po
l10n/ru_RU/lib.po
l10n/ru_RU/settings.po
l10n/si_LK/core.po
l10n/si_LK/files.po
l10n/si_LK/files_encryption.po
l10n/si_LK/files_external.po
l10n/si_LK/files_sharing.po
l10n/si_LK/files_versions.po
l10n/si_LK/lib.po
l10n/si_LK/settings.po
l10n/si_LK/user_ldap.po
l10n/sk_SK/calendar.po
l10n/sk_SK/contacts.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sk_SK/files_external.po
l10n/sk_SK/lib.po
l10n/sk_SK/settings.po
l10n/sk_SK/user_ldap.po
l10n/sl/calendar.po
l10n/sl/contacts.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sl/files_encryption.po
l10n/sl/files_external.po
l10n/sl/files_sharing.po
l10n/sl/files_versions.po
l10n/sl/gallery.po
l10n/sl/lib.po
l10n/sl/settings.po
l10n/sl/user_ldap.po
l10n/so/core.po
l10n/so/files.po
l10n/sr/calendar.po
l10n/sr/contacts.po
l10n/sr/core.po
l10n/sr/files.po
l10n/sr/lib.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/lib.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/lib.po
l10n/sv/media.po
l10n/sv/settings.po
l10n/ta_LK/core.po
l10n/ta_LK/files.po
l10n/ta_LK/lib.po
l10n/ta_LK/settings.po
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.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/lib.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/lib.po
l10n/tr/settings.po
l10n/uk/calendar.po
l10n/uk/contacts.po
l10n/uk/core.po
l10n/uk/files.po
l10n/uk/files_encryption.po
l10n/uk/files_versions.po
l10n/uk/lib.po
l10n/uk/media.po
l10n/uk/settings.po
l10n/vi/core.po
l10n/vi/files.po
l10n/vi/files_external.po
l10n/vi/files_sharing.po
l10n/vi/files_versions.po
l10n/vi/lib.po
l10n/vi/settings.po
l10n/vi/user_ldap.po
l10n/zh_CN.GB2312/core.po
l10n/zh_CN.GB2312/files.po
l10n/zh_CN.GB2312/lib.po
l10n/zh_CN.GB2312/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/files_external.po
l10n/zh_CN/gallery.po
l10n/zh_CN/lib.po
l10n/zh_CN/settings.po
l10n/zh_CN/user_ldap.po
l10n/zh_TW/calendar.po
l10n/zh_TW/contacts.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/lib.po
l10n/zh_TW/settings.po
lib/MDB2/Driver/sqlite3.php
lib/app.php
lib/appconfig.php
lib/archive.php
lib/archive/tar.php
lib/archive/zip.php
lib/base.php
lib/connector/sabre/auth.php
lib/connector/sabre/directory.php
lib/connector/sabre/file.php
lib/connector/sabre/locks.php
lib/connector/sabre/node.php
lib/db.php
lib/eventsource.php
lib/filecache.php
lib/filecache/cached.php
lib/filecache/update.php
lib/filechunking.php
lib/fileproxy.php
lib/fileproxy/fileoperations.php
lib/fileproxy/quota.php
lib/files.php
lib/filestorage.php
lib/filestorage/common.php
lib/filestorage/commontest.php
lib/filestorage/local.php
lib/filesystem.php
lib/filesystemview.php
lib/group.php
lib/group/dummy.php
lib/group/example.php
lib/helper.php
lib/image.php
lib/installer.php
lib/json.php
lib/l10n.php
lib/l10n/ca.php
lib/l10n/cs_CZ.php
lib/l10n/da.php
lib/l10n/de.php
lib/l10n/el.php
lib/l10n/eo.php
lib/l10n/es.php
lib/l10n/es_AR.php
lib/l10n/et_EE.php
lib/l10n/eu.php
lib/l10n/fa.php
lib/l10n/fi_FI.php
lib/l10n/fr.php
lib/l10n/gl.php
lib/l10n/he.php
lib/l10n/hu_HU.php
lib/l10n/it.php
lib/l10n/ja_JP.php
lib/l10n/lt_LT.php
lib/l10n/nb_NO.php
lib/l10n/nl.php
lib/l10n/oc.php
lib/l10n/pl.php
lib/l10n/pt_BR.php
lib/l10n/pt_PT.php
lib/l10n/ro.php
lib/l10n/ru.php
lib/l10n/ru_RU.php
lib/l10n/sk_SK.php
lib/l10n/sl.php
lib/l10n/sv.php
lib/l10n/th_TH.php
lib/l10n/uk.php
lib/l10n/vi.php
lib/l10n/zh_CN.GB2312.php
lib/l10n/zh_CN.php
lib/l10n/zh_TW.php
lib/log.php
lib/log/owncloud.php
lib/mail.php
lib/migrate.php
lib/migration/content.php
lib/minimizer.php
lib/ocs.php
lib/ocsclient.php
lib/preferences.php
lib/public/backgroundjob.php
lib/public/db.php
lib/public/share.php
lib/public/util.php
lib/request.php
lib/search.php
lib/search/provider/file.php
lib/search/result.php
lib/setup.php
lib/streamwrappers.php
lib/template.php
lib/templatelayout.php
lib/updater.php
lib/user.php
lib/user/database.php
lib/user/http.php
lib/util.php
lib/vcategories.php
lib/vobject.php
public.php
remote.php
search/ajax/search.php
settings/admin.php
settings/ajax/apps/ocs.php
settings/ajax/changepassword.php
settings/ajax/creategroup.php
settings/ajax/createuser.php
settings/ajax/disableapp.php
settings/ajax/enableapp.php
settings/ajax/getlog.php
settings/ajax/lostpassword.php
settings/ajax/openid.php
settings/ajax/removegroup.php
settings/ajax/removeuser.php
settings/ajax/setlanguage.php
settings/ajax/setloglevel.php
settings/ajax/setquota.php
settings/ajax/togglegroups.php
settings/ajax/togglesubadmins.php
settings/ajax/userlist.php
settings/apps.php
settings/css/settings.css
settings/help.php
settings/js/apps.js
settings/js/users.js
settings/l10n/ar.php
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/es_AR.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/hr.php
settings/l10n/hu_HU.php
settings/l10n/id.php
settings/l10n/it.php
settings/l10n/ja_JP.php
settings/l10n/ko.php
settings/l10n/lb.php
settings/l10n/lt_LT.php
settings/l10n/lv.php
settings/l10n/ms_MY.php
settings/l10n/nb_NO.php
settings/l10n/nl.php
settings/l10n/nn_NO.php
settings/l10n/oc.php
settings/l10n/pl.php
settings/l10n/pt_BR.php
settings/l10n/pt_PT.php
settings/l10n/ro.php
settings/l10n/ru.php
settings/l10n/ru_RU.php
settings/l10n/si_LK.php
settings/l10n/sk_SK.php
settings/l10n/sl.php
settings/l10n/sr.php
settings/l10n/sr@latin.php
settings/l10n/sv.php
settings/l10n/th_TH.php
settings/l10n/tr.php
settings/l10n/uk.php
settings/l10n/vi.php
settings/l10n/zh_CN.GB2312.php
settings/l10n/zh_CN.php
settings/l10n/zh_TW.php
settings/personal.php
settings/settings.php
settings/templates/admin.php
settings/templates/apps.php
settings/templates/help.php
settings/templates/personal.php
settings/templates/users.php
settings/trans.png
settings/users.php
tests/bootstrap.php
tests/data/db_structure.xml
tests/lib/archive.php
tests/lib/cache.php
tests/lib/cache/apc.php
tests/lib/cache/xcache.php
tests/lib/db.php
tests/lib/filesystem.php
tests/lib/geo.php
tests/lib/share/share.php
tests/lib/streamwrappers.php
tests/lib/util.php
tests/phpunit.xml
2012-12-12 17:39:43 +00:00
Tom Needham
2a4b554ca6
API: OCS methods now use OC_OCS_Result to return data
2012-12-12 17:35:58 +00:00
Tom Needham
140141edf2
API: Further tidying, implement OC_OCS_Result object for api results.
2012-12-12 16:50:25 +00:00
Frank Karlitschek
4265419bbd
Try to fix #836
...
https://github.com/owncloud/core/issues/836
2012-12-12 16:27:37 +01:00
Thomas Mueller
b8b64d6ffc
set the session name to the instance id - which is unique
...
Conflicts:
lib/base.php
2012-12-12 16:07:51 +01:00
Thomas Müller
72fe339c10
Merge pull request #766 from btactic/language_autodetect
...
Improve autodetection of language.
2012-12-12 03:43:17 -08:00
Robin Appelman
7969d6e646
Merge branch 'master' into filesystem
2012-12-11 23:57:59 +01:00
Tom Needham
115dbc721d
API: Specify the response format using a GET parameter
2012-12-11 22:36:46 +00:00
Bart Visscher
ddba90679d
Merge pull request #829 from owncloud/contacts_api_namespace_fix
...
[contacts_api] IAddressBook moved to OCP as it's used by apps to provide...
2012-12-11 13:38:57 -08:00
Thomas Müller
2361639a0d
Merge pull request #825 from owncloud/oc_namespace
...
Autoload classes with 'OC' namespace prefix.
2012-12-11 10:31:42 -08:00
Thomas Mueller
8ed0ce7801
[contacts_api] IAddressBook moved to OCP as it's used by apps to provide access to their contact data
2012-12-11 17:42:09 +01:00
Sam Tuke
31cbb5a09f
Reverted temporary changes to core lib files
2012-12-11 15:21:37 +00:00
Thomas Tanghus
af12b0f5da
Autoload classes with 'OC' namespace prefix.
2012-12-11 16:00:48 +01:00
Frank Karlitschek
728ea711b2
Merge pull request #824 from owncloud/add_user_backend_registration_debug_log
...
add debug logging for user backend registration
2012-12-11 06:34:20 -08:00
Jörn Friedrich Dreyer
8126b09bfe
add debug logging for user backend registration
2012-12-11 14:56:04 +01:00
Sam Tuke
aabef796a0
Added library phpseclib
...
First implementation of passphrase changing on user pwd change
2012-12-11 13:22:46 +00:00
Thomas Müller
eb7dbf3701
Merge pull request #697 from eMerzh/revoke_on_create
...
Revoke DB rights on install only if the db is newly created
2012-12-11 05:20:41 -08:00
Thomas Müller
b11912f9bc
Merge pull request #623 from owncloud/contacts_api_2
...
Contacts API has been implemented and unit tests are provided
2012-12-11 05:10:54 -08:00
Robin Appelman
438d3c21f6
actually connect the filesystem hooks to the cache updater
2012-12-11 01:24:53 +01:00
Robin Appelman
8635699db9
fix cache behaviour for non existing files
2012-12-11 01:06:21 +01:00
Jenkins for ownCloud
f7f462f273
[tx-robot] updated from transifex
2012-12-11 00:04:40 +01:00
Jenkins for ownCloud
a444999a8c
[tx-robot] updated from transifex
2012-12-10 00:12:32 +01:00
Sergi Almacellas Abellana
7b0e2b348b
Fix the loop to search al the available languages, not only the las element.
2012-12-09 20:21:04 +01:00
Thomas Mueller
4cc895aa0a
[contacts_api] move addressbook to it's own file
2012-12-08 16:42:54 +01:00
Thomas Müller
a84ae04c17
Merge pull request #762 from owncloud/database_exception
...
dont handle database exception in OC_DB
2012-12-08 03:42:01 -08:00
Jenkins for ownCloud
2ca72d0da7
[tx-robot] updated from transifex
2012-12-08 00:10:53 +01:00
Sergi Almacellas Abellana
b810e42cc7
Improve autodetection of language.
...
Fixes #730 .
2012-12-07 20:34:17 +01:00
Lorenzo M. Catucci
15afbfd198
Add an $excludingBackend optional parameter
...
to the userExists method both in OCP\User and in OC_User.
2012-12-07 17:19:26 +01:00
Robin Appelman
65e4dc183c
dont handle database exception in OC_DB
...
give the caller the option to handle the exception
2012-12-07 16:09:29 +01:00
Bart Visscher
1e062ea895
Merge pull request #182 from owncloud/fix-redirect
...
Make the redirect_url working again
2012-12-07 03:09:19 -08:00
Bart Visscher
271b8384e7
Fix warning about redirect_url not set
2012-12-07 12:07:56 +01:00
Thomas Mueller
889e55fdac
[contacts_api] update documentation
2012-12-06 23:51:35 +01:00
Robin Appelman
317cd4c70a
catch error if old filecache table is not present during upgrade
2012-12-06 17:49:35 +01:00
Robin Appelman
98f42d314c
merge master into filesystem
2012-12-06 17:47:28 +01:00
Björn Schießle
5b04db9b22
one more undefined index error
2012-12-06 15:58:12 +01:00
Björn Schießle
e3ae0b7ba6
fix more undefined indexes
2012-12-06 15:58:05 +01:00
Thomas Müller
76625e9ba5
Merge pull request #647 from owncloud/fix_app_settings_navigation
...
Move loading of all the apps to setting the active navigation entry.
2012-12-05 01:48:20 -08:00
Thomas Müller
521b6c7b04
Merge pull request #700 from eMerzh/fix_error_display
...
Quick Fix a dirty function preventing showing errors
2012-12-05 01:37:27 -08:00
Thomas Mueller
e65abb8054
minified version no longer available
2012-12-04 14:49:19 +01:00
Brice Maron
a310dcb0ff
Fix a dirty function preventing showing errors
2012-12-03 22:53:06 +00:00
Brice Maron
4327ed8382
Revoke DB rights on install only if the db is newly created
2012-12-03 20:20:17 +00:00
Robin Appelman
be30b1a8de
merge master into filesystem
2012-12-03 18:02:22 +01:00
Thomas Müller
cee92bde20
Merge pull request #682 from VicDeo/master
...
Minor cleanup in OC_OCSClient::getKnownledgebaseEntries. Fix for #487
2012-12-03 02:18:04 -08:00
Jenkins for ownCloud
f4d7955fe6
[tx-robot] updated from transifex
2012-12-03 00:05:40 +01:00
Victor Dubiniuk
3d5ffebb52
Clean KB entries processing code
2012-12-02 23:54:53 +03:00
Thomas Mueller
35e55214e2
[Contacts API] example for searching added
2012-12-02 11:54:30 +01:00
Robin Appelman
01eb5d2790
fix some edge cases while scanning the root of a storage
2012-12-02 03:43:51 +01:00
Isaac Rosenberg
d3ea7feb6b
Update lib/image.php
...
Corrected simple typo
2012-12-01 21:13:08 -05:00
Robin Appelman
72b6faa69d
merge master into filesystem
2012-12-02 03:03:48 +01:00
Jenkins for ownCloud
401c56ce7b
[tx-robot] updated from transifex
2012-12-02 00:03:12 +01:00
Robin Appelman
702444b242
fail gracefully when no old filecache is present during upgrade
2012-12-01 00:59:49 +01:00
Bart Visscher
8ce3aca331
Move loading of all the apps to setting the active navigation entry.
...
We can't do the loading before matching the route, because some routes
need to do the loading after matching of the route. For example the
navigation detection of the app settings page.
2012-11-30 12:47:44 +01:00
Bart Visscher
4db53f9d8e
Merge pull request #619 from samtuke/versions_cache
...
OC_FSV->copy now only caches files which are copied from data/user/files
2012-11-30 03:25:06 -08:00
Robin Appelman
dbbb357f62
add upgrade path from old cache to preserve file id's
2012-11-30 01:41:30 +01:00
Robin Appelman
d33f697a5f
merge master into filesystem
2012-11-30 00:18:42 +01:00
Robin Appelman
bcb27c81d4
use new obEnd function instead of ob_end_clean
2012-11-29 18:01:21 +01:00
Robin Appelman
59d5aa2cb7
add function to safely end output buffering
2012-11-29 17:58:24 +01:00
Thomas Mueller
f99497a05a
test for search and unregister added
2012-11-28 23:10:30 +01:00
Thomas Mueller
2d597c2238
first unit tests implemented
2012-11-28 23:10:00 +01:00
Thomas Mueller
5b1dea56e5
change name to IAddressBook
2012-11-28 23:08:15 +01:00
Thomas Mueller
fba8c776e1
plugin mechanism implemented
2012-11-28 23:07:09 +01:00
Sam Tuke
6975c5537b
OC_FSV->copy now only caches files which are copied from data/user/files
...
Added contextual comments
2012-11-28 16:57:44 +00:00
Sam Tuke
60f4ea8ddc
Cleaned up docblock comments
2012-11-28 15:10:58 +00:00
Jörn Friedrich Dreyer
eaa625c9bc
Merge pull request #401 from owncloud/share_hooks
...
Create functions to install standard hooks
2012-11-28 04:35:52 -08:00
Jenkins for ownCloud
1d4d4fd678
[tx-robot] updated from transifex
2012-11-28 00:11:21 +01:00
Jenkins for ownCloud
d251f04b98
[tx-robot] updated from transifex
2012-11-27 00:10:47 +01:00
Jörn Friedrich Dreyer
71e8755d31
Merge pull request #380 from butonic/feature_share_link_with_token
...
Feature share link with token
2012-11-26 07:42:53 -08:00
Jenkins for ownCloud
7892204077
[tx-robot] updated from transifex
2012-11-26 00:02:04 +01:00
Robin Appelman
a609992a75
better check if we are passing a fileid to Cache::get
2012-11-25 16:30:57 +01:00
Robin Appelman
0cfef83ed9
sort output of getFolderContent by name
2012-11-25 16:08:35 +01:00
Robin Appelman
03fd43a239
Merge branch 'master' into filesystem
2012-11-25 15:38:17 +01:00
Thomas Müller
f81321af3d
Merge pull request #556 from owncloud/postgres_insert_id
...
use lastval() to get the insert id in postgesql
2012-11-24 22:55:33 -08:00
Michael Gapczynski
cc5d8e5609
Check if data variable in scanner isn't null before using it
2012-11-24 20:29:57 -05:00
Robin Appelman
709aacfa0f
change behaviour of Filesystem::getMountPoint when a mountpoint is passed as path without trailing slash
2012-11-24 23:41:39 +01:00
Robin Appelman
d3e37fa157
remove fileatime from common storage backend
2012-11-24 22:55:26 +01:00
Michael Gapczynski
c47bf9bbce
Add checks for storage object
2012-11-24 16:42:54 -05:00
Frank Karlitschek
e450933650
remove left over tag
2012-11-24 18:25:05 +01:00
Frank Karlitschek
0f61816278
A new function to create nice error page. And use it for fatal db errors
2012-11-24 18:07:26 +01:00
Frank Karlitschek
fb5d0db037
prettier error output. Let´s see how many more low hanging fruits I find on my way to the real bug that I want to fix ;-)
2012-11-23 16:40:28 +01:00
Jörn Friedrich Dreyer
995b5c0739
readd fallback code for pre token links
2012-11-23 15:51:57 +01:00
Robin Appelman
95057e727d
merge master into filesystem
2012-11-23 00:40:58 +01:00
Robin Appelman
95340a9e67
use lastval() to get the insert id in postgesql
2012-11-23 00:23:27 +01:00
Robin Appelman
ad706229f5
explicitly sort files when using getFolderContents
2012-11-23 00:17:18 +01:00
Jenkins for ownCloud
3688376a6f
[tx-robot] updated from transifex
2012-11-23 00:03:17 +01:00
Frank Karlitschek
6cb3774706
make it possible to manually override the hostname and protocol if the automatic detection from ownCloud fails. This can happen in reverse proxy situations or with loadbalancers setups.
2012-11-22 19:22:00 +01:00
Robin Appelman
810563ae8a
don't redefine inherited functions as abstract
2012-11-22 12:45:29 +01:00
Robin Appelman
8687e0d346
add Scanner->backgroundScan
2012-11-22 12:45:29 +01:00
Robin Appelman
186c9e77e8
add Cache->getIncomplete for use in background scanning
2012-11-22 12:45:29 +01:00
Robin Appelman
e6cf082fe0
emit a hooks during the filesystem scan
2012-11-22 12:45:29 +01:00
Thomas Müller
54356636e4
Merge pull request #483 from owncloud/archive_sizes
...
stop increasing folder sizes once we hit a non folder
2012-11-22 01:56:08 -08:00
Thomas Mueller
208c6fd966
fixing namespace
2012-11-22 10:21:48 +01:00
Michael Gapczynski
b76d1afe19
Create public function initMountPoints() for initializing a specified user's mount points
2012-11-22 00:44:48 -05:00
Michael Gapczynski
77fdb16b7c
Remove incorrect extra parameter for init() call
2012-11-22 00:23:11 -05:00
Jenkins for ownCloud
3a5f5e127c
[tx-robot] updated from transifex
2012-11-22 00:02:16 +01:00
Robin Appelman
97380f3485
merge master into filesystem
2012-11-21 22:37:14 +01:00
Thomas Müller
a85d891938
Merge pull request #538 from Deltachaos/fix_537
...
Fixes update of shared files with mirall because it dose not update all ...
2012-11-20 22:55:08 -08:00
Jenkins for ownCloud
9204be827b
[tx-robot] updated from transifex
2012-11-21 00:02:33 +01:00
Maximilian Ruta
ac4cafcfc7
Fixes update of shared files with mirall because it dose not update all methadata for a file
2012-11-20 23:34:25 +01:00
Jörn Friedrich Dreyer
d8a171df26
implement share via link token
2012-11-20 15:03:12 +01:00
Jenkins for ownCloud
568def2b61
[tx-robot] updated from transifex
2012-11-20 00:02:08 +01:00
Brice Maron
8fa7d6a48a
Fix typo in getUrlContent fix #514
2012-11-19 17:13:07 +00:00
Thomas Müller
d91c841f73
Merge pull request #383 from owncloud/contacts_api
...
Proposal for a public contacts api
2012-11-19 05:42:01 -08:00
Frank Karlitschek
5b2aeebaf0
Merge pull request #280 from butonic/feature_bmp_support
...
add bmp support
2012-11-19 00:53:46 -08:00
Jenkins for ownCloud
c5e891008b
[tx-robot] updated from transifex
2012-11-19 00:01:48 +01:00
Robin Appelman
40fae0acbf
fix outdated permissions cache use in scanner
2012-11-18 14:10:28 +01:00
Robin Appelman
a922eb756e
merge master into filesystem
2012-11-18 14:07:52 +01:00
Thomas Müller
ea80a8b9e3
Merge pull request #114 from riso/xsendfile
...
Implement X-Sendfile support
2012-11-18 04:35:46 -08:00
Jenkins for ownCloud
e28d71bf55
[tx-robot] updated from transifex
2012-11-18 00:02:00 +01:00
Brice Maron
4337e0fb99
Little case fix
2012-11-17 22:12:24 +00:00
Brice Maron
71adad8817
Add User agent when OC does a request
2012-11-17 21:08:58 +00:00
Thomas Müller
ac3e962732
Merge pull request #375 from tdevos/master
...
Use curl to get remote file content
2012-11-17 12:31:25 -08:00
Jenkins for ownCloud
61670184c4
[tx-robot] updated from transifex
2012-11-17 00:02:24 +01:00
Robin Appelman
1007013833
stop increasing folder sizes once we hit a non folder
...
fixes #234
2012-11-16 17:54:58 +01:00
Robin Appelman
8fe69dfac6
also return fileid in OC_Filecache::get
2012-11-16 17:52:52 +01:00
Robin Appelman
74611801dd
typo
2012-11-16 17:41:38 +01:00
Robin Appelman
f4f00b4edb
Merge branch 'master' into filesystem
2012-11-16 12:13:03 +01:00
Thomas Müller
d1c0f2a739
Merge pull request #454 from Raydiation/master
...
Routing fixes
2012-11-15 15:15:07 -08:00
Jenkins for ownCloud
d86a368e54
[tx-robot] updated from transifex
2012-11-16 00:03:47 +01:00
Thomas Müller
36bf4e24f0
Merge pull request #433 from owncloud/user_setting_fixes
...
User setting fixes
2012-11-15 14:01:16 -08:00
Robin Appelman
288ecf318c
add getFileInfo and getDirectoryContent to OC_Files for compatibility
2012-11-15 22:08:08 +01:00
Robin Appelman
5569f07e8d
add OC_FilesystemView alias for compatibility
2012-11-15 22:04:48 +01:00
Robin Appelman
f94d62380f
Merge branch 'master' into filesystem
2012-11-15 21:27:24 +01:00
thomas
d2047a00cf
Remove parentheses in return, modify description, and fix a mistake
2012-11-15 20:46:17 +01:00
Bart Visscher
8bed38c78d
Rename install hook functions to register hook
2012-11-15 18:13:54 +01:00
Bart Visscher
9419913c06
Better place to check for user removal
2012-11-15 18:10:40 +01:00
Bernhard Posselt
e642d18e26
When using routing in apps, no apps are loaded in the left navigation tree. To fix this: load apps for matching a request
2012-11-15 14:48:18 +01:00
Arthur Schiwon
fd060d4849
really check if mod_deflate is loaded
2012-11-15 10:35:53 +01:00
Arthur Schiwon
64a8a0c872
coding style
2012-11-15 10:35:44 +01:00
Arthur Schiwon
4a75c539ed
Fix remote.php CSS+JS garbish on some systems
2012-11-15 10:35:34 +01:00
Robin Appelman
cbcd9ba84a
allow storage backends to implement custom permission management
2012-11-15 00:57:30 +01:00
Robin Appelman
bf2ac9f113
merge master into filesystem
2012-11-15 00:37:54 +01:00
Jenkins for ownCloud
a418a3ba65
[tx-robot] updated from transifex
2012-11-15 00:03:50 +01:00
thomas
40dd5ae61c
change and transfert getUrlContent
2012-11-14 23:14:04 +01:00
Bart Visscher
343e9d8621
Better check and handing of user deletion
2012-11-14 21:52:28 +01:00
Bart Visscher
59627367ae
Better check and handling of user creation
2012-11-14 21:52:28 +01:00
Valerio Ponte
de7e419610
Fixed style according to owncloud styleguide
2012-11-14 20:10:20 +01:00
Valerio Ponte
8e190a5a97
Moved X-Sendfile headers into OC_Files::get
...
now should work with temp files too
2012-11-14 20:10:20 +01:00
Valerio Ponte
8420b9bf67
Implemented X-Sendfile support
2012-11-14 20:10:20 +01:00
Lukas Reschke
8b03b683df
Merge pull request #271 from owncloud/239_webdav_999_files
...
fixes #239 - query the database in chunks of 200
2012-11-14 10:53:00 -08:00
Alessandro Cosentino
7d01342bab
fix translation issues with previous commit
2012-11-13 19:32:26 -05:00
Alessandro Cosentino
aa917cfb18
uncomment hours entries in relative date functions
2012-11-13 19:18:26 -05:00
Bart Visscher
530f3f8be9
Create functions to install standard hooks
...
Also use these in tests that needs them
Fix #151
2012-11-13 23:45:17 +01:00
Thomas Mueller
33a4dfa087
function isEnabled() added
2012-11-13 20:59:47 +01:00
Thomas Tanghus
bfb6faa850
Bump version to trigger update.
2012-11-13 12:11:18 +01:00
Thomas Tanghus
268a48479d
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-12 23:36:59 +01:00
Thomas Tanghus
d809efc1e5
Change insertIfNotExist() for sqlite. Not fast, but more reliable than previous attempt.
2012-11-12 23:34:02 +01:00
Thomas Mueller
c3825112a0
public contacts api as discussed here https://github.com/owncloud/apps/issues/113
2012-11-12 23:25:32 +01:00
Bart Visscher
7b53c9d3f0
Merge pull request #157 from owncloud/setup
...
Make lib/setup.php usable outside of install setup
2012-11-12 13:23:31 -08:00
Thomas Tanghus
42b871dcf1
Correct SQL syntax.
2012-11-12 18:45:56 +01:00
thomas
847467ab00
Add connection time out option
2012-11-12 16:29:22 +01:00
thomas
4564898c28
Use curl to get remote file content
2012-11-12 15:37:44 +01:00
Jörn Friedrich Dreyer
0ce5e9257e
add php-doc for ellipsis
2012-11-12 14:04:23 +01:00
Jörn Friedrich Dreyer
28671d92c0
move code to better places
2012-11-12 13:56:29 +01:00
Jörn Friedrich Dreyer
bb56581192
add php-doc
2012-11-12 13:04:00 +01:00
Jörn Friedrich Dreyer
43bfabf68f
add bmp support
2012-11-12 13:04:00 +01:00
blizzz
e0fdb8272b
Merge pull request #371 from butonic/sql_and_error_log_fixes
...
add missing sql backticks, check sharing for error and add log
2012-11-12 03:37:43 -08:00
Jörn Friedrich Dreyer
ba91f9a237
add missing sql backticks, check sharing for error and add log
2012-11-12 12:04:46 +01:00
Thomas Tanghus
82e010c51c
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-12 00:37:40 +01:00
Thomas Tanghus
56239df2e7
Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_*
2012-11-11 23:10:23 +01:00
Thomas Tanghus
7f0c69eb0e
Added CRUDS permissions to the OCP namespace. Implements issue #345
2012-11-11 23:09:54 +01:00
Thomas Tanghus
fd709fc021
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-11 20:20:09 +01:00
Diederik de Haas
f6daddadf5
Fixed new checkstyle issues in util.php from build #1341 .
2012-11-10 00:58:03 +01:00
Diederik de Haas
20541c610e
Fixed new checkstyle issues in migrate.php from build #1341 .
2012-11-10 00:53:28 +01:00
Jenkins for ownCloud
7ec0efe5c2
[tx-robot] updated from transifex
2012-11-10 00:02:29 +01:00
Thomas Müller
6dbdc16287
Merge pull request #340 from butonic/fix_quota_zero_cornercase
...
fix quota off by one error
2012-11-09 05:54:50 -08:00
Jörn Friedrich Dreyer
c5ba4f476a
fix quota off by one error
2012-11-09 14:34:15 +01:00
Stefan Seidel
8f669880bc
Fix WebDAV (and Android Client) not being able to authorize on Debian Squeeze + mod_fcgid installs.
2012-11-09 13:30:07 +01:00
Thomas Müller
c053863644
Merge pull request #330 from owncloud/check_connection
...
add a check and a warning if the ownCloud server is not able to establis...
2012-11-09 02:11:24 -08:00
Jenkins for ownCloud
cb57a20ec2
[tx-robot] updated from transifex
2012-11-09 00:03:49 +01:00
Robin Appelman
46071fed80
fix quota proxy
2012-11-08 21:35:40 +01:00
Robin Appelman
fedff3eafe
add cache updater
2012-11-08 21:12:40 +01:00
Robin Appelman
5a173b901f
fix Scanner->scan setting the filesize to 0 for files
2012-11-08 20:47:40 +01:00
Robin Appelman
15b8a3f987
move correctFolderSize from Scanner to Cache
2012-11-08 18:10:54 +01:00
Frank Karlitschek
55f75c6d8e
add a check and a warning if the ownClodu server is not able to establish http connections to the internet. The reason is that users complained that external filesystem support, the update checker, downloading of new apps or the nowledgebase don´t work and don´t know why.
2012-11-08 18:08:44 +01:00
Robin Appelman
3f644fe70c
fix calculateFolderSize for non existing files
2012-11-08 18:07:30 +01:00
Robin Appelman
e7bed5ddab
allow creating Cache objects with only the storage id instead of the whole storage object
2012-11-08 17:59:08 +01:00
Robin Appelman
706bb3ccd6
move ETag generation to storage backends
2012-11-08 17:48:26 +01:00
Robin Appelman
72c3868644
add resolvePath to filesystem view api
2012-11-08 17:42:26 +01:00
Robin Appelman
091ff02362
merge master into filesystem
2012-11-08 17:32:00 +01:00
Tom Needham
8396c0478e
Migration: Allow for no app data cases; handle file copying better
2012-11-08 11:37:27 +00:00
Tom Needham
0833be9d4e
Migration: On import of user accounts only import folders in home dir, use OC_Helper::copyr
...
Check files when copying recursivley
Remove obsolete method
Dont count '.' and '..' as directories when importing.
2012-11-08 11:37:27 +00:00
Robin Appelman
ae74c54d65
normalize filepaths in OC_Files::getFileInfo
2012-11-07 22:54:10 +01:00
Björn Schießle
250f40fe40
check if $path is a empty string
2012-11-07 17:35:07 +01:00
Robin Appelman
961ff01a93
merge master into filesystem
2012-11-07 17:18:56 +01:00
icewind1991
5cad2d7ccc
Merge pull request #307 from owncloud/etag-function-overwrite
...
Allow apps to change the way etags are generated
2012-11-07 08:02:59 -08:00
Björn Schießle
311b04f609
backport from approved patch in stable45:
...
make root the default parameter for getAbsolutePath()
2012-11-07 16:54:42 +01:00
Thomas Tanghus
972ba89bc2
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-07 15:33:21 +01:00
Brice Maron
ba62d8dea7
Fix quoting problem in fs mount. give Big DB error at least in PG
2012-11-07 15:27:34 +01:00
Robin Appelman
99aa972a40
Allow changing the way etags are generated
2012-11-07 14:21:34 +01:00
Robin Appelman
012a907a8a
fix user specific mount configuration
2012-11-07 14:05:45 +01:00
Thomas Mueller
07ffa0de39
adding comments to explain what's going on here
2012-11-06 13:55:30 +01:00
Michael Gapczynski
3d13c9db70
Return empty array if file does not exist inside Shared folder, fixes issue #91
2012-11-05 17:54:23 -05:00
Thomas Mueller
415ec58422
fixes #329 : query the database in chunks of 200
2012-11-05 22:42:03 +01:00
Thomas Tanghus
a50f98606d
Check DB result.
2012-11-05 16:24:16 +01:00
Thomas Tanghus
1147dc9774
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-11-05 12:06:59 +01:00
Felix Moeller
a4b2ea586d
Style: Remove all the dangling white spaces
2012-11-04 22:16:04 +01:00
Robin Appelman
4b940955dd
merge master into filesystem
2012-11-04 21:12:18 +01:00
Felix Moeller
1e33ad9cbc
Style: Different line endings in one file are bad for sure
...
I think Checkstyle did not find this occurence, however consistant line endings are preferred.
@DeepDiver can Checkstyle find this?
2012-11-04 19:11:53 +01:00
Felix Moeller
27ab0357ae
Checkstyle: Fix last six NewlineBeforeOpenBrace
2012-11-04 18:36:16 +01:00
Felix Moeller
bc4382c5c5
Checkstyle: fix the last NoSpaceAfterEquals
2012-11-04 18:31:44 +01:00
Felix Moeller
0e70ea9d8b
Checkstyle: Fix the last 25 NoSpaceAfterComma
2012-11-04 18:28:29 +01:00
Felix Moeller
1205749f8c
Checkstyle: Fix the last two SpaceBeforeOpenBrace
2012-11-04 18:18:03 +01:00
Thomas Müller
8ac3849a95
Merge pull request #238 from fmms/checkstyle04
...
Checkstyle fixes
2012-11-04 08:59:45 -08:00
Lukas Reschke
8c4c74b23f
Merge pull request #178 from owncloud/JustOneCSRFTokenPerSession
...
Just one CSRF token per session
2012-11-04 05:54:02 -08:00
Thomas Tanghus
e6a7bba095
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-11-04 12:31:06 +01:00
Thomas Tanghus
8e5b6bf21d
VCategories: Make $categories non-static again.
2012-11-04 12:24:49 +01:00
Felix Moeller
30d7993e01
Checkstyle fixes: NoSpaceAfterComma
2012-11-04 11:10:46 +01:00
Felix Moeller
f8d1d7787e
Checkstyle fixes for SpaceBeforeOpenBrace
2012-11-04 10:46:32 +01:00
Jenkins for ownCloud
17d466b03b
[tx-robot] updated from transifex
2012-11-04 00:01:42 +01:00
Robin Appelman
4c0c78d15d
check for filename blacklist in OC_Filesystem::isValidPath
2012-11-03 00:26:36 +01:00
Lukas Reschke
fd584f446d
Merge pull request #220 from fmms/checkstyle02
...
Checkstyle: many fixes
2012-11-02 14:59:36 -07:00
Robin Appelman
8a6bb7965d
add Cache::move
2012-11-02 22:25:33 +01:00
Robin Appelman
4a5a36577e
merge master into filesystem
2012-11-02 21:42:29 +01:00
Robin Appelman
a1c37d4be5
fix OC_Filesystem::isValidPath when using \ instead of / in paths
2012-11-02 19:56:34 +01:00
Felix Moeller
afadf93d31
Checkstyle: many fixes
2012-11-02 19:53:02 +01:00
Lukas Reschke
d2e842fcc9
Remove uneeded new line
2012-11-01 22:38:21 +01:00
Lukas Reschke
822e4d5f6c
Check for redirect_url for logged in users
...
This checks if there is a redirect_url for logged in users
2012-11-01 22:37:37 +01:00
Robin Appelman
51ba12890d
Merge branch 'master' into filesystem
2012-11-01 16:16:02 +01:00
Robin Appelman
553b1072b6
fix archive tar include path
2012-11-01 16:15:25 +01:00
Lukas Reschke
81f019b6c5
Make the redirect_url working again
...
Fixes #160
2012-10-31 22:03:55 +01:00
Thomas Tanghus
8cffbb5f7d
Added some more error checking on db queries.
2012-10-31 20:47:04 +01:00
Thomas Tanghus
5a738380f6
Cast object ids to integers.
2012-10-31 20:06:39 +01:00
Lukas Reschke
7a7f12a0c1
Create only one CSRF token per session
...
Before, the CSRF token expired every hour. We had a script in place
which should refresh the token but this don't worked in every case.
(Laptop sleeping etc.)
With this commit, the token will only get once created for every
session so that the "Token expired" warning shouldn't appear.
2012-10-31 18:37:59 +01:00
Thomas Tanghus
5fc0c89a73
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-31 16:09:11 +01:00
Thomas Müller
f851738169
Merge pull request #152 from scambra/webdav-quota
...
checking quota in webdav
2012-10-31 03:03:46 -07:00
Jenkins for ownCloud
aca6d3252f
[tx-robot] updated from transifex
2012-10-31 00:02:32 +01:00
Robin Appelman
6e9e263497
merge master into filesystem
2012-10-30 22:59:55 +01:00
Bart Visscher
6d09752940
DRY for creating htaccess to protect data-directory
2012-10-30 20:57:19 +01:00
Bart Visscher
246d7ea2ea
Separate control code from class definition
2012-10-30 20:56:31 +01:00
scambra
5af8adc169
code style changes
2012-10-30 12:17:15 +01:00
Jörn Friedrich Dreyer
b032819ab9
check for database error in userExists
2012-10-30 11:08:32 +01:00
scambra
d9c14292a4
fix checking quota in webdav, adding a sabredav plugin
2012-10-30 10:32:30 +01:00
Thomas Tanghus
5550cde03b
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Fix conflicts:
core/ajax/vcategories/add.php
core/ajax/vcategories/delete.php
2012-10-30 06:53:49 +01:00
Sam Tuke
3fdf239b47
Merge pull request #147 from owncloud/htaccess-upgrade-check
...
Generate .htaccess when upgrading from old versions
2012-10-29 16:28:46 -07:00
Jenkins for ownCloud
56cf7660bd
[tx-robot] updated from transifex
2012-10-30 00:01:50 +01:00
Lukas Reschke
f6b6780072
Don't use OC_Setup as it will show up the installer
2012-10-29 22:44:49 +01:00
Lukas Reschke
6903475841
Generate .htaccess when upgrading from old versions
...
When upgrading from old ownCloud versions like 2.x the .htaccess is not
generated - which exposes the data to the internet. This fix will
generate a .htaccess when upgrading. (And no one exists)
Fixes #127
2012-10-29 22:03:18 +01:00
Lukas Reschke
2e1199acb8
Merge pull request #133 from fmms/checkstyle02
...
NoSpaceAfterComma -- checkstyle cleanup
2012-10-29 12:35:12 -07:00
Lukas Reschke
ac784baef6
Generate only one CSRF token
2012-10-29 16:35:29 +01:00
Lukas Reschke
4d61eb3e4c
Fix a typo
2012-10-29 16:33:39 +01:00
Bart Visscher
a9ff5635d8
Move loading setting routing to OC_Router
2012-10-29 15:04:56 +01:00
Bart Visscher
40fe6c6346
Remove subnavigation key, not used
2012-10-29 15:04:55 +01:00
Bart Visscher
4d03b3dbaf
Add ETag caching for Javascript routes
2012-10-29 15:04:55 +01:00
Bart Visscher
a7806076b1
Move generating cache key from files from OC_Minimizer to OC_Cache
2012-10-29 15:04:55 +01:00
Michael Gapczynski
5aec26a37c
Fix MySQL install, bug fix for issue 132
2012-10-28 19:50:26 -04:00
Michael Gapczynski
a6e18e0b6d
Check if error_report() is equal to 0, so suppressed errors aren't logged e.g. the htaccesstext.txt fopen failing
2012-10-28 19:38:57 -04:00
Jenkins for ownCloud
dbb4e74c79
[tx-robot] updated from transifex
2012-10-29 00:02:45 +01:00
Felix Moeller
dfc8228fb4
NoSpaceAfterComma
2012-10-28 23:58:08 +01:00
Felix Moeller
5d640f9ae3
NoSpaceAfterComma
2012-10-28 18:28:16 +01:00
Felix Moeller
b7a02f0c93
NoSpaceAfterComma
...
first in new branch
2012-10-28 18:12:31 +01:00
Robin Appelman
6bc156ba69
add svg mimetype to default htaccess
2012-10-28 16:03:52 +01:00
Arthur Schiwon
be215a097a
check if RUNTIME_NOAPPS is set before using it
2012-10-28 15:10:22 +01:00
Georg Ehrke
d7a6b09406
deny the usage of dots in database name
2012-10-28 14:11:41 +01:00
Arthur Schiwon
b8a48b55a3
make sure all filesystem apps are loaded when setupFS is proceeded, to make sure the emmited setup-hook is received. Fixes #89
2012-10-28 13:48:08 +01:00
Arthur Schiwon
5b9ba2e033
remove whitespaces, no code change
2012-10-28 13:48:08 +01:00
Bernhard Posselt
bf3dac05d1
added functions for printing escaped and unescaped values
2012-10-28 13:28:22 +01:00
Tom Needham
bcdf3a23db
Merge master into ocs_api
2012-10-28 11:16:04 +00:00
Tom Needham
b079447988
Add API method for sharing a file, currently only via a link.
2012-10-28 11:06:47 +00:00
Tom Needham
07111ff672
Allow apps to pass defaults and requirements for their API calls
2012-10-28 11:04:23 +00:00
Robin Appelman
b07672821b
check for changes when using the cache api
2012-10-28 11:43:45 +01:00
Robin Appelman
fba7be1194
add filesystem watcher to detect updates
2012-10-28 11:39:37 +01:00
Robin Appelman
c4a793913c
Merge branch 'master' into filesystem
2012-10-28 10:28:25 +01:00
Jenkins for ownCloud
1a08ef6a06
[tx-robot] updated from transifex
2012-10-28 00:02:29 +02:00
Robin Appelman
c964fe9f8d
merge master into filesystem
2012-10-27 18:11:52 +02:00
Robin Appelman
79d0ac21cc
delete child entries when a folder gets removed from cache
2012-10-27 18:08:00 +02:00
Robin Appelman
56e9ce44c3
add a way to recalucale the size of a folder in the cache
2012-10-27 18:08:00 +02:00
Björn Schießle
0d3f68cc7a
fix function documentation
2012-10-27 18:08:00 +02:00
Bart Visscher
fecfeac55d
Fix introduced style errors
2012-10-27 17:45:15 +02:00
Bart Visscher
894d44e796
Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git'
...
Conflicts:
lib/base.php
2012-10-27 16:33:10 +02:00
Björn Schießle
8a3eda16f2
fix function documentation
2012-10-27 15:53:10 +02:00
Robin Appelman
38371d1275
Merge branch 'master' into filesystem
2012-10-27 14:28:24 +02:00
Robin Appelman
5bfff6c56e
use absolute paths when resolving mount points
2012-10-27 12:17:35 +02:00
Bart Visscher
0120f3fd62
Merge branch 'routing'
...
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
Bart Visscher
43e8293d9c
Change Symfony/Component/Routing from submodule to composer fetching
2012-10-27 11:32:16 +02:00
Robin Appelman
3437071cf1
remove old searchByMime
2012-10-27 10:40:27 +02:00
Robin Appelman
fcc92a9f43
add searchByMime to new cache api
2012-10-27 10:34:25 +02:00
Jakob Sack
d0bbd9416b
Add BackgroundJob::setExecutionType() to public API
2012-10-27 10:15:39 +02:00
Jakob Sack
9cf9d41e51
Add a new backgroundjob class to access the type of background jobs easily
2012-10-27 10:08:56 +02:00
Robin Appelman
cbc71784c0
Merge branch 'master' into filesystem
2012-10-27 10:02:26 +02:00
Robin Appelman
695405dfeb
add permissions data to the results of the cache api
2012-10-27 10:01:20 +02:00
Jenkins for ownCloud
3bef19c623
[tx-robot] updated from transifex
2012-10-27 00:02:05 +02:00
Robin Appelman
9953427197
also use new cache api here
2012-10-26 23:26:12 +02:00
Robin Appelman
7d6da68d53
prove some compatibility with the old cache api
2012-10-26 23:25:52 +02:00
Florian Hülsmann
a48734bcb5
fixed user/group sharing hooks
2012-10-26 23:15:37 +02:00
Robin Appelman
6db81afab9
move some stuff to the new api
2012-10-26 23:05:02 +02:00