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

2505 commits

Author SHA1 Message Date
Jenkins for ownCloud
6679ef287a [tx-robot] updated from transifex 2015-04-28 01:54:44 -04:00
Joas Schilling
1341d03455 Can't use function return value in write context 2015-04-27 14:28:31 +02:00
Joas Schilling
d600955a51 Make getDefaultModuleId public and get module protected 2015-04-27 11:03:51 +02:00
Jenkins for ownCloud
e58029f8ad [tx-robot] updated from transifex 2015-04-27 01:54:46 -04:00
Jenkins for ownCloud
37adf6df01 [tx-robot] updated from transifex 2015-04-26 01:54:49 -04:00
Jenkins for ownCloud
7855174879 [tx-robot] updated from transifex 2015-04-25 01:55:13 -04:00
Morris Jobke
62bac7de91 Add missing loading indicator for enabled apps 
* happened when an app gets activated, because the
  new appended HTML doesn't contain the loading
  image
* fixes #15806
 2015-04-23 21:40:51 +02:00
Thomas Müller
6d3f120d23 Merge pull request #15617 from mmattel/getenv_system_check_and_warning 
Checks if getenv returns proper system environment variable results
 2015-04-23 14:42:58 +02:00
root
35dbef55b5 Checks if getenv returns proper system variable results 
Updated texts and changed the variable name to match the query

Updated text + info which path for php config is used

removed the term ownCloud and squashed the commits

Updated text
 2015-04-23 10:58:13 +02:00
Jenkins for ownCloud
f8f354b351 [tx-robot] updated from transifex 2015-04-23 01:54:51 -04:00
Thomas Müller
fc4127dd62 add $encryptionModuleId to methods of Keys/IStorage 2015-04-22 11:53:05 +02:00
Jenkins for ownCloud
d7bdf60559 [tx-robot] updated from transifex 2015-04-22 01:55:38 -04:00
Morris Jobke
4b968da9e6 Merge pull request #15713 from owncloud/fix-15707-master 
[enc2] Fixing JS errors
 2015-04-21 12:47:43 +02:00
Thomas Müller
4a2f8f81ca Don't pollute the global namespace 2015-04-21 12:01:56 +02:00
Jenkins for ownCloud
c548066d2c [tx-robot] updated from transifex 2015-04-21 01:55:37 -04:00
Lukas Reschke
9bc48451b9 Adjust tests and statuscode 2015-04-20 13:00:02 +02:00
Morris Jobke
8935369564 fix date variable 2015-04-20 13:00:02 +02:00
Lukas Reschke
20a6073a9f Migrate personal certificate handling into AppFramework controllers 
Also added unit-tests and better error-handling
 2015-04-20 12:58:58 +02:00
Jenkins for ownCloud
75bf03a605 [tx-robot] updated from transifex 2015-04-20 01:54:44 -04:00
Jenkins for ownCloud
fd3c1484ad [tx-robot] updated from transifex 2015-04-19 01:54:41 -04:00
Joas Schilling
b5c5775626 Fix potential undefined variable 2015-04-18 10:20:13 +02:00
Jenkins for ownCloud
37a871127b [tx-robot] updated from transifex 2015-04-18 01:55:19 -04:00
Jan-Christoph Borchardt
b083b65894 fix capitalization for server-side encryption and email server, fix #15642 2015-04-17 17:57:30 +02:00
Bjoern Schiessle
7d4b1b52d0 always create a new instance of the encryption module 2015-04-17 10:31:33 +02:00
Jenkins for ownCloud
da44df2cfa [tx-robot] updated from transifex 2015-04-17 01:55:37 -04:00
Clark Tomlinson
1174ad0681 Merge pull request #15445 from owncloud/enc2_migration 
add migration script from old encryption to new one
 2015-04-16 09:34:47 -04:00
Bjoern Schiessle
d2ef73367c allow user to start migration in admin settings if no external user back-ends are enabled 2015-04-16 14:15:04 +02:00
Bjoern Schiessle
e3d77c4b01 add migration script from old encryption to new one 2015-04-16 14:15:04 +02:00
Jenkins for ownCloud
8606b7ca66 [tx-robot] updated from transifex 2015-04-16 01:54:43 -04:00
Jan-Christoph Borchardt
14b92c3ce6 Merge pull request #15632 from owncloud/remove-tooltip-fade 
remove slow fade animation for remaining tipsy tooltips
 2015-04-15 14:42:45 +02:00
