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

16006 Commits

Author SHA1 Message Date
Thomas Müller 0d94da7e9e Merge pull request #7099 from owncloud/fix-autoconfig-master 
fixing autoconfig handling
 2014-02-06 14:35:31 +01:00
Vincent Petry aff1cafaca Merge pull request #7089 from owncloud/sharing-searchbymime 
Fixed searchByMime in shared cache
 2014-02-06 14:15:00 +01:00
Morris Jobke 8f7b99d2e5 Merge pull request #7105 from NCTU-NBA/pr-7098 
Fix #7098
 2014-02-06 11:02:06 +01:00
Pellaeon Lin 946fccc0dd Remove unused template variable assignment of files_sharing/template/public.php 2014-02-06 12:26:36 +08:00
Pellaeon Lin 8c56e21ced Move template variable assignment to correct place 2014-02-06 12:06:16 +08:00
Thomas Müller e2625ae7aa fixing autoconfig handling 2014-02-05 18:23:40 +01:00
Thomas Müller e2a28e5d1d Merge pull request #7091 from owncloud/jenkins-catchsetuperrors 
Catch setup errors during autotest
 2014-02-05 17:51:33 +01:00
Jan-Christoph Borchardt 61aa6ead83 Merge pull request #6490 from owncloud/theming-for-appstemplate 
do not show 'Add app' and 'More apps' for themed ownCloud
 2014-02-05 16:49:07 +01:00
Jan-Christoph Borchardt b0692af29a Merge pull request #7064 from owncloud/files-scrolltopafterupdate 
Scroll to the top after switching dir
 2014-02-05 16:13:55 +01:00
Vincent Petry 20935f4e24 Catch setup errors during autotest 2014-02-05 15:34:08 +01:00
Björn Schießle 697b25f165 Merge pull request #7032 from owncloud/enc_fix_delete 
Encryption replace delete proxy with pre/post hooks and add tests
 2014-02-05 14:26:52 +01:00
Vincent Petry fa5ddc3e18 Fixed searchByMime in shared cache 
- searchByMime now correctly returns files recursively search through
  all the dirs
- added unit test for searchByMime
 2014-02-05 13:29:06 +01:00
Vincent Petry 3d88b10f20 Merge pull request #7067 from owncloud/core-sessionheartbeatconfig 
Core sessionheartbeatconfig
 2014-02-05 10:03:36 +01:00
Thomas Müller ced80c6f27 Merge pull request #6969 from owncloud/tests-morecoverage 
Fixed unit test scripts + coverage
 2014-02-04 12:21:13 -08:00
Thomas Müller 6d3b61f388 Merge pull request #7011 from owncloud/jshint 
Added .jshintrc
 2014-02-04 12:11:32 -08:00
Thomas Müller 45ab9810c5 fixing typos 2014-02-04 20:58:06 +01:00
Vincent Petry fe2a63ffd4 Scroll to the top after switching dir 
Fixes #7061
 2014-02-04 18:59:43 +01:00
Jan-Christoph Borchardt 0609f30d1c Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msg 
Change misleading message when file size exceeds upload limit
 2014-02-04 08:04:19 -08:00
Vincent Petry bd6734291c Merge pull request #6081 from owncloud/partfilewebdavfix 
Allow getting info or renaming part files through WebDAV
 2014-02-04 07:48:37 -08:00
Morris Jobke 3c80071807 Merge pull request #4795 from owncloud/setup 
Move core setup code to controller class
 2014-02-04 06:04:21 -08:00
icewind1991 a27529709b Merge pull request #6647 from owncloud/memcache-public 
Add Memcache to the public api
 2014-02-04 05:38:53 -08:00
Vincent Petry e266e50699 Merge pull request #7065 from owncloud/errorHandler_tests 
add test for the password remove method
 2014-02-04 05:36:17 -08:00
Vincent Petry e75f7e58e9 Added unit tests for session_keepalive / heartbeat 2014-02-04 13:56:41 +01:00
Vincent Petry 912da8d277 Added session_keepalive setting 
When session_keepalive is true (default) the heartbeat will be send as
often as the half of the session timeout value.
 2014-02-04 13:56:10 +01:00
