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
4900ad9119
update type hint in PHPDoc
2014-03-25 22:59:42 +01:00
32b29c9d73
Merge branch 'master' into fix-7307
...
Conflicts:
core/js/router.js
settings/js/admin.js
2014-03-06 00:15:08 +01:00
5b8cde48dc
Add button to send a test mail after changing the email settings
...
Fix #7175
2014-03-05 10:01:34 +01:00
1291303c5a
Replace OC.Router.generate() with OC.generateUrl()
2014-03-02 22:30:24 +01:00
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
16262e3fd2
Move isadmin to template and rename it to oc_isadmin
2014-02-19 17:56:12 +01:00
8387cd8ae3
Add option to change email settings in admin section
...
Fix issue #7166
2014-02-18 14:26:03 +01:00
18da2f9cf7
Improve changepassword route naming
2013-09-13 17:07:23 +02:00
306a8681c5
Move ajax/changepassword to changepassword/controller to use autoloading
2013-09-13 17:03:13 +02:00
f6faec0e0b
Use a controller instead of two files for changepassword.php
2013-09-11 16:35:13 +02:00
a21376480d
Split personal and user-mgmt password change logic
2013-09-06 08:05:07 +02:00
0a3d662dd0
register decrypt all route
2013-07-29 13:39:37 +02:00
bb75dfc021
Whitespace fixes
2013-02-22 19:05:36 +01:00
83f161d3f9
Style cleanup settings
2013-02-21 23:47:56 +01:00
66cab77b6d
merge master
...
Merge branch 'master' into improved_appsmanagement
Conflicts:
settings/apps.php
settings/templates/apps.php
2013-01-30 14:36:17 +01:00
250c565d2b
Merge pull request #1360 from owncloud/display_name
...
introduction of display names
2013-01-29 14:05:54 -08:00
e0f2ed2757
interface and API to change display names
2013-01-28 14:09:11 +01:00
d2383338de
External JSON for the Apps
2013-01-21 22:18:42 +01:00
3ed7d5d521
Move isadmin to external file
2013-01-21 21:25:38 +01:00
a27f92a17a
we are getting closer. updating is not working yet.
2013-01-21 20:40:23 +01:00
b608675938
Merge pull request #1157 owncloud/move-OpenID
...
Move openid.php to apps repo
Conflicts:
settings/routes.php
2013-01-11 22:57:40 +01:00
e11b650d2e
Remove OpenID from the router
2013-01-11 17:24:10 +01:00
466cdab680
Add security section to admin menu
...
Currently it only allows the admin to enable or disable the HTTPS
enforcement, but in the future it could be expanded to further options.
The HTTPS enforcement only allows the admin to enforce it, if he is
connected via HTTPS. (To prevent admins to enable it without a proper
SSL setup)
2013-01-11 14:18:51 +01:00
9318a9566a
Merge pull request #136 from scambra/users-fixes
...
fix settings' routes
2012-10-29 15:31:37 -07:00
1bdd0c949b
Move and fix app setting navigation detect
2012-10-29 15:04:55 +01:00
1f0bc1713f
fix settings routes
2012-10-29 14:50:03 +01:00
167e9c1cc0
Fix route name
2012-10-05 09:41:27 +02:00
bb136b9adf
Make the settings ajax calls use the router
2012-10-02 18:00:23 +02:00
Bjoern Schiessle
Thomas Müller
Joas Schilling
Jan-Christoph Borchardt
Lukas Reschke
kondou
Bart Visscher
Frank Karlitschek
Bart Visscher
scambra