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

2391 commits

Author SHA1 Message Date
Jan-Christoph Borchardt
c2ccaf000a add Tips & tricks section to admin settings 2015-03-23 18:19:13 +01:00
Jan-Christoph Borchardt
fe5597b76e Merge pull request #15118 from owncloud/user-mgmt-groups 
fix long group names overlapping in the sidebar, fix #12649
 2015-03-23 16:15:24 +01:00
Thomas Müller
79f012d262 remove unneeded status element from json response on /categories - fixes 15056 2015-03-23 15:20:06 +01:00
Jan-Christoph Borchardt
23396a52cd fix long group names overlapping in the sidebar, fix #12649 2015-03-23 14:57:07 +01:00
Morris Jobke
98e770b68e Merge pull request #15107 from owncloud/user-mgmt-header 
fix first user mgmt header jumping around, fix #8873
 2015-03-23 14:22:16 +01:00
Jan-Christoph Borchardt
7079b1b434 fix first user mgmt header jumping around, fix #8873 2015-03-23 13:46:05 +01:00
Jan-Christoph Borchardt
f899d77ba5 fix capitalization in Personal settings 2015-03-23 13:42:33 +01:00
Jan-Christoph Borchardt
731c90a033 link back to top on Personal page, fix #14519 2015-03-23 13:41:40 +01:00
Jenkins for ownCloud
a9b4f0d842 [tx-robot] updated from transifex 2015-03-23 01:54:48 -04:00
Jenkins for ownCloud
a79d973005 [tx-robot] updated from transifex 2015-03-22 01:55:21 -04:00
Jenkins for ownCloud
e36a33c89a [tx-robot] updated from transifex 2015-03-21 01:56:09 -04:00
Jan-Christoph Borchardt
6c98925621 Merge pull request #14737 from owncloud/app-descriptions-collapsible 
collapse app descriptions by default, make expandable, fix #13112
 2015-03-20 17:51:51 +01:00
Robin McCorkell
8e536c6762 Merge pull request #15050 from owncloud/user-create-exists 
show a better error message when trying to create a user that already exists
 2015-03-20 08:54:16 +00:00
Jenkins for ownCloud
e8680e6637 [tx-robot] updated from transifex 2015-03-20 01:55:23 -04:00
Robin Appelman
da4ad1c0a2 show a better error message when trying to create a user that already exists 2015-03-20 04:24:50 +01:00
Jan-Christoph Borchardt
bdb4089139 collapse app descriptions by default, make expandable, fix #13112 2015-03-19 16:30:47 +01:00
Jenkins for ownCloud
e40b0701d7 [tx-robot] updated from transifex 2015-03-19 01:55:06 -04:00
Robin Appelman
cb4367b6d5 disable submit button while groupname is empty 2015-03-18 14:19:26 +01:00
Jenkins for ownCloud
8a95bf18b7 [tx-robot] updated from transifex 2015-03-18 01:55:22 -04:00
Morris Jobke
fe137bce1a Merge pull request #14972 from owncloud/add-group-style 
User management design details
 2015-03-18 01:16:01 +01:00
Jan-Christoph Borchardt
365b0b8cfe slight positioning fixes in user mgmt controls bar 2015-03-17 19:02:55 +01:00
Jan-Christoph Borchardt
075e2b1d1d improve style of 'Add group' input and button 2015-03-17 18:59:39 +01:00
Jan-Christoph Borchardt
ce89f12566 add whitespace to prevent file deletion when wanting to scroll 2015-03-17 16:54:42 +01:00
Lukas Reschke
9926cb36de Remove unused section 
This section is now unused as the security configuration has to happen on the webserver layer since https://github.com/owncloud/core/pull/14651
 2015-03-17 13:29:51 +01:00
Lukas Reschke
b1c19f74a1 Merge pull request #12085 from owncloud/add-swift-mailer 
Migrate OC_Mail to SwiftMailer
 2015-03-17 11:15:39 +01:00
Jenkins for ownCloud
b51b4f0a2c [tx-robot] updated from transifex 2015-03-17 01:55:43 -04:00
Lukas Reschke
e32f1582c7 Show more detailed error message 2015-03-16 12:47:06 +01:00
Lukas Reschke
f92f3a1a6e Incorporate review changes 2015-03-16 12:47:05 +01:00
Lukas Reschke
13486a5ada Migrate to SwiftMail 
Replaces the OC_Mail and phpmailer with SwiftMail allowing us to mock it properly.

