wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
32739 commits 157 branches 562 tags 714 MiB
Commit graph

3063 commits

Author SHA1 Message Date
Jenkins for ownCloud
ecf2d178b1 [tx-robot] updated from transifex 2016-01-26 01:56:06 -05:00
Morris Jobke
605df6c36b Includ author and license in l10n string to be able to change order 
* fixes #21874
 2016-01-25 08:44:43 +01:00
Jenkins for ownCloud
a331979a67 [tx-robot] updated from transifex 2016-01-25 01:54:39 -05:00
Jenkins for ownCloud
f92119e02f [tx-robot] updated from transifex 2016-01-23 01:55:35 -05:00
Joas Schilling
3038006e8e Add a default app icon for apps that don't have one 2016-01-22 11:38:11 +01:00
Thomas Müller
2f7dcf1a2c Merge pull request #21782 from owncloud/update-system-addressbook-on-user-change-2 
Introduce IUser::setEMailAddress and add hook mechanism
 2016-01-21 00:07:46 +01:00
Thomas Müller
aeb89947a2 Introduce IUser::setEMailAddress and add hook mechanism 2016-01-20 14:57:20 +01:00
Jan-Christoph Borchardt
6cc975e1cf remove unneeded margin of app dependencies in app mgmt 2016-01-20 14:11:01 +01:00
Jenkins for ownCloud
f076bfac32 [tx-robot] updated from transifex 2016-01-20 01:54:54 -05:00
Jenkins for ownCloud
e4d5229940 [tx-robot] updated from transifex 2016-01-18 01:54:41 -05:00
Jenkins for ownCloud
2095a31000 [tx-robot] updated from transifex 2016-01-17 01:54:53 -05:00
Jenkins for ownCloud
7a239b2642 [tx-robot] updated from transifex 2016-01-16 01:55:18 -05:00
Thomas Müller
d8867f7692 Merge pull request #21723 from owncloud/prevent-group-enable-for-apps 
Prevent group enable for apps
 2016-01-15 12:26:43 +01:00
Jenkins for ownCloud
cd840f01ae [tx-robot] updated from transifex 2016-01-15 01:54:57 -05:00
Jörn Friedrich Dreyer
2d1b9a5f9f allow apps to load additional scripts on the user settings page via the event dispatcher 2016-01-14 16:57:33 +01:00
Joas Schilling
0461b9dbb9 Add a new app type that can not be enabled for groups 2016-01-14 15:45:47 +01:00
Jenkins for ownCloud
205fbcbfa3 [tx-robot] updated from transifex 2016-01-14 01:55:43 -05:00
Thomas Müller
ca4f24aa97 Merge pull request #21509 from owncloud/users-scrolltop 
Keep scroll position in users page when sorting
 2016-01-13 11:00:48 +01:00
Thomas Müller
c5a200c419 Merge pull request #21653 from owncloud/update-license-headers-2016 
Update license headers 2016
 2016-01-13 08:29:42 +01:00
Jenkins for ownCloud
eb90fa78ad [tx-robot] updated from transifex 2016-01-13 01:55:56 -05:00
Thomas Müller
682821c71e Happy new year! 2016-01-12 15:02:18 +01:00
Thomas Müller
eac5d9fb3a Merge pull request #21336 from owncloud/system-root-certs 
Allow admins to add system wide root certificates
 2016-01-12 15:01:46 +01:00
Robin Appelman
0d0377ebfb Add a config option to enable certificate management 2016-01-12 12:58:45 +01:00
Robin Appelman
c15cab7ed6 Allow admins to add system wide root certificates 2016-01-12 12:50:59 +01:00
Morris Jobke
8b6b042ffd Add config switch to disable the .well-known URL check 2016-01-12 09:53:23 +01:00
Jenkins for ownCloud
44e91bb90a [tx-robot] updated from transifex 2016-01-12 01:56:33 -05:00
Thomas Müller
16097037af Merge pull request #21608 from owncloud/better-setting-templates 
improve personal page template
 2016-01-11 13:36:21 +01:00