Jan-Christoph Borchardt
04ca5b8160 remove slow fade animation for remaining tipsy tooltips 2015-04-15 12:25:10 +02:00
Vincent Petry
75268860fc Merge pull request #15626 from owncloud/remove-tooltip-fade 
remove slow fade animation for tipsy tooltip
 2015-04-15 12:14:54 +02:00
Jan-Christoph Borchardt
9332c8c266 remove slow fade animation for tipsy tooltip 2015-04-15 09:10:21 +02:00
Jenkins for ownCloud
7f3f191ee9 [tx-robot] updated from transifex 2015-04-14 18:19:31 -04:00
Morris Jobke
74732cc0d8 Fix user list 
* the name cell was changed from td to th because of accessibility
  issues - this adjusts the CSS and JS to behave like before
 2015-04-13 21:43:36 +02:00
Roeland Jago Douma
2b8fc774d0 Initial fix for #15494 2015-04-12 16:29:05 +02:00
Jan-Christoph Borchardt
bbb2567918 Merge pull request #15398 from Volker-E/master 
fixing #15396 & #15397
 2015-04-10 10:43:39 +02:00
Jan-Christoph Borchardt
95890804f1 help section: code style and wording fixes 2015-04-09 12:33:18 +02:00
Jan-Christoph Borchardt
83a0d1b3ba link to proper subsite for Commercial support 2015-04-09 12:29:44 +02:00
Jan-Christoph Borchardt
65dc958418 add admin documentation hints to Federated Cloud Sharing and cron 2015-04-09 12:07:05 +02:00
Lukas Reschke
ba52f6f8fc Merge pull request #15314 from owncloud/app-categories-15274 
Add different trust levels to AppStore interface
 2015-04-09 10:07:32 +02:00
Lukas Reschke
98698e05e8 Add JS unit test for sorting 2015-04-08 22:08:37 +02:00
Lukas Reschke
eb1cf58d11 Reference $(this) instead 2015-04-08 21:26:12 +02:00
Lukas Reschke
0cd29e00d1 Fix wording 2015-04-08 21:24:03 +02:00
Thomas Müller
1fbf5d86df Merge pull request #14472 from owncloud/feature/wipencryptionapp 
encryption 2.0 app
 2015-04-07 16:46:45 +02:00
Morris Jobke
2182ae0d27 Merge pull request #15431 from owncloud/displayname-width 
widen displayName input field
 2015-04-07 14:24:01 +02:00
Bjoern Schiessle
a057108c0c make recovery key work 2015-04-07 13:30:30 +02:00
Thomas Müller
bd933b1c85 Adding app icon and fixing admin setting 2015-04-07 13:30:29 +02:00
Thomas Müller
bf809ac85a Removing left overs from old encryption app 2015-04-07 13:30:29 +02:00
Jan-Christoph Borchardt
44a8160b58 widen displayName input field 2015-04-07 13:28:26 +02:00
Jan-Christoph Borchardt
2b6e13d088 Merge pull request #15345 from rullzer/fix_15263 
[WIP] Only show SSL table header if there are certificates
 2015-04-07 13:19:36 +02:00
Jan-Christoph Borchardt
8e1a51731a apps mgmt: style experimental apps section, small design fixes 2015-04-07 12:27:39 +02:00
Joas Schilling
81ec1c8a1a Remove hardcoded link to performance docs 2015-04-07 12:25:30 +02:00
Jan-Christoph Borchardt
6250365bf4 app mgmt app level design enhancements 2015-04-07 11:55:10 +02:00
Jenkins for ownCloud
95e55aa4ad [tx-robot] updated from transifex 2015-04-07 01:54:47 -04:00
Jenkins for ownCloud
2bff92ade5 [tx-robot] updated from transifex 2015-04-05 01:54:51 -04:00
Jenkins for ownCloud
9b250baf9e [tx-robot] updated from transifex 2015-04-04 01:54:43 -04:00
Volker E
7b8c55651f fixing #15397 2015-04-04 02:11:31 +02:00
Volker E
b6efee8079 fixing #15396 accessibility of table#userlist 2015-04-04 02:07:05 +02:00
Lukas Reschke
25531bad88 Make user names clickable 2015-04-03 13:36:03 +02:00
Lukas Reschke
0816cf9142 Add experimental applications switch 
Allows administrators to disable or enabled experimental applications as well as show the trust level.
 2015-04-03 13:21:24 +02:00
