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

12649 Commits

Author SHA1 Message Date
Thomas Müller 5cba09e931 fixing / adding comments 2013-07-16 11:35:48 +02:00
Thomas Müller 9c0bf5c41a Merge branch 'master' into ext-fs-irods-master 2013-07-16 11:30:56 +02:00
Thomas Müller d673d8c253 Merge pull request #4075 from owncloud/markdown-readme-master 
Markdown readme master
 2013-07-16 02:29:58 -07:00
VicDeo feb01847e7 Merge pull request #4076 from owncloud/fix_typos_kondou 
Fix some typos
 2013-07-16 01:23:16 -07:00
Jan-Christoph Borchardt 7403cfff8b update 'get in touch' links 2013-07-16 09:50:06 +02:00
Jenkins for ownCloud a8acbfdf7b [tx-robot] updated from transifex 2013-07-16 02:06:21 -04:00
kondou d9c697534d Fix some typos 2013-07-16 06:01:26 +02:00
Thomas Müller 4e625202d1 Use EXECUTOR_NUMBER in database name and user name. 2013-07-16 00:53:56 +02:00
Thomas Müller bfa0496fbb initial markdown verions of README 2013-07-15 23:58:51 +02:00
Thomas Müller a457501394 rename README 2013-07-15 23:46:28 +02:00
Bart Visscher 1a2db491af Merge pull request #3962 from owncloud/move-error-handlers 
Move error handlers from OC_Log to OC\Log\ErrorHandler
 2013-07-15 09:23:37 -07:00
Georg Ehrke 63791e2d8d return empty array instead of 0 2013-07-15 16:58:30 +02:00
Thomas Mueller 7ba4269c26 <<<EOL seems not to use proper end of lines on windows 2013-07-15 10:28:14 +02:00
Jenkins for ownCloud f2639d6269 [tx-robot] updated from transifex 2013-07-15 02:34:45 +02:00
Thomas Müller 6f5b0af67f Merge pull request #3487 from owncloud/basic_auth_hack 
Basic Auth is broken - again...
 2013-07-14 14:56:45 -07:00
Thomas Müller 2964027cad Merge branch 'disable-anon-upload-master' of github.com:owncloud/core into disable-anon-upload-master 2013-07-14 22:00:42 +02:00
Thomas Müller 79d23463f8 No admin option to enable public upload in case encryption is enabled 
No upload on pubic page if public upload is disabled
 2013-07-14 21:58:08 +02:00
Jan-Christoph Borchardt 7cc22443e3 Merge pull request #4061 from rolandgeider/master 
Use transifex.com on link to translations
 2013-07-14 10:52:43 -07:00
rolandgeider 995feea42a Use transifex.com on link to translations 2013-07-14 11:54:39 +02:00
Jenkins for ownCloud 29d8ae2f95 [tx-robot] updated from transifex 2013-07-14 02:10:41 +02:00
kondou 0d604a6c9a Include $defaults 2013-07-13 18:44:36 +02:00
Michael Gapczynski 00e2b46017 Fix 'most' Google Drive tests 2013-07-13 11:02:07 -04:00
Frank Karlitschek ccb3c5b428 Removed the preview warning. This is only a simple text change 2013-07-13 13:31:55 +02:00
Bart Visscher 5549c77ec5 Merge branch 'master' into doctrine 
Conflicts:
	3rdparty
	lib/db.php
	lib/setup.php
	tests/lib/db.php
	tests/lib/dbschema.php
 2013-07-13 12:01:14 +02:00
Jenkins for ownCloud 583addaea1 [tx-robot] updated from transifex 2013-07-13 02:07:35 +02:00
Thomas Mueller 7a44d45714 change anonymous to public 2013-07-12 21:34:38 +02:00
Thomas Müller c3e16a7388 fixing Undefined index: publicUploadEnabled 2013-07-12 17:51:01 +02:00
Thomas Müller 5f5700e353 in case the encryption app is enabled we cannot yet allow anonymous upload 2013-07-12 17:05:58 +02:00
Thomas Müller fc2d538311 new admin setting added which allows to turn off anonymous uploads 2013-07-12 17:03:51 +02:00
Thomas Müller d1c0564711 Merge branch 'master' into ext-fs-irods-master 2013-07-12 15:30:01 +02:00
Thomas Müller ca16c08ba1 update copy right 2013-07-12 15:28:01 +02:00
Thomas Müller e9c10f65b4 update .gitignore 2013-07-12 15:16:30 +02:00
Thomas Müller 01378e1907 incorporate development branch of ssh://irodsguest@code.renci.org/gitroot/irodsphp 2013-07-12 15:08:13 +02:00
Kondou 8ae2066b20 Merge pull request #4037 from owncloud/add_new_file_above_summary 
add new file above summary if it is the first file in the list
 2013-07-12 03:45:45 -07:00
Björn Schießle b16c5a6df7 fix array access and change variable names according to the coding style 2013-07-12 11:25:40 +02:00
Björn Schießle 15f7bb296c continue cleaning-up old versions if availableSpace=0. It's not necessary but gives us some additional free space, especially in the case of a hard quota 2013-07-12 11:25:31 +02:00
Björn Schießle fbf34f3bf6 fix some var names according to our style guide 2013-07-12 11:25:23 +02:00
Björn Schießle 2f0d88cae4 adjust comments 2013-07-12 11:25:12 +02:00
Björn Schießle e7959d3da0 fix typo in comment 2013-07-12 11:25:04 +02:00
Björn Schießle e8760d7284 also expire versions on rename, to update the history more regularly 2013-07-12 11:24:52 +02:00
Björn Schießle d6c1e5490d it is enough to call the expire function once 2013-07-12 11:24:31 +02:00
Björn Schießle e159143165 call expire function before writing the new version to make sure to have enough free space 2013-07-12 11:24:19 +02:00
Björn Schießle cb81ceb31d add new file above summary if it is the first file in the list 2013-07-12 10:40:24 +02:00
Thomas Müller 481bb831bb Merge branch 'master' into ext-fs-irods-master 2013-07-12 09:54:39 +02:00
Thomas Müller 24b4806af4 Merge branch 'master' into googledrive 2013-07-12 09:43:04 +02:00
icewind1991 3abe68176f Merge pull request #3270 from owncloud/convert-oc_config 
Convert OC_Config to object so it can be used for DI
 2013-07-11 18:21:08 -07:00
Jenkins for ownCloud 3fbf7ab189 [tx-robot] updated from transifex 2013-07-12 02:12:25 +02:00
Jan-Christoph Borchardt 83b2411b81 reword LDAP config and use themable strings, fix rest of #3791 2013-07-11 17:45:13 +02:00
Jan-Christoph Borchardt 30ab6580f6 reword WebDAV auth to not have 'ownCloud' anymore 2013-07-11 17:42:16 +02:00
Jan-Christoph Borchardt 7741ca0bcc use themable strings for admin page, simplify admin export, fix rest of #3791 2013-07-11 17:41:36 +02:00