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

980 commits

Author SHA1 Message Date
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
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
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
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
Jan-Christoph Borchardt
d05e0c81d4 remove extra slogan footer from Personal and Admin pages 2016-01-11 03:18:06 +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
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
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
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
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
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
01b9f07ac8 Remove info about database locking performance 2015-12-10 16:10:45 +01:00
Lukas Reschke
4b293dffe5 Use \OCP\Util::sanitizeHTML instead of \OC_Util::sanitizeHTML 2015-12-08 08:56:47 +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
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
Jan-Christoph Borchardt
9671103121 clarify log level setting design, fix #20514 2015-11-18 14:04:09 +01:00
Jan-Christoph Borchardt
e9691893b5 use new checkbox style for Apps mgmt settings 2015-11-10 14:31:34 +01:00
Hendrik Leppelsack
7e2fe08778 new checkbox style in app settings 2015-10-31 17:07:07 +01:00
Hendrik Leppelsack
d2f0055af4 apply new checkbox style in users settings 2015-10-29 13:03:55 +01:00
Joas Schilling
e19c49295a Use speaking ids 2015-10-26 16:15:15 +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
Hendrik Leppelsack
bf722d93df apply new checkbox style to admin settings 2015-10-14 12:14:49 +02: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
c7aef6c368 Fix uploading avatar and root certs in IE8 2015-10-09 11:19:05 +02:00
Bjoern Schiessle
14497ecfac improved explanation of server side encryption 2015-10-06 11:02:38 +02: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
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
Robin Appelman
d032d2f0f4 Add documentation links for transactional locking 2015-09-10 15:11:14 +02:00
Robin Appelman
24756cf90b specify where to enable locking 2015-09-07 15:09:40 +02: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
Georg Ehrke
1a48499dcb move updater panel above version number 2015-09-03 15:03:16 +02:00
Robin Appelman
4361ff92e2 Replace server status message about transitional file locking with setup warnings 2015-09-03 11:59:47 +02:00
Jan-Christoph Borchardt
acc9fa49fc use SVG for toggle image instead of PNG, fix installation and personal settings toggle 2015-09-03 11:49:28 +02:00
Robin McCorkell
2992a1aa88 Merge pull request #18395 from owncloud/hide-empty-security-warning 
[admin settings] Show success message if security warnings are empty
 2015-08-21 11:38:40 +01:00
Morris Jobke
63a1f9afac add success message 2015-08-21 11:09:01 +02:00
michag86
9ad4510f5b hide delete icon on group for subadmins 
because they cannot delete a group
 2015-08-18 20:20:19 +02:00
Jan-Christoph Borchardt
12eec397e3 Merge pull request #17975 from owncloud/settings_admin_warning_levels 
Settings admin warning levels
 2015-08-18 13:38:08 +02:00
Jan-Christoph Borchardt
43888bb9bf Merge pull request #18083 from owncloud/user-search-box 
use the main search box to filter users in user management
 2015-08-07 00:35:50 +02:00
Bernhard Posselt
6f9f20b3fe Merge pull request #17810 from owncloud/better-enc-warnings 
Condense doc warnings into small section that gets showed to the user…
 2015-08-06 10:43:20 +02:00
Robin Appelman
0f5af5482e use the main search box to filter users in user management 2015-08-05 17:29:20 +02:00
Bjoern Schiessle
573177d176 only add the possibility to import ssl root certificates to the personal 
setting if the user can mount external storages
 2015-08-04 18:08:04 +02:00
Roeland Douma
db91b4505c Merge pull request #17805 from owncloud/avatar-handle-errors 
[avatar] add error handlers for avatar setup
 2015-07-31 07:31:24 +02:00
Morris Jobke
e184157684 [avatar] add error handlers for avatar setup 
add colon to translated string

use placeholder in t()

Adding a size limitation for avatar upload

Unit test for file size

Fix typo & display server side error message
 2015-07-30 18:05:32 +02:00
Jan-Christoph Borchardt
2d130826da correct order and capitalization of 'Server status' admin settings entry, fix #17395 2015-07-30 17:34:13 +02:00
Roeland Jago Douma
5d15051da4 Allow setupchecks to specify a warning level 2015-07-30 09:57:08 +02:00
Bernhard Posselt
546cd39217 condense doc warnings into small section that gets showed to the user before enabling encryption 
remove share warning

remove app and just write it out as feature

adjust warnings

reframe storage issue

fix typo
 2015-07-22 21:59:31 +02:00
Jan-Christoph Borchardt
780a2ed093 use arrow to indicate external link, use correct quotes and capitalization 2015-07-22 14:20:55 +02:00
Bjoern Schiessle
50cbb57065 make sure that there is a space between user- and admin-documentation 2015-07-22 14:02:43 +02:00
Vincent Petry
eadf789519 Rename experimental to transactional file locking 2015-06-26 11:10:10 +02:00
Joas Schilling
6adddb3095 Merge pull request #16889 from owncloud/group-sorting-fixes 
Only sort by group name when LDAP is involved
 2015-06-19 08:29:25 +02:00