Thomas Müller
df2abda814 Merge pull request #21438 from owncloud/settings-anchors 
remove unneeded 'goto' prefix from settings anchors
 2016-01-11 11:53:40 +01:00
Joas Schilling
866b4b3053 Fix types 2016-01-11 11:43:58 +01:00
Joas Schilling
25a4878886 Fix table markup 2016-01-11 11:38:26 +01:00
Jenkins for ownCloud
77a8085f84 [tx-robot] updated from transifex 2016-01-11 01:55:34 -05:00
Jan-Christoph Borchardt
d05e0c81d4 remove extra slogan footer from Personal and Admin pages 2016-01-11 03:18:06 +01:00
Lukas Reschke
f4c04c5f28 Concat also the other results 
Otherwise this will ignore the two last checks 🙊
 2016-01-10 11:39:44 +01:00
Jenkins for ownCloud
580deb09f8 [tx-robot] updated from transifex 2016-01-10 01:55:57 -05:00
Thomas Müller
c5b2b3a124 Merge pull request #21562 from owncloud/properly-check-for-well-known-redirect 
Add check for .well-known URL in the root of the webservers URL
 2016-01-09 17:42:11 +01:00
Jenkins for ownCloud
72b34575df [tx-robot] updated from transifex 2016-01-09 01:55:50 -05:00
Morris Jobke
0161928fc3 Add check for .well-known URL in the root of the webservers URL 
* fixes #20012
 2016-01-08 23:27:29 +01:00
Morris Jobke
99cf90c8a4 fix warning box size for avatar change 2016-01-08 10:27:55 +01:00
Jenkins for ownCloud
88c4cba1f5 [tx-robot] updated from transifex 2016-01-08 01:56:39 -05:00
Thomas Müller
46107f82d4 Merge pull request #21506 from owncloud/issue-20218-min-max-owncloud-version-warning 
Issue 20218 min max owncloud version warning
 2016-01-07 16:51:00 +01:00
Joas Schilling
3a494033d2 Allow searching apps by ID 2016-01-07 16:33:25 +01:00
Vincent Petry
44f4195eee Keep scroll position in users page when sorting 
When sorting, some browsers like Chrome will lose the scroll position,
possibly because the sorting code is touching the DOM elements.

This fix saves the scroll position before sorting and sets it back
afterwards.
 2016-01-07 15:48:59 +01:00
Vincent Petry
112ccd00a3 Fix users list dropdown position after scroll 
When scrolling, the position calculation of the multiselect dropdown was
wrong. Adding "position: relative" to the list container makes the
button calculation relative to it instead of the whole page. In this
case the dropdown is properly aligned with the field regardless of
scrolling.
 2016-01-07 15:25:04 +01:00
Joas Schilling
83855c073b Add a warning on the apps list when the version is missing 2016-01-07 15:03:55 +01:00
Jenkins for ownCloud
27dfa74d89 [tx-robot] updated from transifex 2016-01-07 01:55:48 -05:00
Thomas Müller
d3922510d0 Merge pull request #20994 from owncloud/personal-page 
improve layout of personal settings page
 2016-01-06 17:25:12 +01:00
Lukas Reschke
88c7face07 Inject OCSClient 
Fixes https://github.com/owncloud/core/issues/21451
 2016-01-06 11:40:22 +01:00
