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

2745 Commits

Author SHA1 Message Date
Thomas Müller dd153a5625 Merge pull request #20176 from owncloud/font-style 
move font back from Light to Regular for body text, fix #18954
 2015-11-10 17:52:09 +01:00
Thomas Müller 0c46f75f6a Merge pull request #20436 from owncloud/checkbox 
use new checkbox style for Apps mgmt settings
 2015-11-10 17:47:24 +01:00
Jan-Christoph Borchardt 83c177fc1b move font back from Light to Regular for body text on normal-res screens, fix #18954 2015-11-10 16:12:42 +01:00
Jan-Christoph Borchardt e9691893b5 use new checkbox style for Apps mgmt settings 2015-11-10 14:31:34 +01:00
Thomas Müller 267d30d4f6 Fix #18072 2015-11-10 10:28:23 +01:00
Thomas Müller a5dd2df384 Merge pull request #20383 from owncloud/fix-setupchecks-messages 
Properly detect setup check messages set in the HTML template
 2015-11-09 11:10:41 +01:00
Jenkins for ownCloud 113f9f80f3 [tx-robot] updated from transifex 2015-11-09 01:55:05 -05:00
Jenkins for ownCloud f8637b6082 [tx-robot] updated from transifex 2015-11-08 01:55:13 -05:00
Robin McCorkell 6959d5ca22 Properly detect setup check messages set in the HTML template 2015-11-08 00:02:59 +00:00
Morris Jobke fa24d92eea Show the language code in personal settings for unknown languages 
Steps to reproduce:
* having an unknown language set in oc_preferences
* browse the personal settings
* only get listed the first letter of this language in the language chooser
 2015-11-06 09:48:05 +01:00
Jenkins for ownCloud f2b19333b9 [tx-robot] updated from transifex 2015-11-06 01:55:09 -05: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
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
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
Jenkins for ownCloud 7fe047425f [tx-robot] updated from transifex 2015-11-04 01:55:44 -05: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
Jenkins for ownCloud 82f3590fd0 [tx-robot] updated from transifex 2015-11-03 01:58:43 -05: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
Jenkins for ownCloud 91b2cdc62b [tx-robot] updated from transifex 2015-10-30 01:55:52 -04:00
Vincent Petry 781bca2437 Fix everyone count for subadmins 
Also moved the logic to the UsersController
 2015-10-29 17:41:49 +01:00
Thomas Müller 73d9699be9 Merge pull request #20135 from owncloud/check-if-null-subadmin 
Drop OC_SubAdmin and replace usages
 2015-10-29 17:07:45 +01:00
Hendrik Leppelsack d2f0055af4 apply new checkbox style in users settings 2015-10-29 13:03:55 +01:00
Lukas Reschke c6f6a8758b Drop OC_SubAdmin and replace usages 2015-10-29 11:31:18 +01:00
Jenkins for ownCloud 527ef76dd6 [tx-robot] updated from transifex 2015-10-29 01:55:45 -04:00
Jörn Friedrich Dreyer 69417e3654 Initially load at least 250 users 2015-10-28 11:55:16 +01:00
Jenkins for ownCloud d74811fcc8 [tx-robot] updated from transifex 2015-10-28 01:55:29 -04:00
Jenkins for ownCloud 0875a4a18f [tx-robot] updated from transifex 2015-10-27 01:55:44 -04:00
Thomas Müller 0a9150b2da Merge pull request #19813 from owncloud/stay-on-apps-category-refresh 
Improve settings/apps page
 2015-10-26 23:07:06 +01:00
Joas Schilling 2849f19cfe Fix backwards and forward button 2015-10-26 17:05:31 +01:00
Joas Schilling e19c49295a Use speaking ids 2015-10-26 16:15:15 +01:00
Joas Schilling 618a08aa00 Fix backspace in search and empty content message 2015-10-26 16:15:15 +01:00
Joas Schilling f3a77c7d99 Add js tests for empty content page 2015-10-26 16:15:15 +01:00
Joas Schilling d6ca446ebc Adjust js unit tests 2015-10-26 16:15:14 +01:00
Joas Schilling 145865ade0 Display empty-content when there are no search results 2015-10-26 16:15:14 +01:00
Joas Schilling 69e4a806b7 Clear search box for now 
Fix #15651
 2015-10-26 16:15:14 +01:00
Joas Schilling 6532fe8e24 Allow searching by author name and app level as well 2015-10-26 16:15:14 +01:00
Joas Schilling a9a6d4c182 Stay on the same category when refreshing the page on the apps list 2015-10-26 16:15:14 +01:00
Lukas Reschke 8f09d5b67c Update license headers 2015-10-26 14:04:01 +01:00
Jenkins for ownCloud e6d64783a0 [tx-robot] updated from transifex 2015-10-26 01:55:04 -04:00
Jenkins for ownCloud eb10e3abc2 [tx-robot] updated from transifex 2015-10-25 01:55:04 -04:00
Jenkins for ownCloud ba010a5aa4 [tx-robot] updated from transifex 2015-10-24 01:55:42 -04:00
Jenkins for ownCloud a341e786dd [tx-robot] updated from transifex 2015-10-23 01:55:06 -04:00
Thomas Müller 33144a5d80 Merge pull request #19827 from owncloud/subadmin_non_static 
Make OC_SubAdmin non static
 2015-10-21 14:43:09 +02:00
Thomas Müller ae0f20471a Merge pull request #19923 from owncloud/apps-donotdisplaybrokenappiconininternetexplorer 
Disable app icon preview in apps page for IE
 2015-10-21 13:42:48 +02:00
Roeland Jago Douma 02af4269f2 Fix unit test 
Now that OC_SubAdmin is just a wrapper around OC\SubAdmin some unit
tests had to be fixed because they expected different behaviour.

Eventually they should move to properly mocked instances of OC\SubAdmin
of course
 2015-10-21 11:41:25 +02:00