Joas Schilling
171f86ca2e Only sort by group name when LDAP is involved 2015-06-16 11:10:00 +02:00
Joas Schilling
580155abe7 Load the update information asyncroniously to fix the page load speed 2015-06-10 12:11:05 +02:00
Joas Schilling
bdc82dcfb9 Check for redis to be 2.2.5+ 2015-06-02 15:42:48 +02:00
Thomas Müller
43772e2a9a Adding information on file locking status to admin section 2015-06-01 13:24:02 +02:00
Jan-Christoph Borchardt
94e4f448ee use arrow icon for external link to Apps dev docs, like in Help section 2015-05-22 01:17:22 +02:00
Thomas Müller
d90b83725f Merge pull request #16085 from owncloud/encryption-module-rename 
rename to 'Default encryption module'
 2015-05-19 11:13:33 +02:00
Lukas Reschke
ebf3953908 Merge pull request #16168 from owncloud/cron-errors 
fix cron errors to only appear in one line instead of introducing another list
 2015-05-08 11:23:19 +02:00
Morris Jobke
5b7e4b3341 Fix typo in encryption module message 
* finishes #16021
 2015-05-07 18:04:32 +02:00
Jan-Christoph Borchardt
3abaf34709 fix cron errors to only appear in one line instead of introducing another list 2015-05-07 16:19:14 +02:00
Morris Jobke
12b24ee567 Merge pull request #16034 from owncloud/issue-15987-encryption-module-admin-page 
Display the module settings in the list of the encryption modules
 2015-05-07 10:44:03 +02:00
Jan-Christoph Borchardt
35292eb66c rename to 'Default encryption module' 2015-05-06 15:31:05 +02:00
Morris Jobke
5a46dad4e0 kill new lines in l10n strings 2015-05-06 14:30:22 +02:00
Morris Jobke
5ef4a7606c Add l10n support to encryption settings 
* fixes #16111
 2015-05-06 12:39:02 +02:00
Jan-Christoph Borchardt
952a90f2e3 Merge pull request #16037 from owncloud/enc_dont_disable_encryption 
don't let the the user disable encryption once it was activated
 2015-05-05 18:53:01 +02:00
Morris Jobke
624c25313e fix label reference 2015-05-05 11:12:56 +02:00
Bjoern Schiessle
8f1e504d79 adjust wording and add button to confirm encryption 2015-05-05 10:38:09 +02:00
Joas Schilling
eadc2c330c Display the module settings in the list of the encryption modules 2015-05-04 15:04:03 +02:00
Bjoern Schiessle
6dc3682cc2 don't let the the user disable encryption once it was activated 2015-05-04 13:13:31 +02:00
Thomas Müller
7112824229 fix l10n strings 2015-05-04 11:37:30 +02:00
Thomas Müller
c2fd7b1d12 no link if there is no detailpage property set - fixes #15953 2015-05-04 11:35:30 +02:00
Jan-Christoph Borchardt
4c070b3e12 remove 'More apps' link from apps mgmt now that we have support for experimental apps 2015-05-01 18:07:55 -04:00
Jan-Christoph Borchardt
8b37e25ec2 add admin documentation links for Sharing, Encryption and Email server 2015-04-30 17:10:24 -04: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
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
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
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
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
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
8e1a51731a apps mgmt: style experimental apps section, small design fixes 2015-04-07 12:27:39 +02:00
Jan-Christoph Borchardt
6250365bf4 app mgmt app level design enhancements 2015-04-07 11:55:10 +02: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
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
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
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
Morris Jobke
3e8343c07c Show label for password change in IE8 
* fixes #10729
 2015-03-27 01:16:31 +01:00
Lukas Reschke
9d1ce53cb1 Add some generic default headers as well via PHP 2015-03-26 22:32:57 +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
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
Jan-Christoph Borchardt
82fc754d3f move SQLite notice from warnings to tips & tricks 2015-03-26 16:53:27 +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
Jan-Christoph Borchardt
cd88ddddaf fix accessibility of ownCloud logo and navigation entries, fix #15013g 2015-03-26 10:31:00 +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
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
c3c2517131 Display a message when no apps can be found for this oc version 2015-03-24 11:29:28 +01:00
Jan-Christoph Borchardt
c2ccaf000a add Tips & tricks section to admin settings 2015-03-23 18:19:13 +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
Jan-Christoph Borchardt
bdb4089139 collapse app descriptions by default, make expandable, fix #13112 2015-03-19 16:30:47 +01:00
Robin McCorkell
69d376fbf1 Put notice about checking logs in setup warning 2015-03-15 01:25:30 +00: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
Jan-Christoph Borchardt
db02edd7c8 adjust list of errors, more compact and readable 2015-03-06 15:27:21 +01: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
Jakob Sack
97a624dba5 Improve language on backgroundjob admin page 2015-03-01 11:51:40 +01: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
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
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
e887f7b9b7 clarify link on apps management to the dev documentation 2015-02-26 15:02:39 +01: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
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
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
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
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
kondou
95cfe292f4 Make the password changed msg inline to fix #10242 2015-02-11 14:27:05 +01:00
Joas Schilling
4172ba48d4 Deduplicate template code and do not translate the links 2015-02-09 16:01:52 +01: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
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
Thomas Müller
d748368ecb Don't highly discourage 2015-02-05 17:21:10 +01: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
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
Clark Tomlinson
0ae4db2431 Revert "Disable autocomplete for SMTP Password" 2015-02-04 10:54:22 -05:00
Lukas Reschke
74bae87803 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 16:33:40 +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
Morris Jobke
879248ad3d use title instead of name 2015-01-21 16:52:38 +01:00
Morris Jobke
a87a2e8e2c Merge pull request #13494 from owncloud/windows_warning 
add a Windows warning
 2015-01-20 14:12:30 +01:00