Jenkins for ownCloud
c77917f48c [tx-robot] updated from transifex 2016-01-06 01:55:16 -05:00
Jan-Christoph Borchardt
bfee488c56 remove unneeded 'goto' prefix from settings anchors 2016-01-04 12:59:32 +01:00
Jenkins for ownCloud
157bb50a39 [tx-robot] updated from transifex 2016-01-04 01:55:05 -05:00
Jenkins for ownCloud
6ca2da7d5c [tx-robot] updated from transifex 2016-01-02 01:54:46 -05:00
Jenkins for ownCloud
dfec9f0c8a [tx-robot] updated from transifex 2016-01-01 01:55:10 -05:00
Jenkins for ownCloud
970495a067 [tx-robot] updated from transifex 2015-12-31 01:55:16 -05:00
Jenkins for ownCloud
45c41e2b2c [tx-robot] updated from transifex 2015-12-30 01:55:47 -05:00
Jan-Christoph Borchardt
e4cf53031b fix overlap and functionality of cropper 2015-12-28 19:23:40 +01:00
Jan-Christoph Borchardt
640adde3b9 improve layout of personal settings page 2015-12-28 18:50:50 +01:00
Jan-Christoph Borchardt
6e60b6ee7c shorten quota usage wording, fix overflow on mobile, fix #21129 2015-12-28 18:42:48 +01:00
Jenkins for ownCloud
89584716f8 [tx-robot] updated from transifex 2015-12-28 01:55:10 -05:00
Morris Jobke
ed98cdf532 Use OCP\Util::getVersion instead of the internal private implementation 2015-12-18 15:26:54 +01:00
Morris Jobke
e42f262d85 properly use OCP\Util instead of OC_Helper 2015-12-18 11:46:21 +01:00
Thomas Müller
551e553bf4 Merge pull request #21264 from owncloud/deprecated_oc_user_methods 
Cleanup OC_User deprecated methods
 2015-12-18 10:15:18 +01:00
Thomas Müller
228a75e2ec Merge pull request #21248 from owncloud/deprecated_oc_helper_linkToRoute 
Replace deprecated OC_Helper::linkToRoute calls
 2015-12-18 07:56:42 +01:00
Roeland Jago Douma
9fe3d2f1f8 OC_Helper::linkToRoute is deprecated 
Replaced all calls to OC_Helper::linkToRoute with
OC::$server->getURLGenerator()->linkToRoute
 2015-12-17 18:46:42 +01:00
Roeland Jago Douma
6248bad0f7 Add a default size to the avatar placeholders 
This removed the need to do an avatar request on the "empty" row in the
user settings.
 2015-12-17 16:30:23 +01:00
Thomas Müller
3818a055b9 Merge pull request #21255 from owncloud/usermanagement-show-password-error-temporary 
user management: show password error temporary
 2015-12-17 16:25:14 +01:00
Roeland Jago Douma
7e44ea5da0 Remove deprecated function OC_User::getManager 
Private deprecated function => removed
Replaced all instances with suggested replacement
 2015-12-17 16:18:34 +01:00
Thomas Müller
d402ac91d7 Merge pull request #21260 from owncloud/fix-undefined-l10n-var 
initialize l10n instance earlier, fixes an undefined var warning foll…
 2015-12-17 16:08:08 +01:00
Arthur Schiwon
0ecbfae5ff initialize l10n instance earlier, fixes an undefined var warning followed by a php error 2015-12-17 15:08:15 +01:00
Roeland Jago Douma
a81836a42f Only load the big (128x128) avatar on the perosnal page 
Before the code was executed on every page if a user was logged in. Now
only on the personal page. Thus saving a request on all other pages.
 2015-12-17 13:55:22 +01:00
michag86
7a86f10ebc Update users.js 2015-12-17 12:43:44 +01:00
Jenkins for ownCloud
a7cd8103b5 [tx-robot] updated from transifex 2015-12-17 01:55:09 -05:00
Jenkins for ownCloud
74de12c698 [tx-robot] updated from transifex 2015-12-13 01:54:51 -05:00
Thomas Müller
4f860b7e0a Merge pull request #20978 from owncloud/fix-dont-show-unsaved-values-in-usermgmt 
reset mailadress/displayname on blur
 2015-12-11 12:15:01 +01:00
Jenkins for ownCloud
acce1638e5 [tx-robot] updated from transifex 2015-12-11 01:55:44 -05:00
Thomas Müller
ae6c3c1539 Merge pull request #21123 from owncloud/remove-db-locking-performance-warning-master 
Remove info about database locking performance
 2015-12-10 17:24:43 +01:00
