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

12789 Commits

Author SHA1 Message Date
Morris Jobke de89c31f5a Merge pull request #4302 from synchrone/master 
Fixing owncloud/core#4301
 2013-08-14 17:11:30 -07:00
Andreas Fischer 75e9015b54 Merge pull request #4393 from owncloud/fix_4326 
provide correct path for require_once

* owncloud/fix_4326:
  use __DIR__ instead of realpath
  provide correct path for require_once
 2013-08-14 21:20:53 +02:00
Thomas Müller 06670cef8a Merge pull request #4304 from tripflex/lostpw-themed 
use theme name and title for password reset
 2013-08-14 12:04:40 -07:00
Thomas Müller 994537a5b9 Merge pull request #4372 from owncloud/allow_empty_configvalue 
allow empty configvalue in appconfig
 2013-08-14 10:34:06 -07:00
Jörn Friedrich Dreyer 8f3f47e868 Merge pull request #4376 from owncloud/use_plurals 
Use plural translations
 2013-08-14 10:23:19 -07:00
Thomas Müller b3b2b2d64c Merge pull request #4363 from owncloud/fix-4355 
Send mime-type for new files
 2013-08-14 09:46:10 -07:00
Bjoern Schiessle 7d0e9cc685 use __DIR__ instead of realpath 2013-08-14 17:15:01 +02:00
kondou 4002491947 Reword a phrase 2013-08-14 06:29:19 +02:00
Jörn Friedrich Dreyer 435e63b5ee Merge pull request #4410 from owncloud/fix_sharing_defaults 
Fix sharing defaults
 2013-08-13 15:27:24 -07:00
Jörn Friedrich Dreyer 11a404b90b comment clarification 2013-08-14 00:25:07 +02:00
Jörn Friedrich Dreyer ca95a475d5 use edit & reshare permission as default 2013-08-13 22:58:47 +02:00
Jörn Friedrich Dreyer 5660f99592 add PERMISSIONS_ALL summary 2013-08-13 22:58:27 +02:00
Jenkins for ownCloud 9492aeffe9 [tx-robot] updated from transifex 2013-08-13 09:13:11 -04:00
Bjoern Schiessle eb0fdc8380 provide correct path for require_once 2013-08-12 17:38:57 +02:00
icewind1991 77596ace81 Merge pull request #4391 from owncloud/scanner-reuse-recursive 
Fix recursive scanner to reusing etags
 2013-08-12 08:28:23 -07:00
Robin Appelman f22719b1ee Scanner: correctly pass trough reuse options when doing a recursive scan 2013-08-12 15:37:39 +02:00
Robin Appelman 1877a42a0d Scanner: additional tests for reusing etags during scanning 2013-08-12 15:37:15 +02:00
Jenkins for ownCloud 5ebff8cfc4 [tx-robot] updated from transifex 2013-08-11 08:11:03 -04:00
Owen Winkler 4128561f22 Merge pull request #4360 from owncloud/format-date-numeric-strings 
Do not pass numeric strings to strtotime() when formatting dates.
 2013-08-09 16:05:01 -07:00
Thomas Müller 0e3dea7111 adding test case for a numeric value 2013-08-09 23:36:23 +02:00
Andreas Fischer b6b1bc5d09 Add datetime test for numeric string. 2013-08-09 22:32:38 +02:00
Andreas Fischer 43be3eb4d0 Changing elseif statement to what the PEAR coding guidelines say. 2013-08-09 22:32:38 +02:00
Andreas Fischer 9c22046bff Do not pass numeric strings to strtotime() when formatting dates. 
strtotime() will return false and the date will be formatted as the 0-timestamp
(e.g. January 1, 1970 00:00) otherwise.
 2013-08-09 22:32:38 +02:00