Frank Karlitschek
828d7d6cf5 add a Windows warning 2015-01-20 13:37:50 +01:00
Morris Jobke
956e17d008 also show message for empty display name if change of it isn't allowed 2015-01-19 15:45:03 +01:00
Morris Jobke
022b698475 Show mail address & display name if it is read only 
* gives the user the chance to verify it's mail address
  and display name
* ref #12823
* fixes #13393
 2015-01-15 17:51:54 +01:00
Morris Jobke
6a5f12beca Merge pull request #12988 from owncloud/logfile_download 
Logfile download
 2015-01-09 00:33:22 +01:00
Georg Ehrke
f579f2bd94 add Download logfile button to admin settings 
add logSettingsController

add download logfile button

move getEntries to LogSettingsController

move set log level to logsettingscontroller.php

add warning if logfile is bigger than 100MB

add unit test for set log level

fix typecasting, add new line at EoF

show log and logfile download only if log_type is set to owncloud

add unit test for getFilenameForDownload
 2015-01-07 14:55:53 +01:00
Joas Schilling
3d997e8c62 Fix incorrect warning about setting the overwrite.cli.url 2015-01-07 09:02:33 +01:00
Thomas Müller
fc38d4cc81 fixing wrong usage of license vs licence 2015-01-06 13:07:17 +01:00
Lukas Reschke
b2ae95719d Link to HTTPS page 
Those domains are now accessible via HTTPS
 2014-12-19 15:53:56 +01:00
Thomas Müller
995f01fa2a Merge pull request #12921 from owncloud/user-mail-user-management 
Mail address of users is now changable in the user management
 2014-12-19 09:51:18 +01:00
Morris Jobke
3036a8714d Merge pull request #12941 from owncloud/wave-accessibility-compliance 
Wave accessibility compliance
 2014-12-19 00:30:56 +01:00
Jörn Friedrich Dreyer
891474b0d6 Merge pull request #12759 from owncloud/core-reduce-js-and-css 
make sure styles and scripts are only loaded once
 2014-12-18 23:18:37 +01:00
Morris Jobke
5913af8a72 Mail address of users is now changable in the user management 
* introduced new route settings/users/{id}/mailAddress
* kept old responses
* better error messages
* dropped lostpassword.php from settings/ajax
* cleaned up the UserList.add() and hand in user object instead of
  each attribute as another parameter
* check for change permission of mail address
* proper response messages
 2014-12-18 22:43:09 +01:00
Jan-Christoph Borchardt
43b2af7333 more alt text and label fixes in Personal settings 2014-12-18 16:11:25 +01:00
Thomas Müller
51a22431ee load showpassord.js conditionally in the template only if needed 2014-12-16 18:45:37 +01:00
Morris Jobke
3b61f76ca0 Send mail for new users 
* supply mail address
* send mail with username and URL to that mail address
* option to temporary enable this feature
 2014-12-16 09:10:22 +01:00
Bernhard Posselt
be45366013 Merge pull request #12625 from owncloud/app-dependencies-libs-and-commands 
adding dependencies for command line tools and php libraries
 2014-12-15 12:34:46 +01:00
Morris Jobke
04aaa72810 Show user backend in user management 
* add switch to settings to show user backend
* user classes for headers and rows to unify the show/hide statement
* add user backend to response of user create request
* proper markup in settings area
 2014-12-12 14:19:29 +01:00
Morris Jobke
fa5790c8af move loading of JS and CSS to template 2014-12-12 09:22:15 +01:00
Morris Jobke
af1f34e813 remove PHP generated user list and move all to the existing JS part 2014-12-12 09:12:30 +01:00
Thomas Müller
95fc5addec adjust styling of missing dependencies in apps management 2014-12-11 15:24:36 +01:00
Joas Schilling
539c0aeb04 Add an option to disallow sending sharing emails to non-owncloud users 
Fix #10836
 2014-12-09 11:32:39 +01:00
Lukas Reschke
2b76227180 Check for working .htaccess via AJAX 
Fixes https://github.com/owncloud/core/issues/12650
 2014-12-06 15:34:53 +01:00
Clark Tomlinson
b8a2fdaa21 Merge pull request #12607 from owncloud/this-is-an-awesome-day 
PHP 5.4 is now required for master
 2014-12-04 10:33:04 -05:00
Thomas Müller
d235a9c128 display missing dependencies in the apps management page 2014-12-04 11:40:33 +01:00
Lukas Reschke
1b0bc2e099 PHP 5.4 is now required for master 
🍻
 2014-12-04 10:46:38 +01:00
Simon Whittaker
6d04ca18d9 adding @ sign between email address and domain name to make the syntax clearer 2014-12-02 15:06:40 +00:00
Lukas Reschke
fc116f563f Allow read-only configuration 
Workaround required for IIS setups running ownCloud to prevent dataloss.

Long-term solution would be to move some configuration settings to the database
 2014-11-25 16:26:47 +01:00
Volkan Gezer
388ef07c20 update grammar 
Suggested by mnestis on Transifex.
 2014-11-21 02:17:02 +01:00
Morris Jobke
256eff6eac User management search just searches users - adjust label of input field - fixes #10229 2014-11-18 22:12:14 +01:00
Thomas Müller
4c1244f50c Merge pull request #11917 from owncloud/fix-11909 
Add checkbox to enforce SSL for subdomains
 2014-11-11 20:37:50 +01:00
