mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,731 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

3497 Commits

Author SHA1 Message Date
Thomas Tanghus 3b33712dc9 Add indexes and primary keys. 2013-03-19 01:35:12 +01:00
Jenkins for ownCloud 63ca84e7bc [tx-robot] updated from transifex 2013-03-19 00:05:52 +01:00
Bernhard Posselt 5b1f857907 Merge pull request #2363 from owncloud/uploadsize 
Improve behaviour when max upload size is unknown
 2013-03-18 08:18:27 -07:00
Frank Karlitschek 63336f2acb remove deprecated call 2013-03-17 22:05:45 +01:00
Frank Karlitschek 7f1ff3e9e1 Merge pull request #2204 from owncloud/chache_updater_rename 
Cache: better rename hook for cache updater
 2013-03-17 05:03:18 -07:00
Jenkins for ownCloud 1427af4a22 [tx-robot] updated from transifex 2013-03-16 22:18:26 +01:00
Bernhard Posselt a3db54f9b0 Merge pull request #2383 from owncloud/error-handling-upgrade 
Add error handling to the file cache upgrade
 2013-03-16 12:17:31 -07:00
Michael Gapczynski c69dc3483a Add error handling to the file cache upgrade 2013-03-16 14:28:42 -04:00
Robin Appelman 8a97afac6f Don't show storage space warning when the free space can't be determined 2013-03-15 16:46:20 +01:00
Robin Appelman 319e3f162c Don't block uploads if the max upload size is unknown 2013-03-15 16:40:36 +01:00
Robin Appelman 32b8fd8fb7 Improve handeling of unlimited max upload size 2013-03-15 16:31:35 +01:00
Andreas Schönebeck 387be37427 Filter display of blacklisted files 
Blacklisted files like ".htaccess" and ".git" should not only be
blacklisted for upload and rename, but they should also not be displayed
in the directory listings.

I needed this personally to hide ".git" folders in shared folders. Its
also a simple implementation of feature requests like
http://forum.owncloud.org/viewtopic.php?f=4&t=3279 and
http://forum.owncloud.org/viewtopic.php?f=3&t=5708
 2013-03-15 12:11:42 +01:00
Jenkins for ownCloud 0c123ebf9d [tx-robot] updated from transifex 2013-03-15 00:06:36 +01:00
Robin Appelman ed83597371 Return unknown freespace if the free_space call failed 
Fixes #2312
 2013-03-14 17:00:30 +01:00
Björn Schießle abe408e934 replace \MDB with \OC_DB, approved in #2278 2013-03-14 14:59:12 +01:00
Jenkins for ownCloud 9a0cb2ccaa [tx-robot] updated from transifex 2013-03-14 00:06:29 +01:00
Olivier Tétard 17fd6482d8 Fix file sharing via public link for one particular file. 
Fix OC_Files::get() to not return the first character of the filename
if only one file is requested.
 2013-03-12 20:03:54 +01:00
Thomas Müller 2e9d641337 Merge pull request #2254 from owncloud/fixing-mssql-utf8-and-insert-empty-string-master 
Fixing mssql utf8 and insert empty string master
 2013-03-12 11:52:40 -07:00
Thomas Müller 84d895dc87 Merge pull request #2253 from owncloud/fixing-windows-file-mapper-master 
Fixing windows file mapper master
 2013-03-12 11:48:29 -07:00
Jan-Christoph Borchardt 68a7b53e03 Merge pull request #2145 from eMerzh/preserve_debug 
Preserve Debug flag accross config writes
 2013-03-12 10:26:01 -07:00
Thomas Mueller ec16853112 enable UTF-8 charset on mssql 
disable MDB2_PORTABILITY_EMPTY_TO_NULL for mssql to allow insert of empty string to no null fields
 2013-03-12 15:39:44 +01:00