kondou 9549bd3e68 Use plural translations 2013-08-09 20:37:18 +02:00
Jan-Christoph Borchardt 4c0ec974b9 Merge pull request #4344 from owncloud/appmgmt-in-navigation 
show 'More apps' link to app administration directly in app navigation
 2013-08-09 08:49:41 -07:00
Jenkins for ownCloud 98f836363a [tx-robot] updated from transifex 2013-08-09 08:06:31 -04:00
Jörn Friedrich Dreyer 9334974a92 allow empty configvalue in appconfig 2013-08-09 11:27:21 +02:00
Myles McNamara f5d23c469d use getName instead of getTitle 2013-08-08 16:21:47 -04:00
Andreas Fischer beb27168de Use multiple lines for the JSON data array. 2013-08-08 22:14:21 +02:00
Andreas Fischer 0ab8850478 Adjust JSON code to stable5. 2013-08-08 22:14:21 +02:00
Andreas Fischer 1ed049a682 Do not repeat JSON success code. 2013-08-08 22:14:21 +02:00
Andreas Fischer 0718c92dc8 Do not repeat definition of $target. 2013-08-08 22:13:53 +02:00
Owen Winkler a2ac5e0163 Merge pull request #4271 from owncloud/plural_translations 
Plural translations
 2013-08-08 10:34:28 -07:00
Jörn Friedrich Dreyer e38025ba67 Merge pull request #4151 from owncloud/doctrine-object 
Move dbtype depending logic into object per type
 2013-08-08 08:46:30 -07:00
Björn Schießle c24bf47db8 Merge pull request #4349 from owncloud/oc_cache_fix 
oc_cache needs to disable file proxys for read/write operation.
 2013-08-08 08:19:14 -07:00
Morris Jobke 062769ab61 Remove noisy Log/Debug message 2013-08-08 16:39:33 +02:00
Jan-Christoph Borchardt 8652137ad6 Merge pull request #3912 from owncloud/css_cleanup_kondou 
General CSS cleanup
 2013-08-08 07:31:01 -07:00
icewind1991 118c3d8a38 Merge pull request #4353 from owncloud/fix_search_user 
fix function call for searchUsers()
 2013-08-08 06:23:53 -07:00
Bjoern Schiessle df358dfef5 fix function call for searUsers() 2013-08-08 13:41:04 +02:00
Björn Schießle c2f40d2495 Merge pull request #4243 from owncloud/no_empty_versions 
don't create empty versions
 2013-08-08 03:57:43 -07:00
Morris Jobke 35e1d8b265 Merge pull request #4328 from owncloud/cleanupdb_kondou 
Clean up DB, after we're done with testing Preferences
 2013-08-08 01:36:10 -07:00
Bjoern Schiessle ab6e47b44a oc_cache needs to disable file proxys for read/write operation. Otherwise the operation will go through the encryption app which will not work. 2013-08-08 09:44:19 +02:00
Thomas Müller f7915d745a Merge pull request #4340 from owncloud/true-false-as-filename 
Allow true and false as filenames.
 2013-08-08 00:03:50 -07:00
Bjoern Schiessle b39d2d1938 more error messages which might be useful for the user to debug his server config 2013-08-08 08:39:11 +02:00
Bjoern Schiessle 7ce03ba37c improved error message to refect openSSL PHP extension and stock openSSL configuration issues 2013-08-08 08:39:01 +02:00
Bjoern Schiessle 7aeb0068be also write error message to the log 2013-08-08 08:38:52 +02:00
Bjoern Schiessle cfbdad9cdb catch broken server config and disable encryption app. 2013-08-08 08:38:37 +02:00
Bart Visscher d563367b0f More style fixes 2013-08-07 22:22:33 +02:00
Jan-Christoph Borchardt 31d50288a5 draw attention to the newly added app entry by flashing it twice 2013-08-07 21:54:28 +02:00
Jan-Christoph Borchardt 7a9daa99d1 scroll the app navigation down so the newly added app is seen 2013-08-07 21:53:53 +02:00