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

13338 Commits

Author SHA1 Message Date
Victor Dubiniuk 85f1de884f Better ie8 multiselect 2013-08-01 19:59:32 +03:00
Victor Dubiniuk 0c1008bb69 Some styling to user list 2013-08-01 19:53:41 +03:00
kondou 1348330c7d Fix a syntax error & have if-conds in an own line 2013-08-01 18:44:01 +02: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
kondou aaf0fec9f5 Fix some JSLint warnings 2013-07-31 21:21:02 +02:00
Jan-Christoph Borchardt ded02e771e wrap code output in error messages, fix #4231 2013-07-31 18:08:29 +02: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
Bjoern Schiessle d7dd2ee465 don't know why it works locally but not on the build server... let's keep it out for the moment 2013-07-31 16:44:43 +02:00
Bjoern Schiessle 23e9721644 use OC\Files\View to read encrypted file, so that it also works with external storages 2013-07-31 16:35:14 +02:00
Bjoern Schiessle fe2937e3cd this hopefully fixes testRecoveryForUser(), works locally 
for now I disabled testRecoveryFile(), no idea why jenkins deletes complete folders... Works nicely in the real world
 2013-07-31 16:15:49 +02:00
Bjoern Schiessle 58233033c1 this test works locally, let's see what out build server says... 2013-07-31 12:03:50 +02:00
Bjoern Schiessle 99354f9a28 fix searchUsers() call in group.php 2013-07-31 11:34:22 +02:00
Jan-Christoph Borchardt 8eaa0e7336 remove table layout for background jobs 2013-07-31 10:04:02 +02:00
Jan-Christoph Borchardt 0a5be39446 remove unused and never to be used pagination 2013-07-31 09:58:57 +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
Bjoern Schiessle 6c96a5273b fixing some unit tests 2013-07-30 18:21:23 +02:00
Bjoern Schiessle 2549322763 we need to use the path relative to data/ 2013-07-30 18:17:33 +02: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 853b106bb2 don't create empty versions 2013-07-30 16:01:27 +02:00
Bjoern Schiessle a212c98125 handle error if we can't handle the given path 2013-07-30 15:27:59 +02:00
Jan-Christoph Borchardt 31afbb3434 remove ugly inset shadow from header 2013-07-30 14:47:05 +02:00
Jan-Christoph Borchardt f9d1d79929 reduce z-index of settings popup, fix #4212 2013-07-30 14:43:48 +02:00
Bjoern Schiessle a6ced6b53f remove unused method, the right one is in util.php 2013-07-30 14:28:24 +02:00
Bjoern Schiessle aca7fbe2c8 adapt unit tests to the modified stream wrapper 2013-07-30 14:18:01 +02:00
Georg Ehrke 93cdfc3e8a Merge branch 'master' into oc_preview 2013-07-30 13:52:53 +02:00
Georg Ehrke 640253fa31 fix code style of try catch blocks 2013-07-30 13:43:15 +02:00
Bjoern Schiessle 6f20e081e4 added missing isEmpty ajax file 2013-07-30 12:48:41 +02:00
Georg Ehrke d84d8f7108 fix merge conflicts 2013-07-30 12:35:39 +02:00
Georg Ehrke ac6a3133ec style fixes 2013-07-30 12:33:54 +02:00
Bjoern Schiessle c7eba69aea only show decrypt all files option if encrypted files are available 2013-07-30 12:26:07 +02:00