Fixes the unit test execution on master on local machines and https://github.com/owncloud/core/issues/12014

Conflicts:
	3rdparty
	lib/private/server.php
	lib/public/iservercontainer.php
	tests/lib/mail.php
	tests/settings/controller/mailsettingscontrollertest.php

Conflicts:
	3rdparty
	lib/private/mail.php
	lib/private/server.php
	lib/public/iservercontainer.php
	settings/ajax/lostpassword.php
	settings/application.php
 2015-03-16 12:47:05 +01:00
Jenkins for ownCloud
c1a3394f48 [tx-robot] updated from transifex 2015-03-16 01:55:15 -04:00
Robin McCorkell
69d376fbf1 Put notice about checking logs in setup warning 2015-03-15 01:25:30 +00:00
Jenkins for ownCloud
8c5be2bc48 [tx-robot] updated from transifex 2015-03-14 01:54:45 -04:00
Jenkins for ownCloud
d17630d6be [tx-robot] updated from transifex 2015-03-13 01:54:55 -04:00
Jenkins for ownCloud
454a2563bc [tx-robot] updated from transifex 2015-03-12 01:55:59 -04:00
Lukas Reschke
f9fd1629da Merge pull request #14705 from rullzer/avatarcontroller 
Move AvatarController to AppFramework
 2015-03-11 17:15:42 +01:00
Roeland Jago Douma
1a0f9c375b Avatar controller moved to AppFrameWork 
* Original avatarcontroller migrated to the appframework
* Added DataDisplayResponse that show data inline in the browser (used
  to retrun the image)
* Removed some unneeded code
* Added unit tests for the avatarcontroller
 2015-03-11 16:37:42 +01:00
Thomas Müller
ffe06ac5c7 display app update error messages - fixes #14611 2015-03-11 09:59:56 +01:00
Jenkins for ownCloud
e069d9d3f9 [tx-robot] updated from transifex 2015-03-10 01:55:39 -04:00
Jenkins for ownCloud
174f8cef64 [tx-robot] updated from transifex 2015-03-09 01:54:36 -04:00
Jenkins for ownCloud
377165ae51 [tx-robot] updated from transifex 2015-03-08 01:54:36 -05:00
Jenkins for ownCloud
73c2157171 [tx-robot] updated from transifex 2015-03-07 01:54:37 -05:00
Jan-Christoph Borchardt
db02edd7c8 adjust list of errors, more compact and readable 2015-03-06 15:27:21 +01:00
Jenkins for ownCloud
d11f040720 [tx-robot] updated from transifex 2015-03-06 01:54:52 -05:00
Jenkins for ownCloud
7e0fd8fb50 [tx-robot] updated from transifex 2015-03-05 01:56:35 -05:00
Morris Jobke
f1d74e8803 Merge pull request #14651 from owncloud/add-some-headers-to-htaccess-for-my-best-friend-jenkins 
Let users configure security headers in their Webserver
 2015-03-04 09:36:01 +01:00
Jenkins for ownCloud
84785a6a39 [tx-robot] updated from transifex 2015-03-04 01:55:19 -05:00
Jenkins for ownCloud
e271fa3ee8 [tx-robot] updated from transifex 2015-03-03 01:55:50 -05:00
Lukas Reschke
bbd5f28415 Let users configure security headers in their Webserver 
Doing this in the PHP code is not the right approach for multiple reasons:

1. A bug in the PHP code prevents them from being added to the response.
2. They are only added when something is served via PHP and not in other cases (that makes for example the newest IE UXSS which is not yet patched by Microsoft exploitable on ownCloud)
3. Some headers such as the Strict-Transport-Security might require custom modifications by administrators. This was not possible before and lead to buggy situations.

This pull request moves those headers out of the PHP code and adds a security check to the admin settings performed via JS.
 2015-03-02 19:07:46 +01:00
Morris Jobke
4009f15255 Merge pull request #14593 from owncloud/fix/13994 
Add detection for invalid CLI configuration for settings page
 2015-03-02 09:19:26 +01:00
