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

28561 Commits

Author SHA1 Message Date
Arthur Schiwon 253e4bcf63 integration tests 2015-11-04 12:26:21 +01:00
Thomas Müller 475b52c93b Merge pull request #20283 from owncloud/fix-varaible-type 
Fix typo in variable name
 2015-11-04 11:10:48 +01:00
Björn Schießle 6d0a324144 make sure that we update the unencrypted size for the versions 2015-11-04 10:59:05 +01:00
Thomas Müller c59ca9203d Merge pull request #18821 from owncloud/global-classes 
Global classes in core CSS
 2015-11-04 10:30:10 +01:00
Thomas Müller b162761124 Merge pull request #20157 from owncloud/users-fixeveryonecount 
Fix everyone count for subadmins
 2015-11-04 10:28:56 +01:00
Thomas Müller ed0da94d3b Merge pull request #20272 from owncloud/phil-davis-setEncryptHomeStorage 
Correct the description of function setEncryptHomeStorage
 2015-11-04 10:27:54 +01:00
Morris Jobke cc9695ea41 Fix typo in variable name 
* introduced with #20135 - c6f6a8758b

Fixes following error meessage:

{"reqId":"GliKwPFSIVn8GC2KNIHY","remoteAddr":"::1","app":"PHP","message":"Undefined variable: subAdmins at master\/settings\/users.php#76","level":0,"time":"2015-11-04T08:38:53+00:00","method":"GET","url":"\/master\/index.php\/settings\/users"}
{"reqId":"GliKwPFSIVn8GC2KNIHY","remoteAddr":"::1","app":"PHP","message":"Invalid argument supplied for foreach() at master\/settings\/users.php#76","level":0,"time":"2015-11-04T08:38:53+00:00","method":"GET","url":"\/master\/index.php\/settings\/users"}
 2015-11-04 09:44:19 +01:00
Morris Jobke 18f0bafd88 fix subadmin user count for empty groups 2015-11-04 09:39:51 +01:00
Bjoern Schiessle 4719305e3b cache result from parent folders 2015-11-04 09:27:29 +01:00
Jenkins for ownCloud 7fe047425f [tx-robot] updated from transifex 2015-11-04 01:55:44 -05:00
Robin Appelman fc7f7e5c37 only lock in getDirectoryContent if we need to update the cache 2015-11-03 18:23:22 +01:00
Robin Appelman 4f2656993e only lock in getFileInfo if we need to update the cache 2015-11-03 18:23:22 +01:00
Robin Appelman 0397871f7e Split checkUpdate 2015-11-03 18:23:22 +01:00
Phil Davis 46261b5ff1 Correct the description of function setEncryptHomeStorage 2015-11-03 22:47:55 +05:45
Arthur Schiwon 6b866fa917 LDAP: attempt to connect to backup server again, if main server is not available. Fixes #18701 2015-11-03 17:17:00 +01:00
Sergio Bertolin 0f27b719ea enhancements to pre and post conditions 2015-11-03 16:08:01 +00:00
Thomas Müller 5a25f1c2a0 Merge pull request #20269 from owncloud/capabilities-webdav-ng-sync 
Add a new core capability which tells the clients which url to use
 2015-11-03 15:33:07 +01:00
Thomas Müller b2a437ffff Add a new core capability which tells the clients which url to use 2015-11-03 14:27:36 +01:00
Morris Jobke 8b2b7f7e8c update example theme favicon 2015-11-03 14:24:20 +01:00
Morris Jobke 069ed71dbe Add favicon for IE 8+ 2015-11-03 14:24:20 +01:00
Thomas Müller a8daef4280 Merge pull request #20223 from owncloud/fix-apply-webdav-tags 
Fix TagList namespace in property map
 2015-11-03 14:22:49 +01:00
Thomas Müller b0c456c0fc Merge pull request #20201 from owncloud/checkboxes-groups-enable 
Apply new checkbox style in app settings
 2015-11-03 11:19:45 +01:00
Thomas Müller 292c924043 Merge pull request #20253 from owncloud/external-storage-wording 
fix external storage wording detail, ref #19858
 2015-11-03 11:16:21 +01:00