Jenkins for ownCloud
23f1702f24 [tx-robot] updated from transifex 2015-04-03 01:54:53 -04:00
Joas Schilling
4e50f2b72d Fix the initial list of groups 2015-04-02 15:47:48 +02:00
Thomas Müller
9e5b319ed4 Merge pull request #15362 from owncloud/issue/15359-purge-memcache-console-app-disable 
Correctly purge the cache when an app is disabled via cli
 2015-04-02 09:26:15 +02:00
Jenkins for ownCloud
cc96105ebe [tx-robot] updated from transifex 2015-04-02 01:54:47 -04:00
Joas Schilling
d01cfde982 Correctly purge the cache when an app is disabled via cli 2015-04-01 15:43:38 +02:00
Morris Jobke
c5d8d91345 Merge pull request #15331 from owncloud/fix-password 
Fix JS reference error for personal password changing
 2015-04-01 09:04:37 +02:00
Jenkins for ownCloud
f5c7ba6b81 [tx-robot] updated from transifex 2015-04-01 01:55:33 -04:00
Robin McCorkell
68b4ce568e Fix JS reference error for personal password changing 2015-03-31 12:41:10 +01:00
Roeland Jago Douma
d61f688126 Only show SSL table header if there are certificates 2015-03-31 13:00:24 +02:00
Jenkins for ownCloud
1d06d93d27 [tx-robot] updated from transifex 2015-03-31 01:55:55 -04:00
Robin McCorkell
4f0abd910c Merge pull request #15269 from owncloud/migrate-checksetup-and-add-memcache 
Add check for activated local memcache
 2015-03-30 11:24:44 +01:00
Morris Jobke
00b2be11dd Merge pull request #15239 from owncloud/see-no-evil 
Move federated cloud sharing, files externals and updater to special pos...
 2015-03-30 09:05:31 +02:00
Jenkins for ownCloud
da55ff630c [tx-robot] updated from transifex 2015-03-30 01:54:41 -04:00
Jenkins for ownCloud
1db9605afb [tx-robot] updated from transifex 2015-03-29 01:55:31 -04:00
Lukas Reschke
65202d2a18 Add check for activated local memcache 
Also used the opportunity to refactor it into an AppFramework controller so that we can unit test it.

Fixes https://github.com/owncloud/core/issues/14956
 2015-03-28 13:59:22 +01:00
Jenkins for ownCloud
8b9b600644 [tx-robot] updated from transifex 2015-03-28 01:55:46 -04:00
Thomas Müller
5db932d1e4 Merge pull request #15261 from owncloud/fix-14268-master 
use StreamResponse to download the log file
 2015-03-27 15:07:50 +01:00
Vincent Petry
4d57b7bb3c Merge pull request #15259 from owncloud/fix-change-password-ie8 
Show label for password change in IE8
 2015-03-27 14:11:14 +01:00
Thomas Müller
b5545932e7 use StreamResponse to download the log file - fixes #14268 2015-03-27 11:30:32 +01:00
Morris Jobke
7e73b25533 Merge pull request #15258 from owncloud/users-addtofilteredgroup 
Don't append user in a filtered list if groups don't match
 2015-03-27 10:02:33 +01:00
Morris Jobke
a62f38a18b Merge pull request #15225 from owncloud/make-setups-for-users-that-tend-to-use-owncloud-on-not-proper-machines-a-little-bit-more-secure 
Add some generic default headers as well via PHP
 2015-03-27 09:54:40 +01:00
Joas Schilling
4608d3def7 Fix link to the updater 2015-03-27 09:38:13 +01:00
Joas Schilling
495562f40c Move federated cloud sharing, files externals and updater to special positions 2015-03-27 09:38:09 +01:00
Jenkins for ownCloud
880b31c513 [tx-robot] updated from transifex 2015-03-27 01:56:21 -04:00
Morris Jobke
3e8343c07c Show label for password change in IE8 
* fixes #10729
 2015-03-27 01:16:31 +01:00
Vincent Petry
ea93356598 Don't append user in a filtered list if groups don't match 2015-03-27 00:09:35 +01:00
Lukas Reschke
9d1ce53cb1 Add some generic default headers as well via PHP 2015-03-26 22:32:57 +01:00
Jan-Christoph Borchardt
fc59a37ae7 Merge pull request #14918 from owncloud/fix-password-change-ie8-and-9 
Don't use placeholder for password in IE8 & 9
 2015-03-26 22:06:22 +01:00