Jenkins for ownCloud
3f91e3757f [tx-robot] updated from transifex 2015-03-02 01:55:00 -05:00
Morris Jobke
a6f5d3e1e8 Merge pull request #14614 from jakobsack/master 
Show time difference of last cron run instead of absolute time
 2015-03-01 12:22:39 +01:00
Jakob Sack
97a624dba5 Improve language on backgroundjob admin page 2015-03-01 11:51:40 +01:00
Jenkins for ownCloud
ff85d38c2a [tx-robot] updated from transifex 2015-03-01 01:54:38 -05:00
Jakob Sack
7a84c90d71 Rename $human_time to $relative_time in cron settings 2015-02-28 21:49:23 +01:00
Jakob Sack
0efed5c216 Add absolute time of last cronjob as hover tip 2015-02-28 21:48:19 +01:00
Jakob Sack
6e906fc4d4 Use relative time for cron status 2015-02-28 21:09:25 +01:00
Jenkins for ownCloud
42f6448da2 [tx-robot] updated from transifex 2015-02-28 01:55:32 -05:00
Lukas Reschke
b6d8a48ce1 Add detection for invalid CLI configuration for settings page 
This change will log all failures that prevent the CLI cronjob from happening to the database and display a warning to administrators when an error happened.

To test:

1. Configure some invalid CLI php.ini settings
2. Enable the CLI cronjob and run php cron.php
3. See the errors printed and also in the admin page
4. Configure the CLI settings correctly
5. Errors should be gone.

Fixes https://github.com/owncloud/core/issues/13994
 2015-02-27 20:20:34 +01:00
Thomas Müller
f72f9e0159 Merge pull request #14530 from owncloud/revert-14403 
Revert "Updating license headers"
 2015-02-27 00:39:29 -08:00
Jenkins for ownCloud
d20061e5b1 [tx-robot] updated from transifex 2015-02-27 01:55:28 -05:00
Morris Jobke
2d9886d1c3 Merge pull request #14527 from owncloud/clarify-link 
clarify link on apps management to the dev documentation
 2015-02-26 16:10:58 +01:00
Morris Jobke
18d43f7469 Merge pull request #14474 from owncloud/move-utf-8-check-to-setup 
Move UTF-8 check to setup
 2015-02-26 16:00:31 +01:00
Morris Jobke
e887f7b9b7 clarify link on apps management to the dev documentation 2015-02-26 15:02:39 +01:00
Morris Jobke
06aef4e8b1 Revert "Updating license headers" 
This reverts commit 6a1a4880f0.
 2015-02-26 11:37:37 +01:00
Jenkins for ownCloud
8a4fddeb4a [tx-robot] updated from transifex 2015-02-26 01:55:50 -05:00
Jenkins for ownCloud
31f881415b [tx-robot] updated from transifex 2015-02-25 01:55:51 -05:00
Lukas Reschke
06cf93e6ee Move UTF-8 check to setup 
Nobody reads the warnings anyways and so we should enforce it at installation time... Also allows us to get rid of some duplicated code.

To test change the `default_charset` to something other than `utf-8` or `UTF-8`, both should work fine with that change here. An error should then get shown.

We already set those default charsets in the shipped .user.ini and .htaccess
 2015-02-24 23:51:36 +01:00
Lukas Reschke
e5c6af5102 Merge pull request #10599 from owncloud/move_passwordchange_text 
Make the password changed msg inline to fix #10242
 2015-02-24 11:54:17 +01:00
Thomas Müller
da8e34cf7f Merge pull request #14009 from owncloud/installing-installed-apps-is-stupid 
don't allow installation of already installed apps - fixes #14004
 2015-02-24 10:34:06 +01:00
Jenkins for ownCloud
cdb4cfd939 [tx-robot] updated from transifex 2015-02-24 01:54:58 -05:00
Thomas Müller
39d8406933 don't allow installation of already installed apps - fixes #14004 2015-02-23 23:16:28 +01:00
Thomas Müller
66e3211fd8 Merge pull request #13439 from owncloud/app-filter 
Make the search box filter apps
 2015-02-23 21:51:53 +01:00
Vincent Petry
e144d3aa49 Added unit test for app filter 2015-02-23 15:29:25 +01:00
Thomas Müller
df3c73de72 Merge pull request #14403 from owncloud/update-license-headers 
Update license headers
 2015-02-23 13:53:16 +01:00
