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

12330 Commits

Author SHA1 Message Date
Thomas Müller ae9b60ba61 Merge pull request #4119 from owncloud/external-storage-status 
replace external storage status images with CSS, also use form to distinguish
 2013-07-19 13:54:19 -07:00
Arthur Schiwon f6d133955e LDAP: fix background job, resolves #3528 2013-07-19 18:41:29 +02:00
Arthur Schiwon a8dfee04b8 Add message about completed update 2013-07-19 14:39:47 +02:00
Arthur Schiwon 2656ac9eeb non-ajax Upgrade script utility, usable via CLI or wget. Requires PR 4047. 2013-07-19 14:39:38 +02:00
Jenkins for ownCloud ae82f7fd17 [tx-robot] updated from transifex 2013-07-19 02:03:14 -04:00
Andreas Fischer 2c38c2a70e Merge pull request #3947 from runky/patch-1 
* runky/patch-1:
  Update authenticate.php
 2013-07-19 02:19:14 +02:00
Bart Visscher 084cf0c202 Merge pull request #2221 from owncloud/doctrine 
OC6: Implement Doctrine as the backend for OC_DB
 2013-07-18 14:24:27 -07:00
Jan-Christoph Borchardt 100eb2b611 replace external storage status images with CSS, also use form to distinguish, fix #3910 2013-07-18 23:00:04 +02:00
Bart Visscher e2b6781cf9 Tweaks to the MDB2SchemaReader 2013-07-18 21:07:56 +02:00
Jenkins for ownCloud 279a71acb3 [tx-robot] updated from transifex 2013-07-18 02:02:51 -04:00
Thomas Müller 3c6b205e37 Merge pull request #4099 from owncloud/fixing-unix-timestamp-mssql-master 
fixing UNIX_TIMESTAMP() for mssql
 2013-07-17 13:57:43 -07:00
Thomas Müller 93b9bad6bb Update build.xml 2013-07-17 15:25:41 +02:00
Markus Goetz 3fd4ff79ee Merge pull request #4042 from guruz/webdav_auth_check_existing 
WebDAV Auth Connector: Check if already logged in
 2013-07-17 05:00:59 -07:00
Markus Goetz bf7514f76a WebDAV Auth Connector: Check if already logged in 2013-07-17 13:51:15 +02:00
Thomas Mueller 24283425a6 fixing UNIX_TIMESTAMP() for mssql 2013-07-17 13:18:46 +02:00
Thomas Müller a3ff771567 Merge pull request #4067 from owncloud/fixing-tests-win32-master 
<<<EOL seems not to use proper end of lines on windows
 2013-07-17 00:37:02 -07:00
Jenkins for ownCloud 210006c4a6 [tx-robot] updated from transifex 2013-07-17 02:28:02 -04:00
Robin Appelman b2bcc9774b memcache: make base testcase abstract 2013-07-16 23:11:22 +02:00
icewind1991 e09ffb6f57 Merge pull request #2395 from owncloud/cache 
Seperate the memory based cache and file based cache in OC_Cache
 2013-07-16 13:25:07 -07:00
Bart Visscher 285f288cf3 Merge pull request #3959 from owncloud/buildNotExistingFileNameForView 
Fix renaming using parenthesis
 2013-07-16 12:06:53 -07:00
Robin Appelman dc1a17b6f4 memcache: also switch factory to prefix 2013-07-16 16:08:37 +02:00
Robin Appelman 504089940d mamcache: implement the ArrayAccess interface 2013-07-16 16:06:00 +02:00
Robin Appelman 8ad148feaf memcache: some additional unit tests 2013-07-16 15:46:27 +02:00
Robin Appelman 69048ab71f memchache: use prefix string instead of global flag 2013-07-16 15:42:40 +02:00
Robin Appelman d82c1dfcab split out memcache factory from base class 2013-07-16 15:34:22 +02:00
Robin Appelman 0ae8eb4f5e Merge branch 'master' into cache 2013-07-16 15:22:47 +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 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
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
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
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
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