Morris Jobke
311566b96d Login Name -> Username in user management 2014-11-10 10:52:47 +01:00
Morris Jobke
226d43a1cf manage select2 via bower 2014-11-06 09:27:12 +01:00
Lukas Reschke
e73ccbd4ca Migrate "setsecurity.php" to the AppFramework 
Add switch to enforce SSL for subdomains

Add unit tests

Add test for boolean values

Camel-case

Fix ugly JS
 2014-11-03 16:53:03 +01:00
Vincent Petry
2a454fd04d Capitalize Checks in admin page 2014-11-03 15:41:40 +01:00
Thomas Müller
1076a77840 fix loading of more log entries 2014-10-30 14:59:13 +01:00
Thomas Müller
d9db791c67 introduce sidebar for admin page 2014-10-30 13:44:40 +01:00
Thomas Müller
ff84384513 Adding translations for settings 2014-10-29 10:57:46 +01:00
Sebastian Bolt
52684c86e5 "Group admin" default label (issue #7706) 
Changed the column header to "Group Admin for" and the default value of
the multiselect box to "no group" if user is not a groupadmin for any
group.
 2014-10-22 22:08:55 +02:00
Lukas Reschke
479424a459 Add some basic sanitization 
Better to be safe than sorry ;)
 2014-10-17 10:39:35 +02:00
Thomas Müller
04323fbc19 implement sidebar fro personal settings - bad kung-fu 2014-10-17 10:38:13 +02:00
Jan-Christoph Borchardt
4611520c7f first steps of sidebar for personal and admin settings 2014-10-17 10:38:13 +02:00
Lukas Reschke
f48c973876 Merge pull request #11570 from owncloud/backport-11408-master 
Backport 11408 master
 2014-10-15 21:21:45 +02:00
Thomas Müller
b091394a90 introduce new app page layout 
filter installed and not-installed apps properly

kill unneeded file

load category 'Installed' on page load

adding documentation links

new apps mgmt: first style adjustment

apps mgmt: only show license and preview if they exist

adding buttons

new apps mgmt: fix for mobile

use app icon if available

new apps mgmt: position enable/disable toggle to the right

new apps mgmt: proper display of icons or previews

new apps mgmt: fix loading spinner

reenable group selection for apps

new apps mgmt: position enable button normally again

new apps mgmt: clarify wording from 'Installed' to 'Enabled'

reintroduce enable/disable

Move rating image path generation to client-side

Move expression outside of l10n

fix group handling

add buttons for 'More apps' and 'Add your app' again

disable changed date of app for now

adding recommended label

style 'Recommended' app tag

fixing php warning

sort by rating

adding meta-category 'Recommended'

 Only show existing documentation links

lacy loading of screenshots

making group based app activation work again

adding support to get the app icon not only by the app name but also simply by the fixed name 'app.svg'

adding app.svg for all core apps

query string '?installed' is not longer needed

update and uninstall is back + error feedback

remove unneeded parameter

fix alignment of 'recommended' label
 2014-10-15 15:21:40 +02:00