Morris Jobke 43f5671211 Merge pull request #20256 from owncloud/fix-searchbox-iceweasel 
Don't validate searchbox
 2015-11-03 11:07:07 +01:00
Hendrik Leppelsack cf0ebfc7aa don't validate searchbox 2015-11-03 10:10:52 +01:00
Jan-Christoph Borchardt fa5a15be2b fix external storage wording detail, ref #19858 2015-11-03 08:56:15 +01:00
Jenkins for ownCloud 82f3590fd0 [tx-robot] updated from transifex 2015-11-03 01:58:43 -05:00
Thomas Müller 0559b2092c Merge pull request #20232 from owncloud/error-button-color 
fix button text color
 2015-11-02 21:48:50 +01:00
Thomas Müller 1018d6115a Merge pull request #20045 from owncloud/dbal-2.5.2 
Bump 3rdparty for dbal-2.5.2
 2015-11-02 20:22:52 +01:00
Roeland Jago Douma 7ac8ce7aa0 Bump 3rdparty for dbal-2.5.2 2015-11-02 19:44:47 +01:00
Jan-Christoph Borchardt 0a8cefaeb1 fix button text color 2015-11-02 17:58:37 +01:00
Thomas Müller 620dc7ce22 Merge pull request #20196 from owncloud/use-actual-mimetype-detection-instead-of-oath 
Use actual mimetype detection instead of extension
 2015-11-02 17:36:13 +01:00
Raghu Nayyar 56b537271e Global Classes for Core. 
Move up the global styles up the hierarchy.

Adds Clear Left, Right and both.

New CSS file for Global Styles.
 2015-11-02 20:54:02 +05:30
Thomas Müller 44f4de1526 Merge pull request #20191 from owncloud/fix-20151 
add method to count users by loginname and use it for diagnose test, …
 2015-11-02 14:51:54 +01:00
Vincent Petry 52e213f026 Fix TagList namespace in property map 2015-11-02 14:19:01 +01:00
Thomas Müller 053effaa51 Merge pull request #20220 from owncloud/keep-search-open 
Keep searchbox open if it is in action
 2015-11-02 13:58:10 +01:00
blizzz 83d3c94590 Merge branch 'master' into fix-20151 2015-11-02 13:32:24 +01:00
Hendrik Leppelsack 9669a2be78 keep searchbox open if it is in action 2015-11-02 12:14:54 +01:00
Thomas Müller a8641fdc95 Merge pull request #20192 from owncloud/fix-20090 
if a user that is flag as deleted shows up again, remove that flag. F…
 2015-11-02 11:28:28 +01:00
Thomas Müller c5caebbd1f Merge pull request #20219 from owncloud/issue-19707-scrollto-in-trashibn 
Fix scrollto= parameter in trashbin view
 2015-11-02 11:27:49 +01:00
Thomas Müller be5552981a Merge pull request #20215 from owncloud/issue-20178-close-user-menu-on-reclick 
Close the user menu when clicking it again
 2015-11-02 11:27:29 +01:00
Joas Schilling a378dc5a7b Fix scrollto= parameter in trashbin view 2015-11-02 10:31:06 +01:00
Thomas Müller 01adefaf50 Merge pull request #20181 from owncloud/files-fixdownloadspinner 
Fix file action download spinner
 2015-11-02 10:13:58 +01:00
Thomas Müller b6ca23afe1 Merge pull request #20189 from owncloud/use-get-http-protocol 
Use getHttpProtocol instead of $_SERVER
 2015-11-02 10:13:41 +01:00
Joas Schilling f04151f69b Close the user menu when clicking it again 2015-11-02 10:09:13 +01:00
Raghu Nayyar 0a05b392ae Merge branch 'master' into checkboxes-groups-enable 2015-11-02 13:43:55 +05:30
Jenkins for ownCloud 2afc14e195 [tx-robot] updated from transifex 2015-11-02 01:55:05 -05:00
Jenkins for ownCloud 2374a0df5d [tx-robot] updated from transifex 2015-11-01 01:54:58 -04:00
Hendrik Leppelsack 7e2fe08778 new checkbox style in app settings 2015-10-31 17:07:07 +01:00
Jenkins for ownCloud d7ed353814 [tx-robot] updated from transifex 2015-10-31 01:55:07 -04:00