Thomas Müller
232518ac54 Merge pull request #15234 from owncloud/encryption2_core 
core part of encryption 2.0
 2015-03-26 21:14:59 +01:00
Bjoern Schiessle
ff9c85ce60 implement basic encryption functionallity in core to enable multiple encryption modules 2015-03-26 20:56:51 +01:00
Morris Jobke
55e1226dfe Don't use placeholder for password in IE8 & 9 
* the placeholder is in IE 8 and 9 just set as text and
  styled a bit grey. If the form is then serialized without
  typing something in the placeholder is sent as value
* this fixes that behaviour for the password field and
  properly detects empyt passwords
* fixes #14912
 2015-03-26 20:03:27 +01:00
Thomas Müller
9c6649f4f1 Merge pull request #15228 from owncloud/add-missing-navigation-for-tips-n-tricks 
Add navigation entry for tips and tricks setion
 2015-03-26 18:21:44 +01:00
Jan-Christoph Borchardt
b95139e5b2 Merge pull request #15230 from owncloud/sqlite-notice 
move SQLite notice from warnings to tips & tricks
 2015-03-26 18:15:22 +01:00
Jan-Christoph Borchardt
e3d60ee5b0 Merge pull request #14958 from owncloud/dropdown-style 
popover style for apps and user dropdown menus
 2015-03-26 18:07:35 +01:00
Thomas Müller
a8b756154a Merge pull request #14495 from owncloud/update-mailmap-01 
Updating .mailmap
 2015-03-26 17:17:18 +01:00
Jan-Christoph Borchardt
82fc754d3f move SQLite notice from warnings to tips & tricks 2015-03-26 16:53:27 +01:00
Joas Schilling
cd09b949a6 Add navigation entry for tips and tricks setion 2015-03-26 16:23:21 +01:00
Morris Jobke
0d786c381b Merge pull request #15212 from owncloud/log-width 
force log messages to break to alleviate horizontal scroll on Admin page
 2015-03-26 14:41:54 +01:00
Jan-Christoph Borchardt
7c66e17237 force log messages to break to alleviate horizontal scroll on Admin page 2015-03-26 12:34:57 +01:00
Jenkins for ownCloud
b585d87d9d Update license headers 2015-03-26 11:44:36 +01:00
Morris Jobke
20f5290462 Merge pull request #15195 from owncloud/reanimate-add-guzzle 
Add wrapper for Guzzle
 2015-03-26 11:06:48 +01:00
Jan-Christoph Borchardt
cd88ddddaf fix accessibility of ownCloud logo and navigation entries, fix #15013g 2015-03-26 10:31:00 +01:00
Jenkins for ownCloud
40b77eb97a [tx-robot] updated from transifex 2015-03-26 01:55:29 -04:00
Lukas Reschke
5f044ebf1b Add wrapper for Guzzle 2015-03-25 16:04:41 +01:00
Jan-Christoph Borchardt
04a4df5065 only show connection checks results if there are errors, fix #11476 2015-03-25 09:34:13 +01:00
Jenkins for ownCloud
fb61889490 [tx-robot] updated from transifex 2015-03-25 01:55:46 -04:00
Jan-Christoph Borchardt
6d384e5f7c consolidate all admin warnings and notices into one section 2015-03-24 15:21:49 +01:00
Morris Jobke
a039768685 Merge pull request #15127 from owncloud/admin-tips-jenkins 
add Tips & tricks section to admin settings
 2015-03-24 14:18:33 +01:00
Joas Schilling
5e71d1558a Merge pull request #15149 from owncloud/fix-enable-for-group 
Correctly get array of groups and send OCP\IGroup objects to enable meth...
 2015-03-24 13:50:56 +01:00
Joas Schilling
b262c30fa9 Correctly get array of groups and send OCP\IGroup objects to enable method 2015-03-24 12:56:42 +01:00
Joas Schilling
c3c2517131 Display a message when no apps can be found for this oc version 2015-03-24 11:29:28 +01:00
Jenkins for ownCloud
9cb07f126d [tx-robot] updated from transifex 2015-03-24 01:55:24 -04:00
Thomas Müller
e8d12c1809 Merge pull request #15075 from owncloud/fix-15056-master 
remove unneeded status element from json response on /categories
 2015-03-23 18:30:40 +01:00
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