Thomas Mueller 9d4d399aa3 write error message to log file in case insert to file cache failed - took hours to find that the insert failed :-( 2013-03-12 15:39:29 +01:00
Thomas Mueller a05820c659 fixing various filesystem/storage unit tests on windows 
fixing copy operation on mapper
 2013-03-12 15:30:10 +01:00
Thomas Mueller eedbebd40e adding //IGNORE to iconv to prevent nasty php warnings 2013-03-12 09:26:21 +01:00
Thomas Mueller 06992fec6d slug generates uniqid in case the file/folder name contains not one single valid character 2013-03-12 09:24:58 +01:00
Thomas Mueller 0900301668 indexed slug should be created based on logic path 2013-03-12 09:15:53 +01:00
Thomas Mueller 2fe56b8969 fixes #2081 2013-03-12 09:14:05 +01:00
Jenkins for ownCloud 569c7ab138 [tx-robot] updated from transifex 2013-03-12 00:14:05 +01:00
Tom Needham dfbf57207d Merge pull request #1584 from owncloud/ocs_multiple_methods 
Allow registering of multiple methods on each api route. Add /cloud/capabilities route.
 2013-03-09 16:59:13 -08:00
Jenkins for ownCloud 6bdb84ab28 [tx-robot] updated from transifex 2013-03-10 00:06:53 +01:00
Brice Maron d5da94acbc Small perf improvement : filter before sort 2013-03-09 21:41:59 +01:00
Frank Karlitschek e6c2a91781 this is now 6.0 pre alpha 2013-03-09 20:19:34 +01:00
Frank Karlitschek 256595e7b2 5.0.0 2013-03-09 18:51:02 +01:00
Lukas Reschke 3ae70ab162 Check if username is valid and remove slashes from filename 2013-03-11 16:21:26 +01:00
Bernhard Posselt 1e20067c00 Merge pull request #2183 from owncloud/fix-shared-statuses-again 
Fix #2080 and fix #2141
 2013-03-11 02:43:16 -07:00
Bernhard Posselt 11251ec8a8 Merge pull request #2218 from owncloud/fix-mounting-all 
Fix variable for mounting for all users, fix #357
 2013-03-11 02:41:41 -07:00
Bernhard Posselt 049a4df259 Merge pull request #1786 from owncloud/shared-folder-etags 
Include etags for the root of the shared folder
 2013-03-11 02:38:50 -07:00
Lukas Reschke 3c06020e3e Merge pull request #2217 from owncloud/mountconfig-location 
Store the global mount configuration file in the datadir
 2013-03-10 00:25:10 -08:00
Michael Gapczynski 8a5946fadc Fix variable for mounting for all users, fix #357 2013-03-09 21:09:31 -05:00
Robin Appelman be4806d031 Store the global mount configuration file in the datadir 2013-03-10 02:25:03 +01:00
Valerio Ponte 99c873ea29 fixed typo that broke xsendfile 2013-03-09 15:35:36 +01:00
Arthur Schiwon 988a67fc9a remove remaining br-tags that do not belong here 2013-03-09 13:45:37 +01:00
Tom Needham e58dbd46fc Merge in master 2013-03-09 00:04:33 +00:00
Jenkins for ownCloud 0629ff4dd9 [tx-robot] updated from transifex 2013-03-09 00:06:34 +01:00
Lukas Reschke 546fb72b25 Merge pull request #2165 from owncloud/fix_2155 
Offer download of whole shared dir only if it does not exceed zip input ...
 2013-03-08 10:31:48 -08:00
Arthur Schiwon f4a326173e fix foldersize check to validate zip input size 2013-03-08 19:21:06 +01:00
Robin Appelman 1d3beffacf Cache: better rename hook for cache updater 2013-03-08 19:08:07 +01:00
Björn Schießle 2d00d13a5d use pre_unshare hook, otherwise the share is already removed. Which means that we have no chance to determine which folder has to be updated 2013-03-08 15:13:00 +01:00
Frank Karlitschek f9c24a0368 5.0.0 RC3 2013-03-08 10:01:22 +01:00
Bernhard Posselt 0525bbd73c Merge pull request #2189 from owncloud/versioning_sync_client 
fix versioning for the sync client - distinguish between touch and write operation
 2013-03-08 03:05:28 -08:00
Björn Schießle 8d26400cb5 remove some debug output; move code to the right function 2013-03-08 11:27:25 +01:00
Michael Gapczynski 6e5e8c6b46 Fix #2080 and fix #2141 2013-03-07 22:30:12 -05:00
Michael Gapczynski 4826564344 Merge branch 'master' into shared-folder-etags 
Conflicts:
	apps/files_sharing/lib/sharedstorage.php
 2013-03-07 17:14:34 -05:00
Bernhard Posselt d6bb627a62 Merge pull request #2173 from owncloud/fix-shared-storage 
Fix fetching source path of shared files
 2013-03-07 09:37:36 -08:00
blizzz 99914a44a5 Merge pull request #2174 from owncloud/fix_printed_brs 
Remove <br> from error messages, because they will be escaped and the us...
 2013-03-07 08:39:29 -08:00
Arthur Schiwon 47d176ae69 Remove <br> from error messages, because they will be escaped and the used template has it's own <br> already 2013-03-07 17:28:28 +01:00
Michael Gapczynski a5cab28bea Fix fetching source path of shared files 2013-03-07 11:12:59 -05:00
Björn Schießle 48bb53030c distinguish between touch and write 2013-03-07 15:51:44 +01:00
Björn Schießle ce9942331e create a meanigful file name if files are from the root folder 2013-03-07 14:24:18 +01:00
Björn Schießle 4a4f705adc json encode list of files 2013-03-07 14:15:02 +01:00
Brice Maron 4994eaace1 Allow to load splited config files ref #946 2013-03-06 23:30:16 +01:00
Brice Maron a68cbb00e0 Preserve Debug flag accross config writes 2013-03-06 21:05:13 +01:00
Arthur Schiwon 6acbadf418 return 403 when mkdir failed on webDAV, fixes #2127 2013-03-06 15:21:12 +01:00
Lukas Reschke cfb10dc58c Add warning about sanitization 2013-03-06 13:05:22 +01:00
Bernhard Posselt 145fb18042 Merge pull request #2120 from owncloud/clear-caches 
Clear the CSS and JS cache earlier to make sure update goes smoothly
 2013-03-06 02:53:16 -08:00
Björn Schießle 82990b82a6 Merge pull request #2118 from owncloud/fix_1689 
properly implement displayNamesInGroup in Core and LDAP, fixes #1689
 2013-03-06 00:38:06 -08:00
Michael Gapczynski 4dcbaa1d7b Merge branch 'master' into shared-folder-etags 
Conflicts:
	apps/files_sharing/appinfo/app.php
 2013-03-05 21:54:32 -05:00
Michael Gapczynski 5300d6ad55 Clear the CSS and JS cache earlier to make sure update goes smoothly 2013-03-05 21:13:07 -05:00
Jenkins for ownCloud c1a32b5073 [tx-robot] updated from transifex 2013-03-06 00:08:33 +01:00
Arthur Schiwon 5da9223d1c make getDisplayNames optional feature for Group Backends, fall back to internal names 2013-03-05 21:22:34 +01:00
Michael Gapczynski ee0c38bb51 Fix group post_shared hook 2013-03-04 19:43:56 -05:00
Tom Needham 370f202251 Rebase to current master 2013-03-05 00:25:56 +00:00
Jenkins for ownCloud b738aaba2a [tx-robot] updated from transifex 2013-03-04 00:07:35 +01:00
Bart Visscher d800f35bf4 Disable loading of backgroundjobs js when upgrade is needed 2013-03-03 23:15:22 +01:00
Bart Visscher a2d6b27170 Check maintenance mode before loading apps in route matcher 2013-03-03 23:15:18 +01:00
Michael Gapczynski 71bdccf347 Chunk size comment should say kB, not MB 2013-03-03 12:03:26 -05:00
Jenkins for ownCloud 844e18a8b1 [tx-robot] updated from transifex 2013-03-03 00:06:56 +01:00
Frank Karlitschek 927a374dbe Merge pull request #2036 from owncloud/escape-only-in-template 
Escape the data only in the template
 2013-03-02 11:35:37 -08:00
Lukas Reschke 3e3c039292 Escape the data only in the template 2013-03-02 20:21:51 +01:00
Brice Maron 050de008b1 Avoid to display empty DisplayNames for menu and title 2013-03-02 16:09:36 +01:00
Lukas Reschke 5a9e9e0b51 Merge pull request #2026 from j-ed/master 
do not try to extract image infos from 0- or better less than 12-byte length files.
 2013-03-02 02:59:00 -08:00
j-ed 07b956c22d Update image.php 
don't try to extract image infos from 0- or better less than 12 byte length files. See description of `exif_imagetype` function at
`http://php.net/manual/de/function.exif-imagetype.php`.
 2013-03-02 10:51:49 +01:00
Frank Karlitschek 2b7ff7273d ownCloud 5 RC2 2013-03-02 04:06:27 +01:00
Jenkins for ownCloud 6c96b93fd4 [tx-robot] updated from transifex 2013-03-05 00:19:07 +01:00
Michael Gapczynski db23c885d9 Merge pull request #2096 from owncloud/cache-upgrade-id 
Cache: also check if the file id is already in the cache during upgrade
 2013-03-04 14:55:20 -08:00
Robin Appelman 9d9acf24de Cache: more efficient detection for existing entries during upgrade 2013-03-04 23:19:55 +01:00
Robin Appelman 56ae4bb6e9 Cache: also check if the file id is already in the cache during upgrade 
Should solve upgrade issues if only some of the configured storages were migrated previously
 2013-03-04 22:26:03 +01:00
Bernhard Posselt 62dde34887 Merge pull request #2088 from owncloud/fixing-1844-again-master 
adding test case for getDefaultEmailAddress() + fixing #1844 again
 2013-03-04 12:52:35 -08:00
Thomas Mueller 6019cdd5bd adding test case for getDefaultEmailAddress() + fixing #1844 again 2013-03-04 21:10:18 +01:00
Thomas Müller 5c061561c5 Merge pull request #2078 from owncloud/save_category_relations 
VCategories: Don't forget to save category relations if category exists.
 2013-03-04 12:04:16 -08:00
Lukas Reschke a97006144e Only send the standard headers 
Fixes https://github.com/owncloud/apps/issues/675
 2013-03-04 20:35:58 +01:00
Michael Gapczynski 8b09402b77 Fix #2074 by initializing as an array 2013-03-04 12:08:41 -05:00
Thomas Tanghus c08a04bc83 VCategories: Don't forget to save category relations if category exists. 2013-03-04 17:05:08 +01:00
Jenkins for ownCloud c9d9c381ec [tx-robot] updated from transifex 2013-03-02 00:05:42 +01:00
Lukas Reschke 5e7970f761 Merge master 2013-03-01 23:11:03 +01:00
Thomas Mueller 6c304fa5c0 validate the generated email address and fall back to localhost.localdomain in case it is not valid 
fixes #1844
 2013-03-01 22:24:19 +01:00
Thomas Mueller 39b9ed50d7 for this self test we don't care if the ssl certificate is self signed and the peer cannot be verified. 2013-03-01 20:34:16 +01:00
Frank Karlitschek f7cb53b103 Merge pull request #2008 from owncloud/1999-requesttoken 
Check if requesttoken exists in session
 2013-03-01 06:12:09 -08:00
Lukas Reschke 93f15215c6 Check if requesttoken exists in session 
Ref #1999
 2013-03-01 14:59:51 +01:00
Lukas Reschke 630becb95f Style fixes 2013-03-01 14:59:24 +01:00
Frank Karlitschek 09dc15d2b1 5.0 RC 1 2013-03-01 07:53:14 +01:00
Jenkins for ownCloud d20fd7e9a6 [tx-robot] updated from transifex 2013-03-01 00:07:02 +01:00
Bart Visscher 84aa2c66d6 Merge pull request #1937 from owncloud/check-resharing 
Check resharing setting
 2013-02-28 11:39:11 -08:00
Lukas Reschke dee16deacd Merge master 2013-02-28 20:03:06 +01:00
icewind1991 a86761e1e7 Merge pull request #1988 from owncloud/permissionscache_clean 
Clean permissions cache when deleting file
 2013-02-28 10:24:20 -08:00
Björn Schießle 1cc7e6d31a Merge pull request #1989 from owncloud/selectSanitize 
Sanitize HTML in html_select_options
 2013-02-28 08:51:07 -08:00
Lukas Reschke cef6131ea8 Sanitize HTML in html_select_options 2013-02-28 17:19:04 +01:00
Robin Appelman ee1eb98d4a Cache: cleanup permissions cache when removing a file from the cache 2013-02-28 17:04:50 +01:00
Robin Appelman f7a43391a7 Cache: add option to delete file from permissions cache for all users 2013-02-28 17:04:34 +01:00
Michael Gapczynski b5989c933f Merge branch 'master' into shared-folder-etags 
Conflicts:
	apps/files_sharing/lib/sharedstorage.php
 2013-02-28 10:39:23 -05:00
Bernhard Posselt 59835a9087 add checks for xml and dom when installing 2013-02-28 15:13:18 +01:00
Jenkins for ownCloud a93b5b47a1 [tx-robot] updated from transifex 2013-02-28 00:05:40 +01:00
Lukas Reschke b93ebe1860 Merge master 2013-02-27 23:36:52 +01:00
Lukas Reschke 229c907a57 [core] From echo to p 2013-02-27 22:55:39 +01:00
Bernhard Posselt 2f036bcc54 Merge pull request #1972 from owncloud/raw-pathinfo 
Use the plain urlencoded path info for the routing matching
 2013-02-27 13:43:47 -08:00
Bart Visscher d7528f06df Disable query cache for Sqlite 2013-02-27 22:32:39 +01:00
Bernhard Posselt 9508a58c79 Merge pull request #1944 from owncloud/query-caching-upgrade 
Disable prepared query caching while doing an upgrade
 2013-02-27 12:48:42 -08:00
Bart Visscher 56f3917f36 Use the plain urlencoded path info for the routing matching 2013-02-27 21:38:58 +01:00
Lukas Reschke 470fc3817f Remove the template autoescaping 
Ref #1963
 2013-02-27 20:53:52 +01:00
Michael Gapczynski 766a301a6b Merge pull request #1031 from owncloud/external_storage_ui_feedback 
External Storage UI Improvements
 2013-02-27 10:00:22 -08:00
Bernhard Posselt 5fd8d155fd Merge pull request #1962 from owncloud/big_upload_fix 
timeout after a longer time
 2013-02-27 07:05:19 -08:00
Bernhard Posselt 888e4f21d2 timeout after a longer time 2013-02-27 15:44:00 +01:00
Jenkins for ownCloud fd654e9c2f [tx-robot] updated from transifex 2013-02-27 14:37:12 +01:00
Bart Visscher 3a7322342e Merge pull request #1956 from owncloud/session-error-format 
add styles before session init
 2013-02-27 05:21:17 -08:00
Bart Visscher a708b63402 Merge pull request #1961 from owncloud/trans_fix 
fixed bug that would cause a failure because of undefined variable  inst...
 2013-02-27 05:17:30 -08:00
Bernhard Posselt 49a0f42e3b fixed bug that would cause a failure because of undefined variable instead of %s in a translation string 2013-02-27 14:13:07 +01:00
Bernhard Posselt a54be4acc4 Merge pull request #1948 from owncloud/improve_user_sorting 
Sort after display name + LDAP server side sorting
 2013-02-27 02:39:22 -08:00
Bernhard Posselt a1afc2e34f only add style.css to initsession 2013-02-27 11:36:05 +01:00
Bernhard Posselt 18b7a2bf21 add css and scripts before session init 2013-02-27 11:17:14 +01:00
Jenkins for ownCloud 348812f2ce [tx-robot] updated from transifex 2013-02-27 00:09:33 +01:00
Arthur Schiwon 60d4fdda57 sort users according to display name 2013-02-26 22:56:55 +01:00
Robin Appelman 47b899e0c8 Disable prepared query caching while doing an upgrade 2013-02-26 22:41:48 +01:00
Bart Visscher 4a26d63867 Fix using wrong quotes for breaking long lines 
Fixes #1925
 2013-02-26 20:48:01 +01:00
Michael Gapczynski 9a2ca0ae64 Check resharing setting 2013-02-26 13:31:15 -05:00
Thomas Tanghus ea841e5e15 Catch exceptions on malformed categories. 2013-02-26 15:01:42 +01:00
Bernhard Posselt b987c76d16 Merge pull request #1906 from owncloud/storage-stat-fail 
Common storage: don't throw warning when a stat fails
 2013-02-26 00:44:42 -08:00
Bernhard Posselt 5b250afafc Merge pull request #1903 from owncloud/fix_version_check 
return true once one owncloud version number is bigger at any position
 2013-02-26 00:37:11 -08:00
Michael Gapczynski 8983465210 Correct parent folders' ETags for all users with access to a shared file 2013-02-26 01:21:48 -05:00
Robin Appelman 52dccd4aa1 Storage: don't throw warnings when a stat fails 2013-02-26 02:53:02 +01:00
Robin Appelman 6b33a23a51 Code style 2013-02-26 02:51:57 +01:00
Jenkins for ownCloud 63d9feb8c0 [tx-robot] updated from transifex 2013-02-26 00:06:26 +01:00
Michael Gapczynski 4a05e8820f Merge branch 'master' into external_storage_ui_feedback 2013-02-25 17:56:40 -05:00
Bernhard Posselt f415f3e03e return true once one owncloud version number is bigger at any position 2013-02-25 23:06:26 +01:00
Lukas Reschke d713948d3f Merge pull request #1898 from owncloud/session_start_fix 
set http 500 when session could not be started to prevent serving of emp...
 2013-02-25 14:00:12 -08:00
Lukas Reschke 6735701c1e Merge pull request #1837 from owncloud/fix-user-template 
Remove unneeded code for user layout template
 2013-02-25 13:41:32 -08:00
Lukas Reschke a2a1e8c2cb Merge pull request #1839 from owncloud/no_recursive_object_walking 
Don't walk objects with array_walk_recursive()
 2013-02-25 12:53:23 -08:00
Thomas Müller 6dd1d479da Merge pull request #1706 from owncloud/master-sqlserver 
Microsoft SQL-Server support for ownCloud!
 2013-02-25 12:50:32 -08:00
Frank Karlitschek a533bb6dcd 5 beta 2 2013-02-25 20:00:40 +01:00
Bernhard Posselt 7f7b8bc07a use error template 2013-02-25 19:17:29 +01:00
Bernhard Posselt aba60dba28 added simple error message for the browser 2013-02-25 18:47:34 +01:00