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

665 commits

Author SHA1 Message Date
Björn Schießle
4b7b092008 rename Name to Login Name 2013-01-28 17:05:20 +01:00
Björn Schießle
f3a99f4869 show display name in input field 2013-01-28 17:01:37 +01:00
Björn Schießle
e0f2ed2757 interface and API to change display names 2013-01-28 14:09:11 +01:00
Björn Schießle
022a7b13b8 prepare user table to show and edit display names 2013-01-28 13:12:44 +01:00
Björn Schießle
19024de988 typo fixed 2013-01-25 17:44:40 +01:00
Björn Schießle
64e853394c compare the correct uids 2013-01-25 12:46:32 +01:00
Björn Schießle
4271430e60 get all display names from users in a given group 2013-01-25 11:48:03 +01:00
Björn Schießle
9bb8e05839 get all display names 2013-01-25 11:05:00 +01:00
Jenkins for ownCloud
c986dbe573 [tx-robot] updated from transifex 2013-01-23 00:06:18 +01:00
Jenkins for ownCloud
aede26d996 [tx-robot] updated from transifex 2013-01-21 00:05:34 +01:00
Jenkins for ownCloud
ebc0c4b85b [tx-robot] updated from transifex 2013-01-20 00:06:40 +01:00
Jenkins for ownCloud
824fcf6624 [tx-robot] updated from transifex 2013-01-18 00:04:36 +01:00
Bart Visscher
a8f963d9cf Spaces to tabs 2013-01-16 18:09:16 +01:00
Daniel Molkentin
65ef780ed6 Fix regression caused by 31b1a73e1f 2013-01-15 22:44:40 +01:00
Bart Visscher
0da06187f6 Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-master 
Fixing unused and undefined in master
 2013-01-15 07:45:51 -08:00
Jenkins for ownCloud
fdd667a83c [tx-robot] updated from transifex 2013-01-15 00:05:10 +01:00
Thomas Mueller
388bb6a5e1 Merge branch 'master' into fixing-unused-and-undefined-in-master 2013-01-14 23:41:34 +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
Jenkins for ownCloud
981fd5e424 [tx-robot] updated from transifex 2013-01-13 00:08:40 +01:00
Jenkins for ownCloud
ad64ce189d [tx-robot] updated from transifex 2013-01-12 00:10:58 +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
954b559d48 Merge pull request #994 from owncloud/enhanced_multiSelect 
Enhanced multiSelect
 2013-01-11 10:23:04 -08: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
e11b650d2e Remove OpenID from the router 2013-01-11 17:24:10 +01: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
ffbf273c9a Removed uneeded HTML tag 2013-01-11 14:43:56 +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
Jenkins for ownCloud
d03dce1283 [tx-robot] updated from transifex 2013-01-11 00:06:14 +01:00
Jenkins for ownCloud
912050afa0 [tx-robot] updated from transifex 2013-01-10 00:05:53 +01:00
Jenkins for ownCloud
533f0e8e25 [tx-robot] updated from transifex 2013-01-09 00:05:49 +01:00
Jenkins for ownCloud
b69328e1d1 [tx-robot] updated from transifex 2013-01-08 00:31:36 +01:00
Thomas Mueller
e475c26f1a fixing <input> tag 2013-01-07 21:23:14 +01:00
Michael Gapczynski
0b13b41189 Merge pull request #1053 from owncloud/ocs_api 
External API for ownCloud based on OCS
 2013-01-04 17:18:58 -08:00
Jenkins for ownCloud
90f39cd703 [tx-robot] updated from transifex 2013-01-04 13:23:31 +01:00
Jenkins for ownCloud
3bcdd8c900 [tx-robot] updated from transifex 2013-01-03 00:05:19 +01:00
Jörn Friedrich Dreyer
ed06070741 omit type attribute in script tag to use fallback (text/javascript) 2013-01-02 12:13:07 +01:00
Jenkins for ownCloud
516464ba94 [tx-robot] updated from transifex 2013-01-02 00:05:14 +01:00
Jenkins for ownCloud
c6064a542c [tx-robot] updated from transifex 2013-01-01 00:04:42 +01:00
Tom Needham
6eb194b702 Merge branch 'master' into ocs_api 
Conflicts:
	l10n/templates/core.pot
	l10n/templates/files.pot
	l10n/templates/files_encryption.pot
	l10n/templates/files_external.pot
	l10n/templates/files_sharing.pot
	l10n/templates/files_versions.pot
	l10n/templates/lib.pot
	l10n/templates/settings.pot
	l10n/templates/user_ldap.pot
	l10n/templates/user_webdavauth.pot
 2012-12-31 15:47:15 +00:00
Jenkins for ownCloud
329bddab48 [tx-robot] updated from transifex 2012-12-31 00:05:31 +01:00
Jenkins for ownCloud
66e57f5fb1 [tx-robot] updated from transifex 2012-12-30 00:05:52 +01:00
Thomas Müller
36da34e5f6 Merge pull request #902 from owncloud/storage-wording 
Storage wording
 2012-12-28 23:19:52 -08:00
Michael Gapczynski
f922f836ce Change old variable name $default_quota to $defaultQuota 2012-12-28 19:14:33 -05:00
Jenkins for ownCloud
e9c51b319e [tx-robot] updated from transifex 2012-12-28 00:20:34 +01:00
Jenkins for ownCloud
27f9ea2abb [tx-robot] updated from transifex 2012-12-27 00:05:17 +01:00
Jenkins for ownCloud
b7257b2524 [tx-robot] updated from transifex 2012-12-26 00:12:10 +01:00