Jenkins for ownCloud
6a1a4880f0 Updating license headers 2015-02-23 12:13:59 +01:00
Jenkins for ownCloud
f63b09faca [tx-robot] updated from transifex 2015-02-23 01:55:10 -05:00
Jenkins for ownCloud
ef09e5d395 [tx-robot] updated from transifex 2015-02-22 01:54:42 -05:00
Jenkins for ownCloud
906c0e7798 [tx-robot] updated from transifex 2015-02-21 01:54:38 -05:00
Jenkins for ownCloud
79ef5eda96 [tx-robot] updated from transifex 2015-02-20 01:55:01 -05:00
Morris Jobke
75a7bcb10c Merge pull request #14199 from owncloud/cast-type-manually 
Manually type-cast all AJAX files
 2015-02-19 17:19:54 +01:00
Thomas Müller
bdc503b03d Merge pull request #14295 from owncloud/encode-request-token-for-avatars 
Encode Requesttoken for avatars
 2015-02-19 16:20:41 +01:00
Jenkins for ownCloud
294137dda6 [tx-robot] updated from transifex 2015-02-19 01:55:43 -05:00
Robin Appelman
3632962000 Make the search box filter apps 2015-02-19 00:01:03 +01:00
Jenkins for ownCloud
b9c39b60ec [tx-robot] updated from transifex 2015-02-18 01:55:40 -05:00
Lukas Reschke
0ea6de2f8c Encode Requesttoken for avatars 
Fixes new avatar selection in master half, other half will work when https://github.com/owncloud/core/pull/14266 has get merged.

Shocking to see how much places in our code do it wrong 🔫
 2015-02-17 15:25:38 +01:00
Lukas Reschke
b701bbd8c5 Use APCu only if available in version 4.0.6 and higher 
APCu before 4.0.6 is unbelievable buggy and tend to segfault the PHP process (i.e. the whole webserver)

This potentially fixes https://github.com/owncloud/core/issues/14175

Requires a backport to stable8
 2015-02-17 13:28:02 +01:00
Lukas Reschke
76c511de92 Merge pull request #14056 from owncloud/refactor/13976 
Refactor OC_Request into TrustedDomainHelper and IRequest
 2015-02-17 13:17:04 +01:00
Jenkins for ownCloud
30ca14021c [tx-robot] updated from transifex 2015-02-17 01:56:23 -05:00
Lukas Reschke
886bda5f81 Refactor OC_Request into TrustedDomainHelper and IRequest 
This changeset removes the static class `OC_Request` and moves the functions either into `IRequest` which is accessible via `\OC::$server::->getRequest()` or into a separated `TrustedDomainHelper` class for some helper methods which should not be publicly exposed.

This changes only internal methods and nothing on the public API. Some public functions in `util.php` have been deprecated though in favour of the new non-static functions.

Unfortunately some part of this code uses things like `__DIR__` and thus is not completely unit-testable. Where tests where possible they ahve been added though.

Fixes https://github.com/owncloud/core/issues/13976 which was requested in https://github.com/owncloud/core/pull/13973#issuecomment-73492969
 2015-02-16 22:13:00 +01:00
Lukas Reschke
7f624188a7 Merge pull request #14261 from owncloud/fix-last-login-master 
Return milliseconds instead of seconds for lastLogin - refs #14005
 2015-02-16 20:22:47 +01:00
Thomas Müller
3c75a440a6 Return milliseconds instead of seconds for lastLogin - refs #14005 2015-02-16 17:41:44 +01:00
Morris Jobke
5a5d6bf4db Merge pull request #14128 from owncloud/drop-unused-methods 
Remove unused function and correct PHPDoc
 2015-02-16 17:37:36 +01:00
Lukas Reschke
c6705ab574 Merge pull request #13890 from owncloud/add-no-referrer 
Add `rel="noreferrer"` where possible and switch to HTTPS
 2015-02-16 14:36:44 +01:00