Thomas Müller
d3eebad591 fixing typos 2014-10-14 15:38:39 +02:00
Lukas Reschke
13b1b45ee4 Refactor MailSettings controller 
- Do not store the password (fixes https://github.com/owncloud/core/issues/11385)
- Refactor to AppFramework
- Add unit tests

Conflicts:
	settings/admin/controller.php
 2014-10-14 15:38:34 +02:00
Vincent Petry
89e02e89d4 Merge pull request #7051 from owncloud/postsetupajaxcheck 
Moved WebDAV check to client side JS
 2014-09-23 16:55:16 +02:00
Vincent Petry
e65ceb08fc Moved WebDAV and internet checks to client side JS 
- Added setup checks in JavaScript
- Moved isWebDAVWorking to JS using SetupChecks
- Moved internet connection checks to an ajax call that goes through the
  server
 2014-09-23 11:16:14 +02:00
Thomas Müller
f4eae03f20 date printed in the admin section regarding last execution time is already displayed in the users timezone - no need to append UTC 2014-09-22 14:06:51 +02:00
Vincent Petry
0d28ba0662 Added select2 on the apps page 
Moved setupGroupsSelect() from admin.js to a common settings.js
as OC.Settings.setupGoupsSelect().

Now using select2 as well on the apps page.
 2014-09-09 18:04:00 +02:00
Vincent Petry
d23621536c Now using select2 for the groups excluded from sharing 2014-09-09 18:03:05 +02:00
VicDeo
ae7f632a1a Merge pull request #10863 from owncloud/removeWarningWhenCheckIsDisabled 
Add new check_for_working_internet configuration switch
 2014-09-09 01:50:33 +03:00
Lukas Reschke
ffee4da397 Merge pull request #10740 from owncloud/fix-everyone-group-count 
Using countUsers method to return true count of users
 2014-09-08 18:29:11 +02:00
Clark Tomlinson
6a56e03d48 Using countUsers method to return true count of users 2014-09-05 11:23:59 -04:00
Lukas Reschke
c13a8acbb5 Don't show warning when has_internet_connection is set to false 
Revert

Add disabled
 2014-09-05 15:58:33 +02:00
Lukas Reschke
4efe6f6240 Add unit tests and fix rootcerts creation bug 2014-08-31 10:47:50 +02:00
Robin Appelman
1361bbb1e6 Cleanup routes 2014-08-31 10:47:50 +02:00
Robin Appelman
c1b11571ea Move certificate management interface from files_external to core 2014-08-31 10:47:50 +02:00
Morris Jobke
0aede0f413 move hardcoded color to CSS class - for themeability 2014-08-29 17:50:59 +02:00
Jan-Christoph Borchardt
41ace03911 color quota bar yellow for feedback if usage is over 90% 2014-08-29 16:46:08 +02:00
Jan-Christoph Borchardt
ba841d9561 user mgmt: move 'Show storage location' and 'Show last log in' to settings area 2014-08-29 00:08:01 +02:00
Stephane V
c7c54d9361 Adds 2 checkboxes at the top of userlist in the settings, to display/hide optional columns 
This fixes #9367.
 2014-08-28 23:45:21 +02:00
Dan Callahan
6cca20fb36 Set email input field to type=email for better UX 2014-08-26 11:14:30 -05:00
Vincent Petry
a820df71ee Merge pull request #10339 from owncloud/users-defaultquotafix 
Fixed default quota field on user management page
 2014-08-18 18:50:43 +02:00
Joas Schilling
64d64610d2 Add a note about overwritewebroot when using system cron 
If the current webroot is non-empty but the webroot from the config is,
and system cron is used, the URL generator fails to build valid URLs.
So we notify the admin to set it up correctly.

Fix #9995
 2014-08-18 11:10:22 +02:00
Volkan Gezer
46309a9ee4 ascii typo 2014-08-14 00:32:08 +02:00
Arthur Schiwon
4220e0c7da it does not affect gravity on planet earth, but only for tipsy 2014-08-13 14:20:14 +02:00
Arthur Schiwon
288b6d4071 make singleselect check for gravity wish, and make it south for default quota 2014-08-12 18:04:52 +02:00
Vincent Petry
c208796c47 Use global apps slide toggle logic 
Remove local app settings slide logic and make it use the global one
triggered by the "data-apps-slide-toggle" attribute.
 2014-08-12 12:00:34 +02:00
Thomas Müller
07dc0b2fdf setting and checking default_charset in php.ini to be UTF-8 2014-07-25 09:53:25 +02:00
Vincent Petry
4d5ebe61c4 Fixed JS and CSS issues in users page 
- Renamed "delete" to "deleteEntry" to make IE8 happy.
- Added missing "svg" class for the "+" button
- Added height to "+" button but was unable to properly align it
 2014-07-17 13:13:03 +02:00
Arthur Schiwon
e2c935d6fb increase/decrease everyone count on user creation/deletion 2014-07-09 14:32:10 +02:00
Arthur Schiwon
a584022ecc increment group counters when a user is created 2014-07-09 14:30:39 +02:00
Volkan Gezer
2561ef123b fix apostrophe fixes #9486 2014-07-08 21:48:29 +02:00
Georg Ehrke
485be909ff improvements for uninstall button 2014-07-05 13:39:25 +02:00
Jan-Christoph Borchardt
1b83ac7de2 personal: link straight to /promote as @tomneedham said 2014-07-02 19:29:57 +02:00
Jan-Christoph Borchardt
4878c734e2 add link to contribute and promote pages in personal settings 2014-07-02 17:41:26 +02:00
raghunayyar
720fa33274 Better Logic to display user count for everyone. 2014-06-24 00:50:36 +05:30
Arthur Schiwon
85894654ae Make sure last seen tooltip always appears even after searching and filtering 2014-06-19 14:30:22 +02:00
Morris Jobke
9e74787c8a Migrate table layout to p layout for share settings 
ref #8906
 2014-06-17 14:33:14 +02:00
Morris Jobke
c42d087fc5 Merge pull request #9053 from owncloud/small_ux_improvement 
share settings, small ux improvement
 2014-06-16 20:18:51 +02:00
Georg Ehrke
15c215cd03 Merge pull request #8808 from owncloud/update_shipped_apps_from_appstore 
Make shipped apps updatable via appstore
 2014-06-16 15:54:50 +02:00
Bjoern Schiessle
c1ef536896 show explenation only if the setting is activated 2014-06-16 15:33:46 +02:00
Lukas Reschke
01de7b8b9e Merge pull request #9028 from owncloud/table-to-paragraph-layout-for-https 
migrate table layout to paragraph layout for HTTPS setting
 2014-06-14 13:08:58 +02:00
Morris Jobke
fd5fad194d remove double space 2014-06-14 01:03:03 +02:00
Morris Jobke
dc2212cd46 migrate table layout to paragraph layout for HTTPS setting 2014-06-13 16:54:47 +02:00
Morris Jobke
f5da0052cf fix mail settings save function - ref #8854 2014-06-13 15:31:35 +02:00
Jan-Christoph Borchardt
23c83c076c unify controls bar, remove duplicate from user management 2014-06-06 12:22:09 +02:00
Georg Ehrke
0fe8f77c17 Merge branch 'master' into update_shipped_apps_from_appstore 
Conflicts:
	lib/private/app.php
	settings/templates/apps.php
 2014-06-05 22:54:27 +02:00
Bjoern Schiessle
6578f00b4b unify share settings 2014-06-05 15:49:34 +02:00
Bjoern Schiessle
cf9099c788 This settings doesn't belong together 
Revert "make reshare settings foldable"

This reverts commit c01f196f72.

Conflicts:
	settings/templates/admin.php
 2014-06-05 15:44:56 +02:00
Bjoern Schiessle
c991e148a6 improve share settings working 2014-06-05 15:44:55 +02:00
Jan-Christoph Borchardt
bc47e56f9f fix related layout issues in user management 2014-06-04 16:24:39 +02:00
icewind1991
cdf8a123e7 Merge pull request #8264 from owncloud/app-enable-by-group 
Add the option to enable apps only for specific groups
 2014-06-03 19:01:12 +02:00
Thomas Müller
cfc1d5623e Merge pull request #8840 from owncloud/share_settings 
by default don't show option to send mail notifications for shares
 2014-06-03 16:42:44 +02:00
Thomas Müller
a5dd8e84f1 Merge pull request #8827 from owncloud/add-sqlite-info 
add info about sqlite on setup page
 2014-06-03 15:07:59 +02:00
Thomas Müller
79b3558c6d Merge pull request #7151 from owncloud/user-jquery 
Continuing the New User management
 2014-06-03 15:04:30 +02:00
Thomas Müller
a3202f1f03 bring back the line breaks 2014-06-03 12:48:36 +02:00
Jan-Christoph Borchardt
de012667c7 Apps: fix wording and layout for 'enable only for specific groups' 2014-06-03 12:42:36 +02:00
Thomas Müller
402a31f196 adding some line breaks 2014-06-03 12:42:36 +02:00
Robin Appelman
53dc30af4f Add option to enable app for specific groups 2014-06-03 12:42:35 +02:00
Morris Jobke
25c676f203 simplify SQLite warning 2014-06-03 12:02:23 +02:00
Bjoern Schiessle
5097bcc16d improve settings name 2014-06-03 11:29:51 +02:00
Morris Jobke
68a4fd44e6 add notification on admin page 2014-06-03 08:01:39 +02:00
Jan-Christoph Borchardt
c84b226cb5 add arrow icon for external links 2014-06-02 23:18:25 +02:00
Jan-Christoph Borchardt
2e6a27614e move Help section from controls bar to sidebar 2014-06-02 22:59:16 +02:00
Arthur Schiwon
39982c2aea fix grouplist behaviour (blank after filtering) 2014-06-02 17:32:59 +02:00
Morris Jobke
6f4bdbdb94 Merge pull request #8784 from owncloud/fold-reshare-settings 
make reshare settings foldable
 2014-06-02 14:37:10 +02:00
Arthur Schiwon
ec572607e1 remove group rename stuff, there is not support in the backends yet. to do for oc8. 2014-06-02 12:53:59 +02:00
Jan-Christoph Borchardt
29ef2f7a2f user mgmt: hide group rename function because it’s not supported in the backend yet 2014-06-02 12:53:59 +02:00
ringmaster
4de14fe6da Javascript cleanup for groups. 2014-06-02 12:53:58 +02:00
ringmaster
c38548a1aa Rebase cleanup. 
Removing code that should not have been restored.
Originally removed in 45fd8f6d.
 2014-06-02 12:53:58 +02:00
ringmaster
1115d68f25 Fix broken span. 2014-06-02 12:53:58 +02:00
ringmaster
097887a659 Add the admin group to the group list data. 
Fixes the admin group disappearing from the list when updating the display as the result of a search.

This group data should probably be managed on the page entirely by the javascript GroupList object, but this seems like the interim method.
 2014-06-02 12:53:58 +02:00
ringmaster
747c011615 More specific selectors, javascript cleanup. 
* Assigned jQuery selector results to variables for speed.
* Moved all .attr('data') calls to .data() calls.
* Added :data(uid) selector.
* Split the multiselect checkhandlers into separate functions.
* De-duped click event on password change/img.
* Used fluent interface on jQuery object for event binding.
* Removed redundant tag names in class selectors.
* Fixed incorrect date display for last login.
* Added Userlist.has() to search for uid.
* General code convention compliance fixes.

to-do: Group dropdowns currently don't add the admin group after the search result, not sure why yet.
 2014-06-02 12:53:58 +02:00
Jan-Christoph Borchardt
57cc51d21d user management: remove autocompletion of user/password fields, fix #8464 2014-06-02 12:53:58 +02:00
Jan-Christoph Borchardt
66d00cf782 user management: remove unneeded and erroneous user filter reset function 2014-06-02 12:53:57 +02:00
Lukas Reschke
b56d14260d Rename $isadmin to $isAdmin 2014-06-02 12:53:57 +02:00
Arthur Schiwon
a9bd416643 add reset button for the filter field 2014-06-02 12:53:57 +02:00
Arthur Schiwon
3ff123f247 more appropriate label 2014-06-02 12:53:57 +02:00
Arthur Schiwon
3e411c82a5 unify and consolidate group fetching method for initial template fill and ajax request 2014-06-02 12:53:56 +02:00
Arthur Schiwon
08ad073cf5 make string translatable 2014-06-02 12:53:56 +02:00
Arthur Schiwon
249e42c4cd enable group filtering 2014-06-02 12:53:55 +02:00
raghunayyar
d3cee79b5a Enhancement: Adding Group on the Sidebar updates the multiselect on the Userlist. 2014-06-02 12:53:55 +02:00
Arthur Schiwon
a4cfa95545 restructure group.js and put functions to object, also add group list sorting after adding. 2014-06-02 12:53:54 +02:00
Arthur Schiwon
faab6c095c move group-click initialization to groups.js and only react on elements with a data-gid attribute given 2014-06-02 12:53:54 +02:00
raghunayyar
65aa20433c Enhancement : Toggle Add Group on Click, @blizzz have a look here. 2014-06-02 12:53:53 +02:00
Arthur Schiwon
17e640af22 set admin gid to Admins filter. I.e. hard-coding the admin group, but this is OC reality atm - other admin groups are not possible. 2014-06-02 12:53:53 +02:00
Arthur Schiwon
b3221f0e4e LDAP: adjust main template according to PR 7291 2014-06-02 12:53:53 +02:00
raghunayyar
eed108ec1b Enhancement : The edit icon looks like files app rename fileaction. 2014-06-02 12:53:53 +02:00
raghunayyar
ceb6c4df04 Enhancement: Makes Edit and Delete Icons Tapable, 44px by 44px dimensions. 2014-06-02 12:53:53 +02:00
Arthur Schiwon
f7903e92be do not forget to pass parameters to subtemplate 2014-06-02 12:53:52 +02:00
raghunayyar
63645461f0 Fixes Markup in templates. 2014-06-02 12:53:52 +02:00
raghunayyar
9ba4a76214 resolving conflict when picking 8b81a0b 2014-06-02 12:53:52 +02:00
Arthur Schiwon
bf88bd108e do not show 0 when administered group has no users 2014-06-02 12:53:52 +02:00
Arthur Schiwon
7d3ac194e3 do not show 0 when group has no users 2014-06-02 12:53:52 +02:00
raghunayyar
e681e1eec0 Initial Commit: Takes Quota Settings inside Navigation, Changes Create -> Add Group 2014-06-02 12:53:51 +02:00
Arthur Schiwon
3a92d48104 reduce template function calls 2014-06-02 12:53:51 +02:00
Arthur Schiwon
57ffaddf26 add Last Login column 2014-06-02 12:53:51 +02:00
raghunayyar
970f899726 Initial Commit : Changes Storage to Quota, Implements GroupName editing. 2014-06-02 12:52:53 +02:00
Arthur Schiwon
dc28f58951 add Storage Location col 2014-06-02 12:52:53 +02:00
raghunayyar
dc1523355b Adds Admin to Grouplist Everywhere 2014-06-02 12:52:53 +02:00
raghunayyar
4a30665ec3 Removes Delete Icon from Admin Group. 2014-06-02 12:52:53 +02:00
raghunayyar
8e4bbe8297 Adds class button to fix font sizes. 2014-06-02 12:52:53 +02:00
raghunayyar
8e34316e04 Fixes User Search by username. 2014-06-02 12:52:53 +02:00
raghunayyar
c7af9cd6dd Initial Commit : User Search, Fixes Typos 2014-06-02 12:52:53 +02:00
raghunayyar
71160ff853 Deletes Group Clientside Effectively. 2014-06-02 12:52:52 +02:00
raghunayyar
ce46cd3680 Implements Group Creation from Sidebar 2014-06-02 12:52:52 +02:00
raghunayyar
b506388b75 Reverts last commit, implements user in group count. 2014-06-02 12:52:52 +02:00
raghunayyar
43ced8c6c7 Splits Controls overlap in files and users. 2014-06-02 12:52:52 +02:00
raghunayyar
0663d954e6 resolve conflicts while picking c0fb623 2014-06-02 12:52:52 +02:00
Georg Ehrke
020255b4e5 add button for properly uninstalling apps 2014-05-31 17:50:39 +02:00
Thomas Müller
555b9cc245 Merge pull request #7614 from owncloud/test_annotations_working 
Check if ReflectionMethod::getDocComment is working
 2014-05-30 22:17:30 +02:00
Lukas Reschke
5cd0fd2559 Merge pull request #8700 from owncloud/design-smallfixes 
Design detail fixes
 2014-05-29 21:54:15 +02:00
Volkan Gezer
c01f196f72 make reshare settings foldable 2014-05-29 21:14:20 +02:00
Volkan Gezer
1a22478446 reverts 188c543 and translates only mail 2014-05-27 12:58:46 +02:00
Volkan Gezer
188c5435d8 unwrapped strings fix 2014-05-27 03:48:24 +02:00
Jan-Christoph Borchardt
c6c4bb62e1 move saved notification for mail server, so it's smaller 2014-05-23 18:09:45 +02:00
Bjoern Schiessle
12338e0ef0 allow admin to disable sharing for specific groups of users 2014-05-22 10:43:44 +02:00
Thomas Müller
30f1ec2521 Merge branch 'master' into test_annotations_working 
Conflicts:
	lib/private/util.php
 2014-05-19 21:42:30 +02:00
Björn Schießle
b52cb8f557 Merge pull request #8604 from owncloud/sharing_encforce_password 
allow admin to enforce passwords for public link shares
 2014-05-16 12:23:01 -04:00
Bjoern Schiessle
b6e14af861 allow admin to enforce passwords for public link shares 2014-05-16 17:41:09 +02:00
Vincent Petry
9ccb3279dd Added app navigation for files app 
- Added links to trashbin and shared dir
- Moved "WebDAV" settings block to the app nav's settings section
- Added sidebar support in trashbin app as well
 2014-05-15 17:51:04 +02:00
Björn Schießle
dab3cb65cf Merge pull request #8522 from owncloud/sharing_ux_improvements 
Sharing ux improvements
 2014-05-14 12:54:27 -04:00
Bjoern Schiessle
a9ac11718e backup the encryption key after the encryption was disabled so that the user 
can restore them if needed
 2014-05-13 12:35:25 +02:00
Bjoern Schiessle
ec045b251c hide input field if default expire date isn't activated 2014-05-13 11:28:25 +02:00
Thomas Müller
b7981910f7 adopt new settings style 2014-05-09 22:53:01 +02:00
Thomas Tanghus
287c8981bc Check if ReflectionMethod::getDocComment is working 2014-05-09 22:44:55 +02:00
Volkan Gezer
ad1265da13 typo fix, by translators on transifex 2014-04-25 16:26:30 +02:00
Bjoern Schiessle
6650be9913 add setting to set default expire date 2014-04-24 13:34:31 +02:00
Thomas Müller
54476c468c fix spelling 'Allow user ...' -> 'Allow users ...' 2014-04-22 09:34:08 +02:00
Lukas Reschke
b2f8e34388 Remove uneeded file 
This file seems not to be actually used anywhere.
 2014-04-04 22:14:51 +02:00
Morris Jobke
bd2cf6ee29 Merge pull request #7817 from owncloud/app-navigation-for-apps 
Makes #app-navigation a part of app management.
 2014-04-01 21:38:43 +02:00
Jan-Christoph Borchardt
69be5bdbd8 replace personalblock fieldset with section div in admin and personal settings 2014-03-27 17:00:47 +01:00
kondou
dda7129a24 Merge branch 'master' of https://github.com/owncloud/core into last_cron_log 2014-03-21 20:23:31 +01:00
raghunayyar
59d1ee565e Makes #app-navigation a part of app management. 2014-03-20 13:34:50 +05:30
Vincent Petry
b75ca9fb50 Display admin option for public upload with encryption enabled 
Now that public upload works with encryption, the admin option to toggle
it must be made visible.
 2014-03-18 11:28:56 +01:00
Vincent Petry
5fcfb2ef84 Merge pull request #7564 from owncloud/issue/7559 
Hide QMail when not selected and hide SendMail when not available on the server
 2014-03-12 18:32:38 +01:00
kondou
556c6eca23 Use OC_Util::formatDate() 2014-03-12 17:53:39 +01:00
kondou
c5440fa133 Move cron status to the right of the heading 2014-03-12 17:29:26 +01:00
kondou
547b563464 Log last cron execution 
Fixes #2012
 2014-03-12 15:20:51 +01:00
Thomas Müller
5713b0dedb Authentification -> Authentication 2014-03-11 16:24:50 +01:00
Joas Schilling
0285d5b6e2 Hide QMail when not selected and hide sendmail when not available on the server 
Fix #7559
 2014-03-05 14:53:20 +01:00
Joas Schilling
d583d61b69 Merge pull request #7412 from owncloud/issue/7175 
Add button to send a test mail after changing the email settings
 2014-03-05 13:18:41 +01:00
Joas Schilling
5b8cde48dc Add button to send a test mail after changing the email settings 
Fix #7175
 2014-03-05 10:01:34 +01:00
Morris Jobke
af2c2b3a16 update wording of email field 2014-03-04 10:22:54 +01:00
Jan-Christoph Borchardt
e78da036c1 profile image: relabel technical 'Abort' to more widely used 'Cancel' 2014-02-28 10:09:34 +01:00
Jan-Christoph Borchardt
d9a153dbe9 Merge pull request #7174 from owncloud/issue/7166 
Add option to change email settings in admin section
 2014-02-26 14:41:07 +01:00
Joas Schilling
9847912257 Remove unused variables, add doc blocks and break lines 
Fix #7166
 2014-02-26 13:10:46 +01:00
Joas Schilling
331bd527a7 Hide SMTP options based on selected send mode 
Fix #7166
 2014-02-26 10:30:22 +01:00
Lukas Reschke
16262e3fd2 Move isadmin to template and rename it to oc_isadmin 2014-02-19 17:56:12 +01:00
Joas Schilling
8387cd8ae3 Add option to change email settings in admin section 
Fix issue #7166
 2014-02-18 14:26:03 +01:00
Jan-Christoph Borchardt
dafa8fc37e do not autocapitalize fields on mobile, fix user name input. Also disable autocorrect and specify autocomplete 2014-02-18 10:58:00 +01:00
Jan-Christoph Borchardt
61aa6ead83 Merge pull request #6490 from owncloud/theming-for-appstemplate 
do not show 'Add app' and 'More apps' for themed ownCloud
 2014-02-05 16:49:07 +01:00
Morris Jobke
d182b4f59f Merge pull request #6927 from owncloud/enc_dont_reload_page_on_decrypt 
remove the form, it isn't needed here
 2014-01-27 04:30:06 -08:00
Jan-Christoph Borchardt
150d3856a0 prevent autofill for password change settings, prevent leak of existing password, fix #6552 2014-01-24 18:58:56 +01:00
Bjoern Schiessle
2a3cb7ac5b remove the form, it isn't needed here 2014-01-24 11:41:24 +01:00
Bjoern Schiessle
80d871ab1e added website field 2014-01-17 16:35:48 +01:00
Bjoern Schiessle
e2de3b8337 distinguish app links from doc links 2014-01-17 16:08:32 +01:00