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

2280 commits

Author SHA1 Message Date
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