Thomas Müller
01b9f07ac8 Remove info about database locking performance 2015-12-10 16:10:45 +01:00
Jenkins for ownCloud
078ca149b5 [tx-robot] updated from transifex 2015-12-10 01:55:17 -05:00
Jenkins for ownCloud
dda9525c4b [tx-robot] updated from transifex 2015-12-09 01:55:14 -05:00
Thomas Müller
fe8dc0bd5e Merge pull request #21022 from owncloud/get-rid-of-by-reference 
Get rid of by reference
 2015-12-08 11:04:25 +01:00
Thomas Müller
c88438790c Merge pull request #20979 from owncloud/settings-groups-entry 
Add 'my groups' anchor to the personal page sidebar
 2015-12-08 11:04:09 +01:00
Lukas Reschke
4b293dffe5 Use \OCP\Util::sanitizeHTML instead of \OC_Util::sanitizeHTML 2015-12-08 08:56:47 +01:00
Scrutinizer Auto-Fixer
453e1bf66e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-12-07 15:43:36 +00:00
Patrick Robertson
96a83a783f Add 'my groups' anchor to the personal page sidebar 2015-12-07 16:16:12 +01:00
Thomas Müller
085f3f58fa Merge pull request #20954 from owncloud/settings_user_only_load_avatar_if_available 
Settings user only load avatar if available
 2015-12-07 10:19:38 +01:00
Thomas Müller
c9069d5711 Merge pull request #20959 from owncloud/drop-OC_App-setActiveNavigationEntry 
Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\App
 2015-12-07 10:17:44 +01:00