Lukas Reschke
7e45f5d27b Remove unused function and correct PHPDoc 2015-02-16 13:46:45 +01:00
Jenkins for ownCloud
786ff6a5a3 [tx-robot] updated from transifex 2015-02-16 01:54:30 -05:00
Jenkins for ownCloud
31c0cce092 [tx-robot] updated from transifex 2015-02-15 01:54:31 -05:00
Jenkins for ownCloud
2f851ff8bb [tx-robot] updated from transifex 2015-02-14 01:54:42 -05:00
Lukas Reschke
4032c7b685 This is an array 2015-02-13 14:23:22 +01:00
Lukas Reschke
a7df23ceba Manually type-case all AJAX files 
This enforces proper types on POST and GET arguments where I considered it sensible. I didn't update some as I don't know what kind of values they would support 🙈

Fixes https://github.com/owncloud/core/issues/14196 for core
 2015-02-13 13:33:20 +01:00
Jenkins for ownCloud
6b1ed4d688 [tx-robot] updated from transifex 2015-02-13 01:55:06 -05:00
Lukas Reschke
b68c376e8e Merge pull request #13913 from rullzer/showusergroups 
Added overview of groups a user is member of
 2015-02-12 11:21:40 +01:00
Morris Jobke
0b38a48bb4 Merge pull request #14135 from cmeh/master 
Clean-up of messages (orthography, format)
 2015-02-12 11:03:49 +01:00
Roeland Jago Douma
7a8f95be2f Added overview of groups a user is a member of 2015-02-12 10:49:55 +01:00
cmeh
f24f7f7c74 Orthography: "Back-end" -> Backend (without hyphen) and correction of "users" to the genitive "user's" 2015-02-12 08:18:24 +01:00
cmeh
01f89083ba Adding a missing space between value and unit 
Added the missing space between value and unit, as it is formatted in all other places across ownCloud.
 2015-02-12 08:14:12 +01:00
Jenkins for ownCloud
e929d43bb6 [tx-robot] updated from transifex 2015-02-12 01:54:41 -05:00
kondou
95cfe292f4 Make the password changed msg inline to fix #10242 2015-02-11 14:27:05 +01:00
Jenkins for ownCloud
9baf7a0a3f [tx-robot] updated from transifex 2015-02-11 01:55:07 -05:00
Jenkins for ownCloud
124e48aec0 [tx-robot] updated from transifex 2015-02-10 01:55:06 -05:00
Joas Schilling
4172ba48d4 Deduplicate template code and do not translate the links 2015-02-09 16:01:52 +01:00
Jenkins for ownCloud
e2d4b3c123 [tx-robot] updated from transifex 2015-02-09 01:54:53 -05:00
Lukas Reschke
f167c3d9f6 Merge pull request #13895 from owncloud/disable-autocomplete-1 
Disable autocomplete for SMTP Password
 2015-02-08 14:03:57 +01:00
Jenkins for ownCloud
60e771685e [tx-robot] updated from transifex 2015-02-08 01:54:53 -05:00
Morris Jobke
485e2a282b Merge pull request #13753 from owncloud/use-403-instead-of-200 
Use 403 instead of 200 response
 2015-02-07 13:25:15 +01:00
Jenkins for ownCloud
4bf7b2c130 [tx-robot] updated from transifex 2015-02-07 01:54:35 -05:00
Jenkins for ownCloud
988027fdca [tx-robot] updated from transifex 2015-02-06 15:26:04 -05:00
Jenkins for ownCloud
80e38b84dc [tx-robot] updated from transifex 2015-02-06 06:49:06 -05:00
cmeh
c1d661d35b Coherent use of "SQLite" in lines 119 and 124 
Just a cosmetic detail, but very obvious when working on localisations.
 2015-02-06 10:00:47 +01:00
Jenkins for ownCloud
bd60abbefc [tx-robot] updated from transifex 2015-02-06 01:57:07 -05:00
Thomas Müller
d748368ecb Don't highly discourage 2015-02-05 17:21:10 +01:00
Bernhard Posselt
7a9d428d6f Merge pull request #13907 from owncloud/enhance-sqlite-warning 
enhance sqlite warning on admin page as well as during setup
 2015-02-05 13:07:56 +01:00
