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

12651 Commits

Author SHA1 Message Date
Thomas Müller afc8ee721d Merge pull request #4299 from owncloud/simplify-db-transaction 
Simplify OC_DB transaction functions
 2013-08-02 12:32:41 -07:00
Bart Visscher 43b31f2161 Merge pull request #4283 from owncloud/add_ocimage_unittest 
Add ocimage unittest
 2013-08-02 08:27:24 -07:00
Bart Visscher fd317f599b Simplify OC_DB transaction functions 2013-08-02 16:12:34 +02:00
Thomas Müller 821a99b937 Merge pull request #4287 from Takuto88/language-config 
Make default language configurable via config.php
 2013-08-02 06:49:54 -07:00
kondou de0dc30d89 Update skipped tests messages 2013-08-02 15:00:12 +02:00
Jörn Friedrich Dreyer 90d718634b Merge pull request #4274 from owncloud/breadcrumbs_show 
add OC.Breadcrumb.show(dir, filename, link)
 2013-08-02 05:42:17 -07:00
kondou 12ee590b2c Merge branch 'master' into add_ocimage_unittest 2013-08-02 13:39:48 +02:00
Thomas Tanghus c5c05b808c Merge pull request #4284 from owncloud/dont_fatal_on_is_file 
Don't throw a fatal, if is_file() parameter isn't a 'valid path', but only a data/base64-string.
 2013-08-02 04:38:26 -07:00
Jörn Friedrich Dreyer 895d9ba1b9 Merge pull request #3006 from owncloud/===_and_!==_in_files_trashbin-app 
Use !== and === in files_trashbin app
 2013-08-02 03:14:24 -07:00
Jörn Friedrich Dreyer f8bb4e10ae use fixed OC.Breadcrumb.push() 2013-08-02 11:46:44 +02:00
Jörn Friedrich Dreyer b12c1cb325 add OC.Breadcrumb.show(dir, filename, link) 2013-08-02 11:46:44 +02:00
Jörn Friedrich Dreyer 41739ff83f Merge pull request #4278 from owncloud/breadcrumb-first 
make sure the first breadcrumb item is inserted before any other elements in the topbar
 2013-08-02 02:46:12 -07:00
Lennart Rosam ad329f541b users's -> user's 2013-08-02 11:19:33 +02:00
Lennart Rosam 504beb6cfd Fix typo (again >.<).. gnah 2013-08-02 10:01:34 +02:00
Lennart Rosam 79351d064f Make default language configurable via config.php 2013-08-02 09:41:31 +02:00
Jenkins for ownCloud 16726ab793 [tx-robot] updated from transifex 2013-08-02 02:00:45 -04:00
kondou 1b567b2ad1 Don't throw a fatal, if is_file() parameter isn't 
a 'valid path', but only a data/base64-string.

Related to #4283
 2013-08-01 21:01:26 +02:00
kondou 20b688d4be Optimize image and skip mimetype test 2013-08-01 20:17:43 +02:00
kondou 415e38fc50 Cover more cases 
Use file_get_contents() and base64_encode(file_get_contents()),
to load from data and base64, to cover more cases
 2013-08-01 20:17:43 +02:00
kondou 71f43c5fa1 Add OC_Image Unit Test 
data() somehow does not return, what file_get_contents() returns,
so I skipped related tests.
 2013-08-01 20:17:43 +02:00
Victor Dubiniuk 0c1008bb69 Some styling to user list 2013-08-01 19:53:41 +03:00
Jörn Friedrich Dreyer eed63ae512 Merge pull request #4221 from owncloud/fix-3698 
Fix calculating size for empty folders
 2013-08-01 08:05:19 -07:00
Robin Appelman 44594fb41c make sure the first breadcrumb item is inserted before any other elements in the topbar 2013-08-01 16:46:01 +02:00
Björn Schießle 930f0e4c18 Merge pull request #4270 from owncloud/fix_4253 
cancel sharing if some users doesn't have a working encryption set-up.
 2013-08-01 07:43:50 -07:00
