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

12992 Commits

Author SHA1 Message Date
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
Bernhard Posselt f5c3a346b0 make log date configurable, default to iso 8601 2013-08-02 13:34:20 +02:00
kondou 670242c731 Add \OC_Appconfig Unittest 2013-08-02 13:22:12 +02:00
Bart Visscher 59c5529a2b Rename \OC\DB\Schema to \OC\DB\MDB2SchemaManager 2013-08-02 13:19:27 +02:00
Bart Visscher 9432885428 Change OC_DB_Schema to use DI for db connection object 2013-08-02 13:14:18 +02: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
Thomas Müller 3500c39567 adding new cli script to rescan files 2013-08-01 22:49:43 +02:00
Jakob Sack 2f17dcdba8 Fix syntax error. 2013-08-01 21:46:52 +02:00
Jakob Sack eee2c369d9 Fix copy and paste errors in l10n.php 2013-08-01 21:36:33 +02:00
Jakob Sack 9673a563b5 Create plural functions on the fly 2013-08-01 21:25:14 +02: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
Jakob Sack 495e44e76c Update l10n.php to read plural_forms string 2013-08-01 19:54:51 +02:00
Jakob Sack e064e53aa3 Save the plural information given in po files 2013-08-01 19:13:52 +02:00
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