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

136 commits

Author SHA1 Message Date
Sam Tuke
a8c0e3612c Removed call to depreciated isUserVerified() 2013-02-06 16:01:43 +00:00
Björn Schießle
e68d0c7398 make strings translatable 2013-02-06 11:55:19 +01:00
Björn Schießle
9d73e7eb1e let the user change his display name, if supported by the back-end 2013-02-06 11:38:03 +01:00
Thomas Mueller
8a662a6c74 Cleanup string - easier for translators 2013-01-31 10:34:54 +01:00
Frank Karlitschek
5e422dea61 fix typo 2013-01-30 14:52:35 +01:00
Frank Karlitschek
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
Frank Karlitschek
389c4e8415 mark recommended apps. server part not yet fully implemented 2013-01-30 13:39:53 +01:00
Björn Schießle
afad6e95db check permissions before changing the display name 2013-01-29 22:20:15 +01:00
Björn Schießle
27edbfdf56 added missing changedisplayname.php 2013-01-29 21:52:03 +01:00
Frank Karlitschek
a27f92a17a we are getting closer. updating is not working yet. 2013-01-21 20:40:23 +01:00
Bart Visscher
a8f963d9cf Spaces to tabs 2013-01-16 18:09:16 +01:00
Lukas Reschke
eab6d7eb23 Enhanced auth is totally unmaintained and broken 
Let's remove it, it's also not secure anymore with the introduction of
our API etc...
(And doesn't work with ldap etc…)
 2013-01-14 21:39:49 +01:00
Lukas Reschke
0810d80f8a Add a closing ) 
Thanks Jenkins!
 2013-01-14 20:10:10 +01:00
Lukas Reschke
fef73d96d1 CP fail 2013-01-14 19:51:16 +01:00
Lukas Reschke
31b1a73e1f Check if user is admin - bool 
There was no "isAdminUser()" function which returned bool. This is
irritiating as there were a loooooooot of places in the code which
checked this itself with `OC_Group::inGroup($uid, 'admin)` - why not
use a function for this?
(Especially if you consider that we might change the group name in the
future, which would lead to problems then)

Additionally, @Raydiation needed such a method for his AppFramework :)
 2013-01-14 19:45:17 +01:00
Bart Visscher
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
Lukas Reschke
1f6eb68ef9 Merge pull request #1150 from owncloud/EnableSSL-AdminMenu 
Add security section to admin settings to enable the HTTPS enforcement
 2013-01-11 09:21:08 -08:00
Lukas Reschke
1631ee4d60 Move to apps repo 
This belongs to the apps repo.
 2013-01-11 17:22:15 +01:00
Lukas Reschke
9b9f5b1a8a Remove setContentTypeHeader() 
`OC_JSON::success` and `OC_JSON::error` are calling
`OC_JSON::encodedPrint`, which already sets these headers. So this two
calls are uneeded duplicates.
 2013-01-11 17:09:36 +01:00
Lukas Reschke
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
Bart Visscher
2ef2dc4dda Fix "There must be a single space between the closing parenthesis and the opening brace" 2012-12-15 00:43:46 +01:00
Bart Visscher
a3f18d4b5a Merge pull request #603 from owncloud/store_plain_groupname 
Group name doesn't need to be sanitized before storing it in the database
 2012-11-30 04:13:36 -08:00
Georg Ehrke
ab13702770 make some checks server-side 2012-11-28 18:15:40 +01:00
Bart Visscher
80d1037e42 Group name does't need to be sanitized before storing it in the database 
It should only be sanitized before display
 2012-11-27 20:22:45 +01:00
Bart Visscher
59627367ae Better check and handling of user creation 2012-11-14 21:52:28 +01:00
Diederik de Haas
1b7c0c2b62 Fixed new checkstyle issues in ocs.php from build #1341. 2012-11-10 01:02:47 +01:00
Frank Karlitschek
f799e48f7e fix the broken image path on the apps page 2012-11-08 13:34:00 +01:00
Felix Moeller
a4b2ea586d Style: Remove all the dangling white spaces 2012-11-04 22:16:04 +01:00
Felix Moeller
27ab0357ae Checkstyle: Fix last six NewlineBeforeOpenBrace 2012-11-04 18:36:16 +01:00
Felix Moeller
30d7993e01 Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
Felix Moeller
afadf93d31 Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
Bart Visscher
1bdd0c949b Move and fix app setting navigation detect 2012-10-29 15:04:55 +01:00
Bart Visscher
6081bfa2bc Merge branch 'master' into routing 
Conflicts:
	lib/search/provider/file.php
	settings/ajax/changepassword.php
	settings/settings.php
 2012-10-17 16:38:11 +02:00
Lukas Reschke
f4142bd2a8 Move isUserVerified to OC_Util 2012-10-16 00:47:38 +02:00
Lukas Reschke
c404148f9a Password check for admins 2012-10-16 00:47:38 +02:00
Lukas Reschke
c83a2a5517 Correct check for admin 2012-10-16 00:47:38 +02:00
Lukas Reschke
e6c9f5d9f4 Verify passwords for admins 2012-10-16 00:01:48 +02:00
Lukas Reschke
e3054b6201 Revert "Verify user login before changing the password reset mail" 
This reverts commit 9aa9110fd9.
 2012-10-15 23:50:12 +02:00
Lukas Reschke
f475ed5cc1 Revert "Remove old password check from changepassword and use verifyUser instead" 
This reverts commit e6b8153865.
 2012-10-15 23:49:49 +02:00
Lukas Reschke
9aa9110fd9 Verify user login before changing the password reset mail 2012-10-15 17:44:44 +02:00
Lukas Reschke
e6b8153865 Remove old password check from changepassword and use verifyUser instead 2012-10-15 17:44:44 +02:00
Lukas Reschke
6b39b80648 Change auth checks 2012-10-15 17:44:44 +02:00
Lukas Reschke
0b42d70259 Unneeded double check 2012-10-15 16:08:39 +03:00
Lukas Reschke
2f4b1b0e4c Disallow users to delete their own accounts 2012-10-10 18:05:34 +02:00
Bart Visscher
bb136b9adf Make the settings ajax calls use the router 2012-10-02 18:00:23 +02:00
Sam Tuke
dc0dc56d48 Merge branch 'master' of https://github.com/owncloud/core 2012-09-18 14:36:08 +01:00
Sam Tuke
b765e883f3 Fixed bug with duplicate entries for installed 3rd party apps in settings->apps 
Added method getAppstoreApps to OC_App
Added minor documentation
 2012-09-18 14:35:27 +01:00
Thomas Müller
f85b709fae Use correct translation file 
every translation within the sub folder 'settings' need to use 'settings' on OC_L10N::get
 2012-09-17 15:00:22 +03:00
Thomas Müller
1fd3c5fbc0 $l was undefined 2012-09-17 14:50:17 +03:00
Jörn Friedrich Dreyer
62d8202d59 return a message when app could not be enabled 2012-09-12 12:02:39 +02:00