Jörn Friedrich Dreyer 77dad7070d Merge pull request #4265 from berendt/OC_Files_Storage_AmazonS3_phpdoc 
added @var tags
 2013-08-01 07:40:01 -07:00
Jörn Friedrich Dreyer 43c6d82825 Merge pull request #4266 from berendt/OC_Files_Storage_AmazonS3_logging 
write all catched exception messages to the log
 2013-08-01 07:38:45 -07:00
Bjoern Schiessle 69173c2a6b fix test and make warning translatable 2013-08-01 14:19:33 +02:00
Bjoern Schiessle 9253627327 cancel sharing if some users doesn't have a working encryption set-up. 2013-08-01 13:04:55 +02:00
Morris Jobke 30963d60bc Merge pull request #4155 from owncloud/mdb2schemareader-booleans 
Fix boolean support for xml schema definitions
 2013-08-01 02:09:01 -07:00
Christian Berendt 5a4c39207e write all catched exception messages to the log 2013-08-01 10:08:41 +02:00
Christian Berendt 3e53e25cd1 added @var tags 2013-08-01 10:05:01 +02:00
Morris Jobke 0d69feb12e Merge pull request #4208 from owncloud/scanner-php53 
Fix scanner hooks throwing errors
 2013-08-01 00:05:56 -07:00
Jenkins for ownCloud b037f2dc6e [tx-robot] updated from transifex 2013-08-01 01:57:04 -04:00
Morris Jobke 563c63bf9c Merge pull request #4259 from owncloud/search_result_scrollbar 
Search result scrollbar
 2013-07-31 13:03:41 -07:00
Jörn Friedrich Dreyer cbf17617b0 update css properties with px based values 2013-07-31 17:07:23 +02:00
Jörn Friedrich Dreyer 627fd8ba8d add overflow-y scroll and clean up indents 2013-07-31 17:07:08 +02:00
Morris Jobke 50101a85a6 Merge pull request #3982 from owncloud/test_lastinsertid 
test lastinsertid
 2013-07-31 00:03:29 -07:00
Jenkins for ownCloud 761f40328c [tx-robot] updated from transifex 2013-07-31 02:01:45 -04:00
Andreas Fischer 79d355b526 Merge pull request #4246 from owncloud/speedup-autotest-master 
use tmpfs at /dev/shm to speedup unit test execution

* owncloud/speedup-autotest-master:
  use tmpfs at /dev/shm to speedup unit test execution
 2013-07-31 02:59:15 +02:00
Thomas Müller d3e610f589 Merge pull request #4225 from owncloud/better-404 
More verbose 404, closes #3225
 2013-07-30 13:20:28 -07:00
Victor Dubiniuk 15e9e95817 Use default cursor for list items 2013-07-30 20:58:21 +03:00
Morris Jobke dc8132f3a3 Merge pull request #4238 from owncloud/fix_4235 
added missing isEmpty ajax file
 2013-07-30 09:28:39 -07:00
Thomas Müller 01165fbd22 use tmpfs at /dev/shm to speedup unit test execution 2013-07-30 17:41:52 +02:00
Thomas Müller f35aadb576 Merge pull request #4227 from owncloud/fixing-testGetById-master 
implement a platform independent version of basename
 2013-07-30 08:39:53 -07:00
Jörn Friedrich Dreyer 91318f7b06 Merge pull request #4237 from owncloud/fixing-4026-master 
Allow public upload together with password protection
 2013-07-30 08:30:07 -07:00
Bjoern Schiessle 6f20e081e4 added missing isEmpty ajax file 2013-07-30 12:48:41 +02:00
Thomas Müller 10939b0bdf Updating to the latest 3rdparty master commit 2013-07-30 11:09:58 +02:00
Thomas Müller 17c36b5074 fixes #4026 2013-07-30 10:26:42 +02:00
Thomas Müller 409268f322 adding test case with no / 2013-07-30 08:54:39 +02:00
Jenkins for ownCloud 88e1ccbce3 [tx-robot] updated from transifex 2013-07-30 01:57:50 -04:00