Jenkins for ownCloud
9adff77040 [tx-robot] updated from transifex 2015-02-05 01:54:49 -05:00
Thomas Müller
f86c73c9f6 enhance sqlite warning on admin page as well as during setup - fixes #13906 2015-02-04 20:55:54 +01:00
Arthur Schiwon
30b24696c8 fix user loading 2015-02-04 17:19:11 +01:00
Lukas Reschke
40244c9eef Disable autocomplete for SMTP Password 
While really nearly no modern browser cares about it anymore too much it's still not wrong to have it here (and also stops some automated scanners reporting this...)
 2015-02-04 17:00:39 +01:00
Lukas Reschke
b432ea29c9 Add rel="noreferrer" where possible and switch to HTTPS 
Just to follow good practise and prevent some automated scanners to complain about "Cross-domain Referer leakage".
 2015-02-04 16:25:37 +01:00
Jenkins for ownCloud
77e9c212ed [tx-robot] updated from transifex 2015-02-04 01:55:49 -05:00
Jenkins for ownCloud
6aef13fb07 [tx-robot] updated from transifex 2015-02-03 01:54:50 -05:00
Thomas Müller
359abca50c Merge pull request #13790 from owncloud/fix-subadmin-group 
Fix subadmin listing of group
 2015-02-02 09:45:28 +01:00
Jenkins for ownCloud
800829d93d [tx-robot] updated from transifex 2015-02-02 01:54:32 -05:00
Volkan Gezer
9beb033a9f fix trusted domain localization 2015-02-01 16:06:12 +01:00
Jenkins for ownCloud
a3067b3b9f [tx-robot] updated from transifex 2015-02-01 01:54:33 -05:00
Jenkins for ownCloud
c877fbdac8 [tx-robot] updated from transifex 2015-01-31 01:54:39 -05:00
Lukas Reschke
fcd5056376 Consistent variable naming 2015-01-30 18:31:04 +01:00
Lukas Reschke
0f7634eadc Switch to a factory and add unit tests 2015-01-30 17:24:42 +01:00
Lukas Reschke
7e7dd92f6b Add unit tests 2015-01-30 14:29:46 +01:00
Lukas Reschke
734dcc82dd Fix subadmin listing of group 
Without this patch filtering for the "_everyone" (empty) group did not work for subadmins.

Fixes itself.
 2015-01-30 14:29:46 +01:00
Jenkins for ownCloud
f4d20dc1f3 [tx-robot] updated from transifex 2015-01-30 01:55:06 -05:00
Lukas Reschke
b9f180e001 Use 403 instead of 200 response 
A forbidden should throw a 403 and this makes it easier for me to do some automated testing.
 2015-01-29 12:04:54 +01:00
Jenkins for ownCloud
65871ffea3 [tx-robot] updated from transifex 2015-01-29 01:54:35 -05:00
Jenkins for ownCloud
55142186de [tx-robot] updated from transifex 2015-01-28 01:55:53 -05:00
Joas Schilling
7bd7c20295 Check whether return is an error case before using it 2015-01-30 16:39:57 +01:00
Lukas Reschke
a870dbe70b Merge pull request #13636 from owncloud/add-warning-if-restore-of-data-is-not-possible 
Add value if restore of data is possible for a user
 2015-01-27 14:12:05 +01:00
Morris Jobke
9fbeaf0fd9 Add value if restore of data is possible for a user 
* reason: nice to know before password change in user management
* restore is possible:
	* encryption is disabled
	* encryption is enabled, admin and user has checked the
	  restore option
* if not possible:
	* highlight users row in red once the admin wants to change the password
	* show also a little tipsy
 2015-01-27 13:23:19 +01:00
Jenkins for ownCloud
c8f58054b0 [tx-robot] updated from transifex 2015-01-27 01:54:34 -05:00
Thomas Müller
5da4071c45 Merge pull request #13621 from owncloud/system-config-multiset 
Add a method to set/unset multiple config values with one write
 2015-01-26 13:36:22 +01:00
Jenkins for ownCloud
a698637e91 [tx-robot] updated from transifex 2015-01-25 01:54:38 -05:00
Jenkins for ownCloud
b8e1dd9c87 [tx-robot] updated from transifex 2015-01-24 01:54:51 -05:00
Joas Schilling
039397bd31 Use setConfigs() instead of calling setConfig() multiple times 2015-01-23 14:52:21 +01:00
Jenkins for ownCloud
5f3c6a97b2 [tx-robot] updated from transifex 2015-01-22 01:55:09 -05:00