Bjoern Schiessle 36838b2837 add test for password remove method 2014-02-04 11:18:04 +01:00
Jan-Christoph Borchardt 49f0f9f2f6 Merge pull request #7057 from owncloud/pictures-icon 
better picture icon, fix https://github.com/owncloud/apps/issues/1401
 2014-02-03 15:57:41 -08:00
Jan-Christoph Borchardt 3692260174 Merge pull request #7055 from owncloud/ellipsize-modified-date 
ellipsize long modified dates to make room for showing delete button
 2014-02-03 15:57:00 -08:00
Jan-Christoph Borchardt cfcd71f3e4 better picture icon, fix https://github.com/owncloud/apps/issues/1401 2014-02-03 18:47:25 +01:00
Jan-Christoph Borchardt b56dbbe0e5 fix misalignment of modified dates, shift to right 2014-02-03 17:26:49 +01:00
Jan-Christoph Borchardt 6d7d3c16d0 ellipsize long modified dates to make room for showing delete button, fix #7040 2014-02-03 17:24:44 +01:00
Björn Schießle 9a0d7c5be4 Merge pull request #7014 from owncloud/fix_ocs_share_api 
remove needless element tag from the ocs share api
 2014-02-03 08:02:54 -08:00
Björn Schießle c0aeaf9ec0 Merge pull request #7013 from owncloud/dont_write_passwords_to_log 
wrap stat() call in a try/catch block
 2014-02-03 07:58:44 -08:00
Bjoern Schiessle 97921d0c25 add function to extract filename from sharekey name + tests 2014-02-03 13:39:05 +01:00
Bjoern Schiessle cf5277b558 also load error handler if debugging is enabled 2014-02-03 12:08:28 +01:00
Bjoern Schiessle 44b637470c remove passwords in URLs from all log messages 2014-02-03 12:07:56 +01:00
Bjoern Schiessle fe5f512272 added tests for the delete hooks if the trash bin is disabled 2014-02-01 20:08:23 +01:00
Morris Jobke 5844d682a7 Use === instead of ==, add missing whitespace and CSS class 2014-02-01 15:02:36 +01:00
Bjoern Schiessle bef58f5361 don't expect OC_FilesystemView, this is depreciated 2014-01-31 20:39:52 +01:00
Bjoern Schiessle 4d1086c35f better error detection and don't use glob() 2014-01-31 20:39:11 +01:00
Bjoern Schiessle 5610842e56 move unlink proxy to a hook which handles pre and post conditions 2014-01-31 20:38:35 +01:00
icewind1991 cf6538abde Merge pull request #7025 from owncloud/prevent-double-app-load 
Mark an app as loaded before we start loading it
 2014-01-31 08:47:19 -08:00
Bart Visscher f1c60c7f8b Remove unused functions from OC_Helper 
init_var and init_radio  where only used in the installation template
 2014-01-31 17:33:15 +01:00
Bart Visscher d8ec7e2701 DRY for database type radiolist 2014-01-31 17:31:19 +01:00
Bart Visscher 12a900de25 Do setup default value handling in the controller not the template 2014-01-31 16:57:49 +01:00
Bart Visscher bca725dc32 Merge branch 'master' into setup 
Conflicts:
	core/setup.php
 2014-01-31 16:43:12 +01:00
Georg Ehrke 1f30bffba3 Merge pull request #7017 from owncloud/trashpreview 
Fixed image preview in trashbin subdirs
 2014-01-31 07:29:08 -08:00
Robin Appelman 0d9fe770f3 Mark an app as loaded before we start loading it 2014-01-31 15:12:21 +01:00
Morris Jobke 1a24bf4625 Merge pull request #5151 from owncloud/file-actions 
Slightly better looking file actions.
 2014-01-31 01:30:36 -08:00
raghunayyar 5ccb395ec6 Makes Rename Icon Width 44px for touch sourfaces. 2014-01-31 12:33:00 +05:30
Vincent Petry c5767b67b1 Fixed image preview in trashbin subdirs 2014-01-30 17:03:13 +01:00