michag86
cf0d163a32 reset mailadress/displayname on blur 2015-12-07 09:48:54 +01:00
Jenkins for ownCloud
f0b1ba713d [tx-robot] updated from transifex 2015-12-05 01:55:14 -05:00
Morris Jobke
e6d4496fc2 Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\App 2015-12-04 17:23:51 +01:00
Roeland Jago Douma
8c9a3ccefc Do not request an avatar if there is none 2015-12-04 14:56:49 +01:00
Roeland Jago Douma
a619629ac0 Only try to load avatars in the user list if there is any 2015-12-04 14:56:49 +01:00
Roeland Jago Douma
50d862e5d1 [Avatars] JS should not load same avatar twice 
Old code first dit an ajax request to the avatar. Then a new image
object with the same src was created and since we do not cache avatars
yet :(  this resulted in 2 sequential requests to the exact same URL

Now if you set the displayname it will first set the placeholder and
then load the avatar in the background. Only once this time!
 2015-12-04 10:42:11 +01:00
Thomas Müller
7fefd4f4d9 Merge pull request #20860 from owncloud/use-user-getEMailAddress-all-over-the-place 
User IUser::getEMailAddress() all over the place
 2015-12-03 09:21:53 +01:00
Jenkins for ownCloud
5c178a2719 [tx-robot] updated from transifex 2015-12-03 01:55:12 -05:00
Thomas Müller
eebe2b9c23 User IUser::getEMailAddress() all over the place 2015-12-02 21:25:05 +01:00
Morris Jobke
0a6db3ada6 Remove OC_Config from app management template 
* add unit test for this case
 2015-12-02 14:35:38 +01:00
Jenkins for ownCloud
4f4b91a9ec [tx-robot] updated from transifex 2015-12-02 02:00:28 -05:00
Lukas Reschke
4971015544 Add code integrity check 
This PR implements the base foundation of the code signing and integrity check. In this PR implemented is the signing and verification logic, as well as commands to sign single apps or the core repository.

Furthermore, there is a basic implementation to display problems with the code integrity on the update screen.

Code signing basically happens the following way:

- There is a ownCloud Root Certificate authority stored `resources/codesigning/root.crt` (in this PR I also ship the private key which we obviously need to change before a release 😉). This certificate is not intended to be used for signing directly and only is used to sign new certificates.
- Using the `integrity:sign-core` and `integrity:sign-app` commands developers can sign either the core release or a single app. The core release needs to be signed with a certificate that has a CN of `core`,  apps need to be signed with a certificate that either has a CN of `core` (shipped apps!)  or the AppID.
- The command generates a signature.json file of the following format:
```json
{
    "hashes": {
        "/filename.php": "2401fed2eea6f2c1027c482a633e8e25cd46701f811e2d2c10dc213fd95fa60e350bccbbebdccc73a042b1a2799f673fbabadc783284cc288e4f1a1eacb74e3d",
        "/lib/base.php": "55548cc16b457cd74241990cc9d3b72b6335f2e5f45eee95171da024087d114fcbc2effc3d5818a6d5d55f2ae960ab39fd0414d0c542b72a3b9e08eb21206dd9"
    },
    "certificate": "-----BEGIN CERTIFICATE-----MIIBvTCCASagAwIBAgIUPvawyqJwCwYazcv7iz16TWxfeUMwDQYJKoZIhvcNAQEF\nBQAwIzEhMB8GA1UECgwYb3duQ2xvdWQgQ29kZSBTaWduaW5nIENBMB4XDTE1MTAx\nNDEzMTcxMFoXDTE2MTAxNDEzMTcxMFowEzERMA8GA1UEAwwIY29udGFjdHMwgZ8w\nDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANoQesGdCW0L2L+a2xITYipixkScrIpB\nkX5Snu3fs45MscDb61xByjBSlFgR4QI6McoCipPw4SUr28EaExVvgPSvqUjYLGps\nfiv0Cvgquzbx/X3mUcdk9LcFo1uWGtrTfkuXSKX41PnJGTr6RQWGIBd1V52q1qbC\nJKkfzyeMeuQfAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAvF/KIhRMQ3tYTmgHWsiM\nwDMgIDb7iaHF0fS+/Nvo4PzoTO/trev6tMyjLbJ7hgdCpz/1sNzE11Cibf6V6dsz\njCE9invP368Xv0bTRObRqeSNsGogGl5ceAvR0c9BG+NRIKHcly3At3gLkS2791bC\niG+UxI/MNcWV0uJg9S63LF8=\n-----END CERTIFICATE-----",
    "signature": "U29tZVNpZ25lZERhdGFFeGFtcGxl"
}
```
`hashes` is an array of all files in the folder with their corresponding SHA512 hashes (this is actually quite cheap to calculate), the `certificate` is the  certificate used for signing. It has to be issued by the ownCloud Root Authority and it's CN needs to be permitted to perform the required action. The `signature` is then a signature of the `hashes` which can be verified using the `certificate`.

Steps to do in other PRs, this is already a quite huge one:
- Add nag screen in case the code check fails to ensure that administrators are aware of this.
- Add code verification also to OCC upgrade and unify display code more.
- Add enforced code verification to apps shipped from the appstore with a level of "official"
- Add enfocrced code verification to apps shipped from the appstore that were already signed in a previous release
- Add some developer documentation on how devs can request their own certificate
- Check when installing ownCloud
- Add support for CRLs to allow revoking certificates

**Note:** The upgrade checks are only run when the instance has a defined release channel of `stable` (defined in `version.php`). If you want to test this, you need to change the channel thus and then generate the core signature:

```
➜  master git:(add-integrity-checker) ✗ ./occ integrity:sign-core --privateKey=resources/codesigning/core.key --certificate=resources/codesigning/core.crt
Successfully signed "core"
```

Then increase the version and you should see something like the following:

![2015-11-04_12-02-57](https://cloud.githubusercontent.com/assets/878997/10936336/6adb1d14-82ec-11e5-8f06-9a74801c9abf.png)

As you can see a failed code check will not prevent the further update. It will instead just be a notice to the admin. In a next step we will add some nag screen.

For packaging stable releases this requires the following additional steps as a last action before zipping:
1. Run `./occ integrity:sign-core` once
2. Run `./occ integrity:sign-app` _for each_ app. However, this can be simply automated using a simple foreach on the apps folder.
 2015-12-01 11:55:20 +01:00
Thomas Müller
f48ea593eb Merge pull request #20850 from owncloud/use-text-instead-of-html 
Use .text instead of .html
 2015-12-01 10:18:29 +01:00
Jenkins for ownCloud
8421a43df1 [tx-robot] updated from transifex 2015-12-01 01:55:07 -05:00
Lukas Reschke
3ea654d2d4 Use .text instead of .html 
Makes some static source code analyzers happier.
 2015-11-30 23:49:27 +01:00
Jenkins for ownCloud
5a9b892b2e [tx-robot] updated from transifex 2015-11-30 01:55:24 -05:00
Jenkins for ownCloud
d305412a35 [tx-robot] updated from transifex 2015-11-28 01:55:16 -05:00
Jenkins for ownCloud
39fb320bae [tx-robot] updated from transifex 2015-11-27 01:55:14 -05:00
Jenkins for ownCloud
dd18ea611b [tx-robot] updated from transifex 2015-11-26 01:55:22 -05:00
Jenkins for ownCloud
6e60c0f0c4 [tx-robot] updated from transifex 2015-11-25 01:55:37 -05:00
Jenkins for ownCloud
cb69e6c201 [tx-robot] updated from transifex 2015-11-24 01:56:32 -05:00
Thomas Müller
bf672d7e51 Merge pull request #20222 from owncloud/federated_sharing_auto_complete 
federated sharing auto-complete, first step
 2015-11-23 10:42:14 +01:00
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
Morris Jobke
b945d71384 update licence headers via script 2015-10-05 21:15:52 +02:00
Jenkins for ownCloud
2ffb1c2135 [tx-robot] updated from transifex 2015-10-04 01:55:02 -04:00
Thomas Müller
122141be92 Merge pull request #19543 from owncloud/fix-19542 
Check if decoded JSON returned null
 2015-10-03 12:20:33 +02:00
Jenkins for ownCloud
e0084059b9 [tx-robot] updated from transifex 2015-10-03 01:56:20 -04:00
Lukas Reschke
8f4611e21d Check if decoded JSON returned null 
The value might return null resulting in a PHP error.

Fixes https://github.com/owncloud/core/issues/19542
 2015-10-02 21:56:20 +02:00
Thomas Müller
8944cb539e Merge pull request #19510 from owncloud/json-grouplist-sharing-exclude 
save excluded groups in json format
 2015-10-02 12:14:36 +02:00
Joas Schilling
3ce45863ab Modify the group user count when changing membership of a user 2015-10-02 08:55:53 +02:00
Thomas Müller
b2dd5cb616 save excluded groups in json format - fixes #10983 2015-10-01 15:37:55 +02:00
Jenkins for ownCloud
50874de1ca [tx-robot] updated from transifex 2015-10-01 01:54:55 -04:00
Morris Jobke
1f385fba04 [settings] make it less static 2015-09-30 17:58:03 +02:00
Jenkins for ownCloud
41129aff80 [tx-robot] updated from transifex 2015-09-30 01:55:43 -04:00
Jenkins for ownCloud
aa3596a410 [tx-robot] updated from transifex 2015-09-29 01:55:02 -04:00
Jenkins for ownCloud
60f123193b [tx-robot] updated from transifex 2015-09-28 05:07:18 -04:00
Roeland Jago Douma
f6cd7362cd Save the settings in the user management page 
Store the setting in the user managerment page (e.g. show e-mail
address).

Fixes #12727
 2015-09-25 13:35:12 +02:00
Morris Jobke
6636605ea6 Add option to disable autocomplete in share dialog 2015-09-23 15:06:28 +02:00
Jenkins for ownCloud
7b483dfcbe [tx-robot] updated from transifex 2015-09-21 01:54:41 -04:00
Thomas Müller
0101b1c65f Merge pull request #18840 from owncloud/fix-app-disable-route 
Rebuild app navigation in JS
 2015-09-18 13:00:58 +02:00
Jenkins for ownCloud
2b21c80335 [tx-robot] updated from transifex 2015-09-18 01:54:55 -04:00
Jenkins for ownCloud
91365a8969 [tx-robot] updated from transifex 2015-09-17 01:57:20 -04:00
Jenkins for ownCloud
0155bcf278 [tx-robot] updated from transifex 2015-09-17 01:55:25 -04:00
Robin McCorkell
35d4851af2 Merge branch 'master' into fix-app-disable-route 2015-09-14 19:50:52 +01:00
Jenkins for ownCloud
211a243784 [tx-robot] updated from transifex 2015-09-14 01:55:35 -04:00
Jenkins for ownCloud
ca921fa1e7 [tx-robot] updated from transifex 2015-09-13 01:55:24 -04:00
Jenkins for ownCloud
9860a79441 [tx-robot] updated from transifex 2015-09-12 01:55:35 -04:00
Lukas Reschke
437882c284 Merge pull request #18963 from owncloud/ext-fix-fallbacks 
Update isCertificateImportAllowed() check to new API
 2015-09-11 14:02:16 +02:00
Lukas Reschke
b8f7d85570 Merge pull request #18778 from owncloud/locking-setup-warnings 
Replace server status message about transitional file locking with se…
 2015-09-11 11:09:49 +02:00
Robin McCorkell
732987b99f Make doc links inline 2015-09-11 09:44:00 +01:00
Jenkins for ownCloud
ee1b57d15d [tx-robot] updated from transifex 2015-09-11 01:55:26 -04:00
Robin McCorkell
27bc781cba Update isCertificateImportAllowed() check to new API 2015-09-10 21:44:56 +01:00
Robin Appelman
d032d2f0f4 Add documentation links for transactional locking 2015-09-10 15:11:14 +02:00
Jenkins for ownCloud
0ef7b84d77 [tx-robot] updated from transifex 2015-09-10 01:54:52 -04:00
Jenkins for ownCloud
bf01c3d72a [tx-robot] updated from transifex 2015-09-09 01:54:49 -04:00
Jenkins for ownCloud
d044884cfa [tx-robot] updated from transifex 2015-09-08 01:55:56 -04:00
Robin Appelman
24756cf90b specify where to enable locking 2015-09-07 15:09:40 +02:00
Robin McCorkell
c97147c99a Check if app is enabled instead of if class exists 2015-09-07 10:28:08 +01:00
tflidd
90fd8bab55 remove spaces and empty line 2015-09-07 10:05:25 +02:00
tflidd
0893967588 Add documentation link php-fpm 
Admin-Page warning didn't have a direct link to the documentation.
 2015-09-07 09:30:45 +02:00
Robin McCorkell
227868fe16 Get sorted navigation list 2015-09-06 23:24:10 +01:00
Jenkins for ownCloud
f3b8634058 [tx-robot] updated from transifex 2015-09-05 01:55:18 -04:00
Robin McCorkell
b06bc409e0 Rebuild app navigation in JS 
Retrieve all app navigations to prevent reloading appinfo/app.php and
causing an error when the app isn't fully loaded. The addition/deletion
logic has been moved to JS, simplifying a lot of code.
 2015-09-05 02:24:18 +01:00
Jenkins for ownCloud
4100b151cc [tx-robot] updated from transifex 2015-09-04 01:55:31 -04:00
Georg Ehrke
1a48499dcb move updater panel above version number 2015-09-03 15:03:16 +02:00
Robin Appelman
5234090ee2 Merge pull request #18803 from owncloud/toggle-svg 
use SVG for toggle image on installation instead of PNG
 2015-09-03 14:06:03 +02:00