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

2806 Commits

Author SHA1 Message Date
Thomas Müller 333232f665 Merge pull request #20559 from owncloud/settings_app_to_controller 
[Settings] Moved changedisplayname to usercontroller
 2015-11-23 08:36:47 +01:00
Jenkins for ownCloud 56e05a90af [tx-robot] updated from transifex 2015-11-23 01:54:53 -05:00
Jenkins for ownCloud 2321cc4854 [tx-robot] updated from transifex 2015-11-22 01:54:53 -05:00
Jenkins for ownCloud eb42340fa3 [tx-robot] updated from transifex 2015-11-21 01:54:59 -05:00
Roeland Jago Douma 0265bcfdae Moved changedisplayname to usercontroller 
Killed the old static route to change a users display name and moved it
to a properly testable controller.
 2015-11-20 16:05:43 +01:00
Jenkins for ownCloud 764504de19 [tx-robot] updated from transifex 2015-11-20 01:55:32 -05:00
Björn Schießle 97c60fd217 change 'cronstatus' to 'status' so that it can be used in other apps too 2015-11-19 18:07:10 +01:00
Thomas Müller 4ff34daedb Merge pull request #20533 from owncloud/log-level 
clarify log level setting design, fix #20514
 2015-11-19 10:41:30 +01:00
Jenkins for ownCloud c10be07c1b [tx-robot] updated from transifex 2015-11-19 01:55:13 -05:00
Jan-Christoph Borchardt 9671103121 clarify log level setting design, fix #20514 2015-11-18 14:04:09 +01:00
Jenkins for ownCloud 5dd59b4bd2 [tx-robot] updated from transifex 2015-11-11 01:55:47 -05:00
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
Vincent Petry 89e3860e1a Disable app icon preview in apps page for IE 
All IE versions are not able to properly upscale SVG icons unless the
said SVG files contain a "viewBox" attribute, which is not always the
case. Also we cannot guarantee that all third party apps will have this
attribute in their icons.

So for now, app icons will not be displayed in IE instead of broken
ones.
 2015-10-21 10:50:06 +02:00
Thomas Müller 26836d4c17 Merge pull request #19909 from owncloud/fix-memcached-warning 
Fix memcached/memcache module check
 2015-10-21 09:50:28 +02:00
Jenkins for ownCloud 74f41349b7 [tx-robot] updated from transifex 2015-10-21 01:56:16 -04:00
Robin McCorkell 03dd1386da Fix memcached/memcache module check 2015-10-20 21:45:27 +01:00
Jenkins for ownCloud 008082ebad [tx-robot] updated from transifex 2015-10-19 01:55:02 -04:00
Jenkins for ownCloud 8d25528c49 [tx-robot] updated from transifex 2015-10-18 01:55:07 -04:00
Jenkins for ownCloud c378456137 [tx-robot] updated from transifex 2015-10-17 01:55:34 -04:00
Jenkins for ownCloud 7224e99ccd [tx-robot] updated from transifex 2015-10-16 01:55:03 -04:00
Jenkins for ownCloud 5bee7007dd [tx-robot] updated from transifex 2015-10-15 01:55:32 -04:00
Thomas Müller df1313d025 Merge pull request #19625 from owncloud/passwordchange-hidestrengthify 
Properly hide strengthify after password change
 2015-10-14 12:52:07 +02:00
Thomas Müller 4b8632325a Merge pull request #19627 from owncloud/users-deletebeforecreate 
Delete last undoable user before user creation
 2015-10-14 12:51:51 +02:00
Hendrik Leppelsack bf722d93df apply new checkbox style to admin settings 2015-10-14 12:14:49 +02:00
Jenkins for ownCloud f9dd750ed7 [tx-robot] updated from transifex 2015-10-14 01:55:36 -04:00
Jenkins for ownCloud 1f146d678c [tx-robot] updated from transifex 2015-10-13 01:55:06 -04:00
Jenkins for ownCloud e16ac12f5a [tx-robot] updated from transifex 2015-10-12 01:54:59 -04:00
Jenkins for ownCloud d29d018cc7 [tx-robot] updated from transifex 2015-10-11 01:54:58 -04:00
Jenkins for ownCloud 188acd5e4e [tx-robot] updated from transifex 2015-10-10 01:55:32 -04:00
Jörn Friedrich Dreyer 5b1706e8d8 Merge pull request #19585 from owncloud/enc_improve_introduction 
improved initial explanation/warning if the admin enabled encryptrion
 2015-10-09 15:57:44 +02:00
Vincent Petry 14591d9df7 Use injected request 2015-10-09 11:19:06 +02:00
Morris Jobke bf579a153f fix IE8 user agent detection 2015-10-09 11:19:06 +02:00
Vincent Petry c7aef6c368 Fix uploading avatar and root certs in IE8 2015-10-09 11:19:05 +02:00
Jenkins for ownCloud 5cb83937fa [tx-robot] updated from transifex 2015-10-09 01:55:02 -04:00
Lukas Reschke 12181aa6de Don't perform checks for outdated TLS libs when no internet connection 
This change makes the check return a positive result when:

- The instance has been configured to not use the internet
AND/OR
- S2S AND the appstore is disabled
 2015-10-08 18:26:03 +02:00
Lukas Reschke 9b220d0576 Fix comment syntax 2015-10-08 17:35:31 +02:00
Jenkins for ownCloud c5649a634f [tx-robot] updated from transifex 2015-10-08 01:54:58 -04:00
Vincent Petry 14dc36efe6 Properly hide strengthify after password change 2015-10-07 17:56:28 +02:00
Vincent Petry a73f31d3a5 Delete last undoable user before user creation 2015-10-07 16:17:38 +02:00
Jenkins for ownCloud cd818e7419 [tx-robot] updated from transifex 2015-10-07 01:55:56 -04:00
Lukas Reschke 6c798889a5 Only show import button if user storages are allowed 2015-10-06 14:06:22 +02:00
Lukas Reschke 384c6fd3ac Fix importing of certificates 
Fixes https://github.com/owncloud/core/issues/19601
 2015-10-06 14:00:55 +02:00
Thomas Müller 6651aa19ea Merge pull request #19526 from owncloud/issue-16251-reload-app-settings-when-app-needs-update 
Reload the page when an app needs an update after being enabled
 2015-10-06 12:36:32 +02:00
Morris Jobke 999196b9fb fix wording 2015-10-06 11:35:08 +02:00
Thomas Müller 0385a62363 Merge pull request #19597 from owncloud/update-license-headers 
update licence headers via script
 2015-10-06 11:18:35 +02:00
Bjoern Schiessle 14497ecfac improved explanation of server side encryption 2015-10-06 11:02:38 +02:00
Morris Jobke 8366ce2767 deduplicate @xenopathic 2015-10-06 09:52:19 +02:00
Morris Jobke b519965408 [admin] check for correct PHP memcached module 2015-10-06 08:51:47 +02:00
Jenkins for ownCloud 3ff60cc2e3 [tx-robot] updated from transifex 2015-10-06 01:55:00 -04:00
Morris Jobke 264d123396 Use OC.Dialogs for modal reload message 2015-10-05 22:07:24 +02:00
Joas Schilling 69d68fbe8e Reload the page when an app needs an update after being enabled 2015-10-05 22:07:24 +02:00