Commit Graph

1631 Commits

Author SHA1 Message Date
Jan-Christoph Borchardt 4faa424157 Merge pull request #11480 from owncloud/ldap-enterkey-deletefix
Prevent button click when enter key is pressed in LDAP wizard
2014-10-10 12:37:44 +02:00
Arthur Schiwon f31d4caf57 coding style, no effective code changes 2014-10-10 11:49:45 +02:00
Jenkins for ownCloud 2cc26c9022 [tx-robot] updated from transifex 2014-10-10 01:55:10 -04:00
Arthur Schiwon 6f83b537fe remove debug output 2014-10-09 17:56:27 +02:00
Arthur Schiwon 2cf0102797 fix triggering of group update counts. improves the basic code which is also responsible for user counts. i did not find regressions, please doublecheck 2014-10-09 17:17:50 +02:00
Lukas Reschke 16cd749065 Add support for keys in the info.xml
This allows to have links to different doc base URLs

a.
2014-10-09 15:48:30 +02:00
Vincent Petry 59f9107dd9 Log warning when no uid was found for user
In some incomplete setups (like mine) it can happen that the uid
attribute of users is missing.

To be able to find out that something is wrong, a debug message is now
logged when it has not been found.
2014-10-09 14:58:53 +02:00
blizzz cc717c27d6 Merge pull request #10527 from owncloud/fix-10526
properly cancel a Paginated Results operation in order to avoid protocol...
2014-10-09 12:40:13 +02:00
Arthur Schiwon 9f036e776e bump version 2014-10-09 11:15:56 +02:00
Vincent Petry f7fc0067e0 Revert "[WIP] fix retrieval of group members and cache group members" 2014-10-09 11:06:48 +02:00
Vincent Petry 3791de64ed Merge pull request #11161 from owncloud/fix-ldap-ingroup-for-9225
fix retrieval of group members and cache group members
2014-10-09 10:19:58 +02:00
MTRichards 48980fbc46 Updated info.xml with description
Updated the description of the app for the app panel.
2014-10-08 20:44:09 -04:00
Arthur Schiwon 02985c9ec5 smaller corrections to make scruitinizer happier, no effective changes 2014-10-08 16:20:52 +02:00
Vincent Petry bb424802c8 Prevent button click when enter key is pressed in LDAP wizard
Pressing enter in the LDAP wizard will trigger a click on the first
button. In the main page it would trigger the delete dialog, which is
quite inconvenient.

Added a type attribute to suppress this behavior.
2014-10-08 15:09:02 +02:00
Arthur Schiwon ab3535855f more beautiful white spaces 2014-10-08 15:04:29 +02:00
Arthur Schiwon 39aa5868ac rename internal var name to avoid collision 2014-10-08 14:55:47 +02:00
Arthur Schiwon 29b0e9bfbc confirmation before switching to assisted mode when admin is experienced 2014-10-08 13:29:13 +02:00
Arthur Schiwon 7ba787e649 user and group counts are only upated on demand in experienced mode 2014-10-08 13:06:18 +02:00
Arthur Schiwon b6fc7f5599 Objectlasses, Groups and Attributes are now loaded only in assisted mode and only once 2014-10-08 11:38:39 +02:00
Arthur Schiwon 3ff4c8e3fc sets user filters to raw mode when marking user as experienced 2014-10-07 17:28:09 +02:00
Arthur Schiwon efd940133b must be empty not auto 2014-10-07 16:45:22 +02:00
Arthur Schiwon 67292a5345 add checkbox for experienced users to server tab 2014-10-07 16:43:58 +02:00
Jenkins for ownCloud 6e991a53ec [tx-robot] updated from transifex 2014-10-06 01:54:57 -04:00
Jenkins for ownCloud 537f046e66 [tx-robot] updated from transifex 2014-10-02 01:54:48 -04:00
Arthur Schiwon 3b3ad0bc4f fix changed variable name 2014-10-01 21:44:36 +02:00
Arthur Schiwon 6c502e11f8 make scrutinizer happy, very minor changes 2014-10-01 11:55:53 +02:00
Arthur Schiwon f9e085b020 init a new paged search on read operations to satisfy OpenLDAP 2014-09-30 17:00:25 +02:00
Arthur Schiwon 2b9696efae abandond paged search only if PHP supports them 2014-09-30 13:13:52 +02:00
Arthur Schiwon 53ec32807a abandon ongoing paged search before starting a new one 2014-09-30 12:42:37 +02:00
Arthur Schiwon 9a63693227 properly cancel a Paginated Results operation in order to avoid protocol errors, fixes #10526 2014-09-30 12:42:37 +02:00
Jenkins for ownCloud 5292a14cdf [tx-robot] updated from transifex 2014-09-30 01:55:11 -04:00
Martin Konrad fd9b79b218 Add a CLI command that deletes an LDAP config
With this change LDAP configurations can be managed completely from
the command line.
2014-09-30 03:23:00 +02:00
Lukas Reschke b13b86502f Merge pull request #11347 from mark0n/create_empty_config
Add a CLI command that creates an empty LDAP config
2014-09-29 21:42:07 +02:00
Martin Konrad b57960aeec Add a CLI command that creates an empty LDAP config
This is needed to configure the user_ldap app without using the
wizard (e.g. using tools like Puppet).
2014-09-29 00:21:20 -04:00
Arthur Schiwon 6041ae6224 dn needs to be fetched to be able to detect memberOf support 2014-09-26 15:36:49 +02:00
Jenkins for ownCloud 1631937990 [tx-robot] updated from transifex 2014-09-26 01:54:59 -04:00
Jenkins for ownCloud f46e49529f [tx-robot] updated from transifex 2014-09-25 01:55:32 -04:00
Jenkins for ownCloud a1c39f74b7 [tx-robot] updated from transifex 2014-09-21 01:54:29 -04:00
Jenkins for ownCloud e55c4bb807 [tx-robot] updated from transifex 2014-09-20 01:54:34 -04:00
Jenkins for ownCloud 786312d0e8 [tx-robot] updated from transifex 2014-09-19 01:55:44 -04:00
Volkan Gezer ccaea93d6b update encryption doc link
I don't know how we missed to update this :/

update ldap doc link
2014-09-18 18:14:51 +02:00
Arthur Schiwon 4ed926b954 fix retrievel of group members and cache group members 2014-09-18 17:12:35 +02:00
Lukas Reschke 45b17207cc Merge pull request #10745 from owncloud/fix-10708-doctrine
Use Doctrine Platform to generate SQL query for table truncation.
2014-09-16 23:56:20 +02:00
Thomas Müller 7e2bff8545 adding unit test to truncate the table 2014-09-16 16:17:25 +02:00
Lukas Reschke 627252fe81 Merge pull request #11060 from owncloud/rmobslang
remove obsolete language files
2014-09-15 17:31:10 +02:00
Jenkins for ownCloud 8d647fa267 [tx-robot] updated from transifex 2014-09-15 01:54:26 -04:00
Volkan Gezer 5d1fa60e0d remove obsolete language files 2014-09-13 15:29:11 +02:00
Jenkins for ownCloud 0dcd8079dc [tx-robot] updated from transifex 2014-09-11 01:54:41 -04:00
Jenkins for ownCloud c119a9fd32 [tx-robot] updated from transifex 2014-09-10 01:54:54 -04:00
Jenkins for ownCloud 317e6d03b4 [tx-robot] updated from transifex 2014-09-09 01:55:47 -04:00
Lukas Reschke bca57b4b28 Merge pull request #10890 from owncloud/fix-10888
if only one attribute is requested, the returned array has 0 as key inst...
2014-09-08 16:39:48 +02:00
Jenkins for ownCloud 9fc45016f9 [tx-robot] updated from transifex 2014-09-07 01:54:42 -04:00
Arthur Schiwon 3c9668f605 if only one attribute is requested, the returned array has 0 as key instead of attribute name. fixes #10888 2014-09-05 14:05:37 +02:00
Jenkins for ownCloud 689bbbe937 [tx-robot] updated from transifex 2014-09-02 01:56:07 -04:00
Jenkins for ownCloud e6e04bde4f [tx-robot] updated from transifex 2014-09-01 01:59:19 -04:00
Robin Appelman d0266c0bf8 Use public api for getting l10n 2014-08-31 10:08:22 +02:00
Jenkins for ownCloud 23137f4798 [tx-robot] updated from transifex 2014-08-31 01:56:20 -04:00
Andreas Fischer 7458e21f2c Use Doctrine Platform to generate SQL query for table truncation. 2014-08-29 20:53:51 +02:00
Arthur Schiwon aa0ddf21b5 adjust static method vars as well 2014-08-29 11:14:36 +02:00
Arthur Schiwon 371cab367d trigger email detection by Wizard upon any user filter filter change. before it happenend only upon user automatic list filter creation, but not on manual editing 2014-08-29 11:14:36 +02:00
Arthur Schiwon 34761dabb1 write log message, if original value was changed 2014-08-29 11:14:36 +02:00
Arthur Schiwon f47a4a8c15 add unit test for mail detection 2014-08-29 11:14:35 +02:00
Arthur Schiwon 441c600c90 remove Access as hard dependency, inject it instead 2014-08-29 11:14:16 +02:00
Arthur Schiwon baa49cd58a Wizad: email attribute detection 2014-08-29 11:14:16 +02:00
Jenkins for ownCloud 359590d576 [tx-robot] updated from transifex 2014-08-29 01:56:59 -04:00
Arthur Schiwon 1c0cc6c7bc fix wizard test, adjust to changed parameters of the tested method, introduced by 9caa354cfc 2014-08-28 11:53:40 +02:00
Arthur Schiwon dbd51d15e1 Port of #8623
set result entry identifier earlier, i.e. before a continue for the same level can happen. otherwise  will always get the same value and we end up in an infinite loop

add unit test to make sure the infinite loop never comes back

Conflicts:
	apps/user_ldap/tests/wizard.php
2014-08-28 11:52:33 +02:00
Jenkins for ownCloud 1b342a70d6 [tx-robot] updated from transifex 2014-08-28 01:56:36 -04:00
Jenkins for ownCloud 2740908a5b [tx-robot] updated from transifex 2014-08-27 01:54:40 -04:00
Jenkins for ownCloud c733842a9a [tx-robot] updated from transifex 2014-08-26 01:56:33 -04:00
Jenkins for ownCloud 70db496b58 [tx-robot] updated from transifex 2014-08-24 01:56:10 -04:00
Jenkins for ownCloud 8c94153d3e [tx-robot] updated from transifex 2014-08-22 01:56:25 -04:00
blizzz 52d5429768 Merge pull request #10522 from owncloud/removeLoadAppScript
Remove loadAppScriptFile
2014-08-21 19:59:31 +02:00
Jenkins for ownCloud ea8c0bce08 [tx-robot] updated from transifex 2014-08-20 01:56:58 -04:00
Lukas Reschke 381340c9b2 Add routing to user_ldap 2014-08-19 15:26:15 +02:00
Jenkins for ownCloud 77cfddff0f [tx-robot] updated from transifex 2014-08-19 01:57:09 -04:00
blizzz 8f7676c762 Merge pull request #10340 from owncloud/fix-9887
better check whether string resembles a DN, fixes #9887
2014-08-18 19:24:41 +02:00
Arthur Schiwon 97fd39e983 unify tests 2014-08-18 16:55:08 +02:00
Jenkins for ownCloud 4dd07f572c [tx-robot] updated from transifex 2014-08-18 01:56:30 -04:00
Lukas Reschke 69e0e23789 Merge pull request #10407 from owncloud/rm-obsolete-japanese
remove obsolete japanese lang code
2014-08-17 19:07:14 +02:00
Jenkins for ownCloud b1415fc4fc [tx-robot] updated from transifex 2014-08-17 01:56:22 -04:00
Jenkins for ownCloud c132dd6357 [tx-robot] updated from transifex 2014-08-16 01:56:44 -04:00
Jenkins for ownCloud 93f5e90c9f [tx-robot] updated from transifex 2014-08-15 01:56:14 -04:00
Volkan Gezer d1f483c9ed remove obsolete japanese lang code 2014-08-13 22:35:08 +02:00
Jenkins for ownCloud 609a52ebe2 [tx-robot] updated from transifex 2014-08-13 01:54:44 -04:00
Arthur Schiwon eb7d70fc39 adjust login test to code changes 2014-08-12 16:13:17 +02:00
blizzz c46b60e822 Merge pull request #9848 from dupondje/master
Fix memberOf detection. Fixes: #9835
2014-08-11 16:58:30 +02:00
Arthur Schiwon fc6793f2ae better check whether string resembles a DN, fixes #9887 2014-08-11 16:40:41 +02:00
Jean-Louis Dupond e46fc7a18a Fix initializing in #9848 2014-08-11 13:50:13 +02:00
Jean-Louis Dupond fc662917e7 Fix remarks in #9848 2014-08-11 09:15:56 +02:00
Arthur Schiwon 2676e681e9 ldap_ prefix will be added in invokeLDAPMethod(), having it would lead to a unexisting function, fixes #9829 2014-08-07 17:15:36 +02:00
Arthur Schiwon 7fd7706542 Hack to avoid Agent DN + Password being overwritten by some ugly browsers with stored site credentials
Conflicts:
	apps/user_ldap/css/settings.css
2014-08-05 12:14:29 +02:00
Jenkins for ownCloud c1562057e8 [tx-robot] updated from transifex 2014-07-31 01:55:01 -04:00
Jenkins for ownCloud 29a3f1e2af [tx-robot] updated from transifex 2014-07-29 09:16:02 +02:00
Jenkins for ownCloud a169572223 [tx-robot] updated from transifex 2014-07-28 01:54:30 -04:00
Jenkins for ownCloud 010732019a [tx-robot] updated from transifex 2014-07-26 01:54:40 -04:00
Jean-Louis Dupond 71f3326035 Fix memberOf detection. Fixes: #9835 2014-07-24 14:18:41 +02:00
Jenkins for ownCloud e2327f83ed [tx-robot] updated from transifex 2014-07-24 01:54:37 -04:00
Jenkins for ownCloud ddc85a9871 [tx-robot] updated from transifex 2014-07-20 01:54:40 -04:00
Jenkins for ownCloud d09ec36751 [tx-robot] updated from transifex 2014-07-19 01:54:42 -04:00
blizzz 1d520108c5 Merge pull request #9576 from owncloud/bcmath-check
LDAP Active Directory Primary Groups support depends on bcmath module
2014-07-18 19:15:36 +02:00
Jenkins for ownCloud 80983f5853 [tx-robot] updated from transifex 2014-07-18 01:54:43 -04:00
Jenkins for ownCloud b736864e78 [tx-robot] updated from transifex 2014-07-17 01:55:09 -04:00
Philippe Jung c13cb6145b File written by blizzz 2014-07-14 22:21:56 +02:00
Arthur Schiwon 537468f4c4 make tests deal with missing bcmath 2014-07-11 14:08:19 +02:00
Arthur Schiwon ebee3543ce warn and continue gracefully if bcmath is not installed 2014-07-10 21:26:31 +02:00
Philippe Jung 79a108c116 [Issue #9559] identifiers uid=xxx must be considered as user DN and not as owncloud users 2014-07-10 14:27:31 +02:00
blizzz 51ee4fc5df Merge pull request #9385 from owncloud/fix-7052
support for AD primary groups
2014-07-08 21:33:50 +02:00
Arthur Schiwon da490bdbbe support for AD primary groups
support for primary groups

actually the problem is only known on AD, it is only needed to take care of their attributes

adjust to ADs special behaviour

this change was not intended

cache the SID value so it is not requested over and over again

theres only one, use singular

we are access

add tests for new Access methods

add tests for new Group methods

address scrutinizer findings, mostly doc

call ldap_explode_dn from ldap wrapper, enables tests without php5-ldap

PHP Doc

yo dawg, i heard you like backslashes … php doc fix

PHPDoc updated and typos fixed while reviewing
2014-07-08 21:32:21 +02:00
Arthur Schiwon 3338a0f236 port of #9500
don't trigger update from checkPassword, it is already  called by userExists, this is enough.

do not write to database when the value is the same

add test cases. also split test classes in a file each, looks like only the first class is being executed

also appconfig shall not write to database if the value is unchanged
2014-07-08 16:32:01 +02:00
Georg Ehrke e5e8e28ae7 add ocsids to info.xml 2014-07-07 17:11:50 +02:00
Jenkins for ownCloud 23e0ef6ed0 [tx-robot] updated from transifex 2014-07-05 01:56:33 -04:00
Jenkins for ownCloud 9933b33166 [tx-robot] updated from transifex 2014-07-02 01:55:17 -04:00
blizzz 16ce23d19d Merge pull request #9006 from owncloud/ldap_fix_bgjob
LDAP: fix background job, fixes #8995
2014-07-01 14:28:04 +02:00
Jenkins for ownCloud 589f68ebf6 [tx-robot] updated from transifex 2014-06-30 01:54:47 -04:00
Arthur Schiwon fe0b75ccab also adapt result check from readAttribute 2014-06-27 20:09:16 +02:00
Arthur Schiwon ef7ab856f6 fix instantiation of Access class 2014-06-27 18:49:11 +02:00
Arthur Schiwon df7678f01e specify no attribute for group exists check, as done with users 2014-06-27 18:49:11 +02:00
Jenkins for ownCloud 36f771e9f0 [tx-robot] updated from transifex 2014-06-27 01:55:44 -04:00
Jenkins for ownCloud a5154450cf [tx-robot] updated from transifex 2014-06-26 01:54:40 -04:00
Jenkins for ownCloud b1116880f8 [tx-robot] updated from transifex 2014-06-25 06:33:53 -04:00
Arthur Schiwon 89f2691515 adjust access constructor to master 2014-06-25 11:46:21 +02:00
Arthur Schiwon 452efa5fab Port of LDAP Wizard: get correct total no of users, groups and complete list of groups on big setups #9002
fix PHPdoc

Conflicts:
	apps/user_ldap/lib/connection.php

add method to count groups on LDAP

Conflicts:
	apps/user_ldap/lib/access.php

LDAP Wizard: count users and groups with the power of paged search

Conflicts:
	apps/user_ldap/lib/wizard.php

consolidate requirement check

fix PHPdoc

Conflicts:
	apps/user_ldap/lib/access.php

Wizard: get really all groups from LDAP by power of Paged Search

Conflicts:
	apps/user_ldap/lib/wizard.php

make all this work in an early configuration state in the wizard by marking  the config active and ignoring the validation state.

Conflicts:
	apps/user_ldap/lib/connection.php

simplify two methods a bit, because they are not used for group search anymore

Conflicts:
	apps/user_ldap/lib/wizard.php

remove unused vars; increase scrutinizer happiness
2014-06-25 11:45:55 +02:00
Jenkins for ownCloud b8b7c97a41 [tx-robot] updated from transifex 2014-06-23 01:54:38 -04:00
Arthur Schiwon 93edacb357 Backport subset of #4179, re-established Oracle compatibility for LDAP
Conflicts:
	apps/user_ldap/lib/access.php
2014-06-20 20:49:34 +02:00
Jenkins for ownCloud e1fd10f226 [tx-robot] updated from transifex 2014-06-19 01:55:38 -04:00
Jenkins for ownCloud ec5448bf7d [tx-robot] updated from transifex 2014-06-16 01:54:35 -04:00
Jenkins for ownCloud 4d6fc6f309 [tx-robot] updated from transifex 2014-06-15 01:55:06 -04:00
Jenkins for ownCloud 083cf63cc2 [tx-robot] updated from transifex 2014-06-13 01:54:32 -04:00
Jenkins for ownCloud f769c52522 [tx-robot] updated from transifex 2014-06-11 01:55:07 -04:00
Jenkins for ownCloud 6546b589ce [tx-robot] updated from transifex 2014-06-10 01:54:54 -04:00
Jenkins for ownCloud e5c47a5e30 [tx-robot] updated from transifex 2014-06-09 01:54:32 -04:00
Jenkins for ownCloud 1f2722053f [tx-robot] updated from transifex 2014-06-08 01:56:13 -04:00
Jenkins for ownCloud e0446a1df5 [tx-robot] updated from transifex 2014-06-07 01:56:13 -04:00
Thomas Müller fe8bae31dc adding PK to table encryption
adding auto increment/PK to table files_trash

adding PK to table ldap_user_mapping and ldap_group_members

adding PK to table ldap_group_mapping

truncate permissions table to allow smooth creation of primary key

adding unit test for creating an auto increment column on a table which already contains data

remove unneeded table files_trashsizes

fix unit test

no need to truncate *PREFIX*permissions

On Oracle adding auto increment columns is not working out of the box - Oracle migrations are to be done manually
2014-06-06 13:33:56 +02:00
Jenkins for ownCloud ca739a59f0 [tx-robot] updated from transifex 2014-06-06 01:57:10 -04:00
Arthur Schiwon 928945ec7e fix typo in var name 2014-06-05 16:16:08 +02:00
Jenkins for ownCloud cb61d8a226 [tx-robot] updated from transifex 2014-06-05 01:57:20 -04:00
Thomas Müller 9e31118675 Merge pull request #8842 from owncloud/ldap_cli_methods
command line tools to see, modify and test existing LDAP configurations
2014-06-04 09:37:04 +02:00
Jenkins for ownCloud f5c4754c2b [tx-robot] updated from transifex 2014-06-04 01:57:48 -04:00
Thomas Müller 70ae7fa091 Fix casing and PHPDoc 2014-06-03 19:10:18 +02:00
Arthur Schiwon e962999896 get rid of @read in PHP doc after rebase 2014-06-03 13:01:14 +02:00
Arthur Schiwon ba82d80f32 adjust group tests 2014-06-03 12:59:11 +02:00
Arthur Schiwon 3fed96af0e clean up 2014-06-03 12:59:11 +02:00
Arthur Schiwon f9a9085faf class descriptions 2014-06-03 12:59:10 +02:00
Arthur Schiwon 5336e9a156 newlines 2014-06-03 12:59:10 +02:00
Arthur Schiwon d52fbd7e55 adjust test to changed convention in storing quota 2014-06-03 12:59:10 +02:00
Arthur Schiwon 342e1fd3bf port of PR #8038 2014-06-03 12:59:10 +02:00
Arthur Schiwon 11f7823e1b precaution: lowercase string for comparison 2014-06-03 12:59:10 +02:00
Arthur Schiwon e07ebdd7d0 adjust user backend test 2014-06-03 12:59:10 +02:00
Arthur Schiwon e32fa3de4a fix parameter order 2014-06-03 12:59:10 +02:00
Arthur Schiwon b0d1b2557c adjust Access test 2014-06-03 12:59:09 +02:00
Arthur Schiwon 6d64d7ec3f LDAP: put out fetching of user meta data into a fully tested class of its own and update them (mail, quota, etc.) directly after mapping. Fixes #7785 properly on master 2014-06-03 12:59:09 +02:00
Arthur Schiwon 75d320cc91 fix description texts 2014-06-03 12:36:42 +02:00
Arthur Schiwon 4bfb162558 command line tools to see, modify and test existing LDAP configurations 2014-06-03 12:35:18 +02:00
Frank Karlitschek 51602f67e0 Merge pull request #8712 from owncloud/l10n-fully-translatable-webdav
fully translatable user_webdav
2014-06-02 15:53:18 +02:00
Arthur Schiwon f0e69b2b99 Port LDAP: fix filter can be reset and broken after upgrade from OC 5 #8579
LDAP: set filter mode to raw, so filters will not be changed and broken after upgrade from oc5, when visiting the LDAP settings and opening filter tabs

get the correct version number for compare -.-

bump version and don't overwrite values on next update if not necessary

simpler and better readable assignment
2014-06-02 12:08:01 +02:00
Jenkins for ownCloud d39216c5e7 [tx-robot] updated from transifex 2014-06-02 01:54:37 -04:00
Jenkins for ownCloud cff9440a37 [tx-robot] updated from transifex 2014-05-31 01:55:46 -04:00
Jenkins for ownCloud 929882a32a [tx-robot] updated from transifex 2014-05-30 01:55:11 -04:00
Jenkins for ownCloud 368006c7af [tx-robot] updated from transifex 2014-05-29 01:54:40 -04:00
Volkan Gezer b713f15b99 document always links to the current version of OC 2014-05-29 01:30:24 +02:00
Volkan Gezer 43c6ece31a fully translatable user_webdav 2014-05-29 00:23:23 +02:00
Jenkins for ownCloud 80641cae72 [tx-robot] updated from transifex 2014-05-28 01:56:09 -04:00
Volkan Gezer 8eee8e76d1 forgotten infobox messages translations 2014-05-27 16:39:22 +02:00
Vincent Petry c64e920b4d Adjust core apps to use "requiremin" instead of "require"
Also added a few missing authors.
2014-05-27 11:54:44 +02:00
Jenkins for ownCloud a756666585 [tx-robot] updated from transifex 2014-05-27 01:54:54 -04:00
Jenkins for ownCloud 790c0e8e7c [tx-robot] updated from transifex 2014-05-26 01:55:36 -04:00
Volkan Gezer f880734827 make user_ldap fully translatable 2014-05-25 14:41:59 +02:00
Jenkins for ownCloud 3029029afd [tx-robot] updated from transifex 2014-05-25 01:54:35 -04:00
Jenkins for ownCloud 2afdd1bf1a [tx-robot] updated from transifex 2014-05-24 01:55:34 -04:00
Jenkins for ownCloud 40fc1d5b4b [tx-robot] updated from transifex 2014-05-20 01:54:53 -04:00
Morris Jobke dc36d30953 Remove all occurences of @brief and @returns from PHPDoc
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
Andreas Fischer 6c4b650524 Merge pull request #8585 from owncloud/phpdoc-improvements-apps
PHPDoc improvements /apps

* owncloud/phpdoc-improvements-apps:
  Fix whitespace issues
  Reduce double-space with single-space.
  Remove spaces around | operator in doc block.
  Fix more missing or broken PHPDoc
  PHPDoc fixes for user_ldap
  Fix PHPDoc in /apps
2014-05-19 14:08:42 +02:00
Jenkins for ownCloud a7509e5fd9 [tx-robot] updated from transifex 2014-05-18 01:55:01 -04:00
Jenkins for ownCloud a1b356c7b6 [tx-robot] updated from transifex 2014-05-17 01:57:38 -04:00
Robin McCorkell e7aebc5c32 Fix whitespace issues 2014-05-16 22:23:36 +01:00
Andreas Fischer 5b1ffd7611 Reduce double-space with single-space. 2014-05-16 22:21:57 +01:00
Andreas Fischer e04d956cac Remove spaces around | operator in doc block. 2014-05-16 22:21:57 +01:00
Robin McCorkell a17f9111a0 PHPDoc fixes for user_ldap 2014-05-16 22:21:57 +01:00
Robin McCorkell c4f1de63a8 Fix PHPDoc in /apps 2014-05-16 22:21:57 +01:00
Jenkins for ownCloud 43d6650d19 [tx-robot] updated from transifex 2014-05-16 01:55:55 -04:00
Jenkins for ownCloud d9d684197a [tx-robot] updated from transifex 2014-05-15 01:55:53 -04:00
Jenkins for ownCloud c9df98abae [tx-robot] updated from transifex 2014-05-14 01:55:31 -04:00
Thomas Müller 408189b7e4 Merge pull request #8556 from owncloud/kill-legacy-code-master
Kill legacy code master
2014-05-12 20:55:24 +02:00
Lukas Reschke aea44ee0d5 Merge pull request #8538 from owncloud/make-my-ide-less-complain-about-ldap
Use proper PHPDoc and variable names in the LDAP lib
2014-05-12 19:31:43 +02:00
Lukas Reschke cd7fc5cb80 Use array as type 2014-05-12 19:31:21 +02:00
Thomas Müller 33987eea83 remove legacy aka deprecated code: OC_Cache 2014-05-12 16:23:33 +02:00
Jenkins for ownCloud f4e8de3cbb [tx-robot] updated from transifex 2014-05-12 01:55:44 -04:00
Lukas Reschke 2ae1be762c That's bool and not always true 2014-05-11 16:29:59 +02:00
Lukas Reschke 57640742af Use WizardResult|false instead of mixed 2014-05-11 16:28:50 +02:00
Lukas Reschke 416f8b186d Use @return instead of @returns 2014-05-11 16:27:18 +02:00
Lukas Reschke cd3ed01483 Fix Typo
I guess that should be `default` and not `defautl`, wondering how this ever worked.
2014-05-11 15:24:42 +02:00
Lukas Reschke fc8be5abc3 Use proper PHPDoc and variable names in the LDAP lib
My IDE was so sad about this that it marked the whole file in red and yellow and forced me to fix this.
2014-05-11 15:17:27 +02:00
Jenkins for ownCloud 05ea8c8a10 [tx-robot] updated from transifex 2014-05-10 01:55:50 -04:00
Jenkins for ownCloud 9919ec48df [tx-robot] updated from transifex 2014-05-09 01:55:42 -04:00
Jenkins for ownCloud 4da6645a94 [tx-robot] updated from transifex 2014-05-08 01:55:39 -04:00
Jenkins for ownCloud 283b483100 [tx-robot] updated from transifex 2014-05-07 01:55:48 -04:00
Vincent Petry 1a454f61ed Merge pull request #8386 from owncloud/fix_6946_master
Fix 6946 master
2014-05-05 14:08:45 +02:00
Jenkins for ownCloud 9385b97b5f [tx-robot] updated from transifex 2014-05-04 01:56:15 -04:00
Jenkins for ownCloud cf20de185c [tx-robot] updated from transifex 2014-05-03 01:56:11 -04:00
Jenkins for ownCloud 17f5a18922 [tx-robot] updated from transifex 2014-05-01 01:56:01 -04:00
Jenkins for ownCloud 654a6e6c6a [tx-robot] updated from transifex 2014-04-30 01:57:53 -04:00
Jenkins for ownCloud b4a5093da8 [tx-robot] updated from transifex 2014-04-29 01:56:49 -04:00
Arthur Schiwon 45e42c25de Group Database backend must not gather user details itself but ask user
backends. This is a port to master from PR #7745

remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backends

Conflicts:
	lib/private/group/backend.php

LDAP: getDisplayNamesInGroup is not an option for group backends anymore

Conflicts:
	apps/user_ldap/group_ldap.php
	apps/user_ldap/group_proxy.php

clean up group backends

Conflicts:
	lib/private/group/database.php

remove now unnecessary test

implement getDisplayNames in group manager

adjust user manager tests

test for group manager's displayNamesInGroup

trim must not be used in empty in PHP < 5.5

keep the constant to not provoke PHP warnings

Conflicts:
	lib/private/group/backend.php
2014-04-28 13:49:56 +02:00
Jenkins for ownCloud c591cf0836 [tx-robot] updated from transifex 2014-04-26 01:55:32 -04:00
Jenkins for ownCloud 3fc809dfd8 [tx-robot] updated from transifex 2014-04-25 01:56:28 -04:00
Jenkins for ownCloud 435672feaa [tx-robot] updated from transifex 2014-04-24 01:55:33 -04:00
blizzz 645ecb7644 Merge pull request #6297 from leo-b/fix_ldap_errors
only check ldap_errno if an ldap_* function actually fails
2014-04-23 16:26:43 +02:00
blizzz 97f21712cd Merge pull request #8164 from owncloud/fix-6651
LDAP: fix random resets of filter
2014-04-23 11:09:35 +02:00
Thomas Müller e0cac32442 fixing some JSHint warnings 2014-04-23 10:08:14 +02:00
Jenkins for ownCloud 3f453d1641 [tx-robot] updated from transifex 2014-04-23 01:56:35 -04:00
Arthur Schiwon c1c2f2c49e add additional comments, PHPdoc and check whether it's really applicable 2014-04-22 18:36:43 +02:00
Arthur Schiwon 1c71d5c444 LDAP: cache display names immediately on retrieval, saves tens of unecessary queries to LDAP server in the share dialog for example 2014-04-22 18:36:37 +02:00
Jenkins for ownCloud 4fe5ca1908 [tx-robot] updated from transifex 2014-04-21 01:56:06 -04:00
blizzz 36c8dec10a Merge pull request #8220 from owncloud/type-hinting-ldap
Fix PHPdoc in user_ldap
2014-04-17 18:15:40 +02:00
Robin McCorkell 13b463cc17 Merge pull request #8189 from Xenopathic/misc_fixes
Various fixes
2014-04-17 11:56:51 +01:00
Bart Visscher 81751cb616 Add missing param hint 2014-04-16 17:54:10 +02:00
blizzz f6551d214f Merge pull request #7815 from owncloud/ldap_fix_usercount_master
correct LDAP user count on setup with many users (occ user:report)
2014-04-16 10:36:19 +02:00
Jenkins for ownCloud 23f2c48a43 [tx-robot] updated from transifex 2014-04-16 01:57:34 -04:00
Bart Visscher bad41c05b8 Fix PHPdoc in user_ldap
using scrutinizer patch
2014-04-15 21:05:49 +02:00
Lukas Reschke 340089f270 Merge pull request #8059 from owncloud/countUsersInGroup
add optional countUsersInGroup method to group backends
2014-04-14 20:45:12 +02:00
Jenkins for ownCloud 2a2aabbdaf [tx-robot] updated from transifex 2014-04-14 01:55:09 -04:00
Robin McCorkell 8bb003868c Fix user_ldap default setting value 2014-04-13 16:49:23 +01:00
Jenkins for ownCloud 982d2bcc5b [tx-robot] updated from transifex 2014-04-13 01:55:12 -04:00
Jenkins for ownCloud 329b8f3e99 [tx-robot] updated from transifex 2014-04-12 01:56:11 -04:00
Volkan Gezer d67cba973e Typo fix. 2014-04-11 15:23:43 +02:00
Arthur Schiwon 1c57ffa16f Give hint when composing filter failed 2014-04-11 14:08:12 +02:00
Arthur Schiwon e28227ecdc fix comparison in determineMode, fixes problems with restoring the filter mode (assisted or manually) on page refresh 2014-04-11 13:56:06 +02:00
Arthur Schiwon 6f1e9f8920 Merge branch 'ldap-filter-reset-fix' of github.com:ben-denham/core into fix-6651 2014-04-11 13:48:45 +02:00
Jenkins for ownCloud 36107e1bad [tx-robot] updated from transifex 2014-04-11 01:55:15 -04:00
Jenkins for ownCloud 7c072510d3 [tx-robot] updated from transifex 2014-04-10 01:55:39 -04:00
blizzz 9feebeaf40 Merge pull request #7837 from owncloud/fix_7530
LDAP: fix determining objectclasses takes long
2014-04-09 12:27:17 +02:00
Arthur Schiwon dbebf6bb5e add comment to clearify when a skip in the foreach happens 2014-04-09 12:25:48 +02:00
Arthur Schiwon ee3368d2ad replace hardcoded limit of 400 with user controlled ldapPagingSize value 2014-04-09 11:38:51 +02:00
Arthur Schiwon 2e5adadad7 Put inner loop into own method, let's see whether it makes scrutinizer happier 2014-04-09 11:31:56 +02:00
Arthur Schiwon bdc418d1f9 var count is assigned in the inner loop so it must be checked inside there to be properly used as part of the exit condition of the outer loop 2014-04-09 11:31:56 +02:00
Arthur Schiwon 43402c56dd initialize variable 2014-04-09 11:31:56 +02:00
Arthur Schiwon 40f9875f11 LDAP: fix user report i.e. count for LDAP servers with really many users 2014-04-09 11:31:56 +02:00
Arthur Schiwon 8bb27551bd LDAP: make sure cache key for paged result cookie matches when limit or offset is null or 0 2014-04-09 11:31:56 +02:00
Jenkins for ownCloud 796f719548 [tx-robot] updated from transifex 2014-04-09 01:56:49 -04:00
Arthur Schiwon 2407321625 add tests for LDAP 2014-04-08 12:57:06 +02:00
Arthur Schiwon 142fc5f3af fix return value when a search string was passed to return integer instead of array 2014-04-08 12:53:59 +02:00
Arthur Schiwon 96cb75f5cf implement countUsersInGroup in LDAP group backend 2014-04-08 12:04:38 +02:00
Jenkins for ownCloud 4ad4b9768c [tx-robot] updated from transifex 2014-04-08 01:57:51 -04:00
blizzz 3c9f588449 Merge pull request #6221 from leo-b/ldap_get_all_groups
fix updateGroups background job for ldap servers with > 1000 groups
2014-04-07 13:00:32 +02:00
Jenkins for ownCloud a9d49de465 [tx-robot] updated from transifex 2014-04-06 01:56:11 -04:00
Jenkins for ownCloud 73dd5ff26c [tx-robot] updated from transifex 2014-04-02 01:56:39 -04:00
Vincent Petry 18acfa8bb3 Merge pull request #7915 from owncloud/replace-personalblock
Replace personalblock with .section
2014-04-01 11:20:16 +02:00
Jenkins for ownCloud 7a4a836abe [tx-robot] updated from transifex 2014-04-01 01:56:15 -04:00
Jan-Christoph Borchardt 2be2a5d2c5 external storage: fix merge conflict, indentation 2014-03-31 13:12:04 +02:00
Jenkins for ownCloud bfb0b9a044 [tx-robot] updated from transifex 2014-03-30 01:55:42 -04:00
Alexander Bergolth b158939283 adapt description of paging size configuration 2014-03-28 14:20:01 +01:00
Alexander Bergolth 0d9d70b51c change default ldap paging size to 500 2014-03-28 14:02:19 +01:00
Jan-Christoph Borchardt 25326b89da replace personalblock fieldset with section class in core user_ apps 2014-03-27 17:00:47 +01:00
Robin McCorkell 50dba97bde Miscellaneous text fixes for core apps 2014-03-26 15:43:03 +00:00
Jenkins for ownCloud 75d8de378c [tx-robot] updated from transifex 2014-03-26 01:56:21 -04:00
Jenkins for ownCloud abdc823bb6 [tx-robot] updated from transifex 2014-03-24 01:55:51 -04:00
Arthur Schiwon 422ccf4cdb add test for cloning and keeping configuration seperate 2014-03-21 15:31:30 +01:00
Arthur Schiwon 86d479cb28 Use array_key_exists instead of isset, because the latter returns false if the assigned value is null 2014-03-21 15:29:49 +01:00
Arthur Schiwon 055a09e487 On clone create a new instance of the Configuration
To avide effects on the original instance of Connection when the clone
is modified, for instance on authentication checks.
2014-03-21 15:27:51 +01:00
blizzz 3f95f9325f Merge pull request #7823 from owncloud/fix_7796
Add FreeIPA UUID compatibility, fixes #7796
2014-03-21 11:27:18 +01:00
Arthur Schiwon 4230983e69 define var 2014-03-21 10:10:49 +01:00
Arthur Schiwon 6f605ecd67 make tests work on systems without php5_ldap 2014-03-21 10:08:17 +01:00
Jenkins for ownCloud bcf388d3c5 [tx-robot] updated from transifex 2014-03-21 01:55:35 -04:00
Arthur Schiwon 3d2ab76347 add tests for cumulativeSearchOnAttribute 2014-03-21 00:17:51 +01:00
Arthur Schiwon a085d7715f fix potential infinite loop when the DN of the first entry was already read. 2014-03-20 22:59:41 +01:00
Arthur Schiwon 561d699ca6 Use the LDAP wrapper for checking resources, needs for proper testing 2014-03-20 22:58:57 +01:00
Arthur Schiwon bd881348e8 Fix wildcard handling and check even less DNs per filter, enough will be looked at anyway 2014-03-20 22:57:50 +01:00
Robin McCorkell 7c3da27bf6 Fix duplicate ipauniqueid 2014-03-20 20:38:06 +00:00
Arthur Schiwon 057c2638e4 LDAP Wizard: when determining objectclasses, we realy do not need to look at every entry. Fixes #7530 2014-03-20 13:58:08 +01:00
Jenkins for ownCloud 3aa8647634 [tx-robot] updated from transifex 2014-03-20 01:56:42 -04:00
Robin McCorkell ca595611f5 Add FreeIPA UUID compatibility, fixes #7796
Ability to use ipauniqueid for the UUID of a user
2014-03-19 20:30:24 +00:00
Jenkins for ownCloud 7b1d52f5b9 [tx-robot] updated from transifex 2014-03-19 01:55:39 -04:00
Jenkins for ownCloud b2e929d580 [tx-robot] updated from transifex 2014-03-15 02:14:22 -04:00
Jenkins for ownCloud 4b802aa7cb [tx-robot] updated from transifex 2014-03-13 17:12:37 -04:00
ben-denham 8a8a32cf43 Changed conditions in user_ldap's ldapFilter.js to use ===, fixed indentation. 2014-03-14 09:17:39 +13:00
Alexander Bergolth c76d952dac make getGroupsChunk() protected instead of private 2014-03-13 10:57:19 +01:00
Alexander Bergolth 7f8b04d3e0 adapt coding style 2014-03-13 09:33:07 +01:00
Jenkins for ownCloud 1295e54173 [tx-robot] updated from transifex 2014-03-13 01:55:50 -04:00
Jenkins for ownCloud 8320b8eb7a [tx-robot] updated from transifex 2014-03-12 01:57:17 -04:00
Jenkins for ownCloud b0ec38e202 [tx-robot] updated from transifex 2014-03-11 01:59:39 -04:00
ben-denham ef65381a0b Moved LdapFilter into a separate js file in user_ldap. 2014-03-07 10:10:42 +13:00
ben-denham 43e79f41f3 Added improved version of patch by @blizzz in https://github.com/owncloud/core/issues/6651#issuecomment-32261257 to stop filter settings from being reset under a race condition. 2014-03-07 09:17:41 +13:00
Alexander Bergolth f850fcfac5 "reset" ldap pagedSearch control by setting it to a high value 2014-03-06 12:23:20 +01:00
root 6585bd5a50 "reset" ldap pagedSearch control by setting it to a high value
call nextEntry via invokeLDAPMethod
2014-03-06 12:07:03 +01:00
root 8fcc29ee8b only check ldap_errno if an ldap_* function actually fails
fix wizard errors
reset search paging right after the search, not before some of the possible next search operations
cookie contains binary characters, don't log it
  (avoids json_encode(): Invalid UTF-8 sequence in argument errors)
2014-03-06 12:07:03 +01:00
root 84550fbfb4 fix another oversight... sigh.. 2014-03-05 10:42:35 +01:00
root 4645d0a93a getGroups(): fix overall max search limit for paged searches 2014-03-04 21:12:47 +01:00
root eb1e361824 getGroups() $limit was not handled correctly 2014-03-04 21:07:27 +01:00
root eb59e63c3b revert updateGroups job to use getGroups() instead of getAllGroups() 2014-03-04 19:47:49 +01:00
root 039f7b054a merge functionality of getAllGroups into getGroups 2014-03-04 18:02:27 +01:00
root 15ef3145f8 Merge branch 'ldap_paging_chunksize' into ldap_get_all_groups 2014-03-04 17:24:46 +01:00
root a5813acb64 add ldap_paging_size config option 2014-03-04 17:23:04 +01:00
root bacda81bf7 use getAllGroup() in the updateGroups background job
needed in active directory deployments with > 1000 groups
2014-03-04 14:17:22 +01:00
root a135f1ebbb add getAllGroups() that uses a paged search if available
this circumvents server side search limits
(active directory has a limit of 1000 by default)
2014-03-04 14:17:22 +01:00
Vincent Petry fd5dec0298 Fixed configkey casing for PostgreSQL 2014-03-03 16:15:23 +01:00
Arthur Schiwon b968eed27b remove remaining testing artefact 2014-03-03 10:20:37 +01:00
Arthur Schiwon c7751c0795 intendetion. where did the whitespaces come from? 2014-03-03 10:20:31 +01:00
Arthur Schiwon a8883f4ed2 LDAP: let proxy for multiple server access methods from Access 2014-03-03 10:20:25 +01:00
VicDeo ec9fe3f57f Merge pull request #6299 from leo-b/ldap_nested_groups
Add LDAP nested groups
2014-02-25 15:41:10 +02:00
root 300b1131b4 replace spaces with tabs
use true instead of 1
2014-02-21 17:09:36 +01:00
Thomas Müller fe24aafe7d Merge pull request #7312 from owncloud/ldap_fix_add_test
LDAP: fix and extend tests
2014-02-21 00:42:43 +01:00
blizzz 984ea7b3ff Merge pull request #7205 from owncloud/fix_7153
LDAP: prevent other configuration from being deleted when deleting the f...
2014-02-20 16:22:43 +01:00
Arthur Schiwon d5690a174e LDAP: fix and extend tests 2014-02-20 14:05:45 +01:00
Arthur Schiwon c0328b4f0f LDAP: improve compilation of filters 2014-02-19 13:13:01 +01:00
Scrutinizer Auto-Fixer adaee6a5a1 Scrutinizer Auto-Fixes
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720

Enabled analysis tools:
 - PHP Analyzer
 - JSHint
 - PHP Copy/Paste Detector
 - PHP PDepend
2014-02-19 09:31:54 +01:00
Thomas Müller c6f4f85e27 Merge branch 'master' into scrutinizer_documentation_patches
Conflicts:
	lib/private/migration/content.php
2014-02-18 18:31:33 +01:00
Arthur Schiwon 54f9db403f LDAP: improve wizard strings, fixes #5567 2014-02-17 17:19:48 +01:00
Thomas Müller 9fac95c2ab Merge branch 'master' into scrutinizer_documentation_patches
Conflicts:
	lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
Arthur Schiwon d88c6778ff LDAP: prevent other configuration from being deleted when deleting the first one which has an empty prefix for historical reasons 2014-02-14 15:34:22 +01:00
root d10f6e94dc fix coding style to blizzz happy.. ;-) 2014-02-12 16:56:17 +01:00
Arthur Schiwon 14d1abf63f LDAP: improve debug message 2014-02-10 14:45:37 +01:00
Arthur Schiwon 18e1a10e96 LDAP: also try MS AD's thumbnailPhoto when looking for an avatar image 2014-02-10 14:45:31 +01:00
Arthur Schiwon 299d37154b LDAP: add documentation info in info.xml 2014-02-10 12:59:11 +01:00
Arthur Schiwon e156f85bfb Rephrase and clarify log message 2014-02-10 11:29:08 +01:00
Arthur Schiwon a76840d206 Wizard: enable base DN for editing, if not base DN could have been detected. Also part of fix for #6670 2014-02-10 11:29:02 +01:00
Arthur Schiwon e825a008c9 Wizard: disable LDAP referrals, fixes #6670 2014-02-10 11:28:55 +01:00
Arthur Schiwon a908bd5695 throw an info message, when base dn test failed 2014-02-10 11:28:46 +01:00
Arthur Schiwon bc17b40650 LDAP: extend LDAP wrapper search method for sizelimit, improves performance in wizard 2014-02-10 11:28:38 +01:00
Joas Schilling b330d07b51 Fix more documentation failes
Issue #7111
2014-02-08 11:47:55 +01:00
Jörn Friedrich Dreyer 2a6a9a8cef polish documentation based on scrutinizer patches 2014-02-06 17:02:21 +01:00
icewind1991 a27529709b Merge pull request #6647 from owncloud/memcache-public
Add Memcache to the public api
2014-02-04 05:38:53 -08:00
Jan-Christoph Borchardt 46745895ae Merge pull request #5153 from owncloud/core-em-to-px
Cleans up Core apps for relative(em) to absolute(px) styles.
2014-01-27 02:29:47 -08:00
raghunayyar 2a0e8329f9 Fixes settings.css and converts more styles. 2014-01-26 03:02:52 +05:30
Robin Appelman 02aa44d055 Merge branch 'master' into memcache-public 2014-01-22 13:19:49 +01:00
Jörn Friedrich Dreyer 21832bc890 user workarount to compare CLOB column with CHAR value 2014-01-21 11:56:34 +01:00
raghunayyar 775e08e0ee Merge branch 'master' into core-em-to-px
Conflicts:
	apps/files_sharing/css/public.css
	apps/user_ldap/css/settings.css
	core/css/multiselect.css
	core/css/share.css
2014-01-16 14:42:37 +05:30
Robin Appelman 729210daa0 Merge branch 'master' into memcache-public
Conflicts:
	apps/user_ldap/lib/connection.php
2014-01-15 13:02:15 +01:00
Arthur Schiwon 25fecb4f25 typo, grammar 2014-01-14 16:33:18 +01:00
Arthur Schiwon 097b6b8be9 LDAP: only read config from database, if configID is given. Not what we want to do when on-the-fly-testing settings from the admin page 2014-01-14 16:33:09 +01:00
Arthur Schiwon bb6bad6b3c remove unused variables 2014-01-14 16:33:02 +01:00
Arthur Schiwon e4b7c6ef10 LDAP: fix TLS detection 2014-01-14 16:32:55 +01:00
Thomas Müller 92969052d7 remove ru_RU - it has bee removed from transifex 2014-01-13 16:41:10 +01:00
Robin Appelman 5d456c7cc2 Merge branch 'master' into memcache-public 2014-01-09 13:54:58 +01:00
Robin Appelman d50c7391d8 Use $server->getMemCacheFactory() in ldap connection 2014-01-09 13:54:50 +01:00
blizzz d8b8abb429 Merge pull request #6681 from owncloud/userreport
add command line option to get user number statistics
2014-01-08 10:41:39 -08:00
Arthur Schiwon 677d83d45f LDAP: add tests for countUsers 2014-01-08 12:24:29 +01:00
Arthur Schiwon 53498bc876 remove unnecessary line 2014-01-08 12:20:56 +01:00
Arthur Schiwon b669e1a3c1 LDAP: implement userCount action. This required to (finally) clean up and refactor the search method, which will have a positive performance impact on paged search. 2014-01-08 12:07:57 +01:00
Jenkins for ownCloud d2f2645a6a [tx-robot] updated from transifex 2014-01-07 01:56:11 -05:00
Jenkins for ownCloud 0e843b9d7d [tx-robot] updated from transifex 2014-01-06 01:55:59 -05:00
Jenkins for ownCloud e4616199df [tx-robot] updated from transifex 2014-01-05 01:55:53 -05:00
Jenkins for ownCloud 095f9b8ee0 [tx-robot] updated from transifex 2014-01-02 01:56:21 -05:00
Jenkins for ownCloud 760fa9ea30 [tx-robot] updated from transifex 2013-12-31 01:55:42 -05:00
Jenkins for ownCloud 9ea9638490 [tx-robot] updated from transifex 2013-12-30 01:55:38 -05:00
Jenkins for ownCloud e345f3f511 [tx-robot] updated from transifex 2013-12-29 01:55:36 -05:00
Jenkins for ownCloud 71c829f92a [tx-robot] updated from transifex 2013-12-28 01:55:35 -05:00
Jenkins for ownCloud f60ecfc7fd [tx-robot] updated from transifex 2013-12-22 01:56:05 -05:00
Jenkins for ownCloud 6488ff2c75 [tx-robot] updated from transifex 2013-12-17 16:43:17 -05:00
Jenkins for ownCloud a99dd3183c [tx-robot] updated from transifex 2013-12-17 06:46:52 -05:00
Jenkins for ownCloud 77b68505c2 [tx-robot] updated from transifex 2013-12-13 14:44:31 -05:00
Arthur Schiwon 1292793c4b LDAP: fix method behind save button on advancend and expert tabs, fixes at least Home Folder setinng 2013-12-13 16:29:42 +01:00
Arthur Schiwon 5ba9344b0e LDAP: the browser shall not autofill userdn and password, usually login credentials are inserted. fixes #6283 2013-12-12 14:15:39 +01:00
Jenkins for ownCloud 7b20212c0a [tx-robot] updated from transifex 2013-12-11 13:32:13 -05:00
root 2b127a6ac5 fix indentation
use identity test where appropriate
use camelcase variable names
_getGroupsByMember is a private function
2013-12-11 10:43:48 +01:00
root a18cff4479 remove debug output 2013-12-10 19:02:01 +01:00
root e1d80b3356 Merge remote branch 'upstream/master' into ldap_nested_groups 2013-12-10 18:57:04 +01:00
root 4fb16804d6 move nested group checkbox to directory settings 2013-12-10 18:47:59 +01:00
Jenkins for ownCloud 6aab1ebf44 [tx-robot] updated from transifex 2013-12-09 06:40:22 -05:00
root 86809be638 combineFilterWithAnd recently moved to Access 2013-12-08 15:49:25 +01:00
Jenkins for ownCloud 079d20a80e [tx-robot] updated from transifex 2013-12-07 22:28:29 -05:00
blizzz b5939324b0 Merge pull request #6218 from leo-b/fix_ldap_setOption_returncode
correctly propagate the return value of ldap_set_option
2013-12-06 08:54:29 -08:00
root 48e426b589 add support for nested groups 2013-12-06 16:46:52 +01:00
root 54e47b4180 correctly propagate the return value of ldap_set_option
otherwise LDAP_OPT_REFERRALS won't be set to 0 and in turn
active directory paging will stop working
(Operations error on ldap_control_paged_result_response)
2013-12-06 12:04:17 +01:00
Jenkins for ownCloud 7e702f294f [tx-robot] updated from transifex 2013-12-04 18:14:17 -05:00
Arthur Schiwon 3480766a78 LDAP Wizard: don't generate filter when not allowed 2013-12-04 18:59:30 +01:00
Arthur Schiwon 60b1191c88 some equals are more equal than other equals 2013-12-04 18:59:12 +01:00
Arthur Schiwon 01af3bdb05 LDAP Wizard: return correct var 2013-12-04 18:58:52 +01:00
Arthur Schiwon 06577f1fe2 LDAP Wizard: make sure auto-detected suggestions are really applied initially. Also make initial filter compilation and user counting robust against race conditions. 2013-12-04 18:58:29 +01:00
Arthur Schiwon cc725674e0 LDAP: on testing configuration, set active property to true, otherwise inactive connections cannot be tested properly 2013-12-04 18:58:09 +01:00
Arthur Schiwon a10d1977b5 LDAP: set default value for login filter to empty, otherwise the wizard signals completed configuration too early when it might be not correct, i.e. login won't work 2013-12-04 18:57:54 +01:00
Arthur Schiwon 9808dee149 LDAP Wizard: don't send ldap_tls change back to the interface as the element was removed, for it is detected fully automatically. Resolves an JS error and thus an ever-spinning spinner 2013-12-04 18:57:32 +01:00
Arthur Schiwon 430f85cc59 LDAP Wizard: avoid a manually deactivated LDAP configuration is enabled by just opening the admin page 2013-12-04 17:57:47 +01:00
Arthur Schiwon 1c6568cf68 LDAP: make unsetting checkboxes from Advanced tab work again, fixes #6143 2013-12-04 17:57:40 +01:00
Jenkins for ownCloud 83ec234f53 [tx-robot] updated from transifex 2013-12-02 17:28:29 -05:00
Jenkins for ownCloud 1b18c5a047 [tx-robot] updated from transifex 2013-11-29 14:10:40 -05:00
Jenkins for ownCloud 4a78f12682 [tx-robot] updated from transifex 2013-11-27 12:10:54 -05:00
blizzz 34704eded6 Merge pull request #5955 from owncloud/fix5863
LDAP Wizard: Add raw login filter to corresponding tab for consistency, fix behaviour on raw filter input
2013-11-27 00:30:15 -08:00
blizzz 4f15282bc9 Merge pull request #6058 from owncloud/ldap2avatar
Set Avatar for LDAP users automatically (if a picture is available)
2013-11-26 12:05:32 -08:00
Jenkins for ownCloud fb7aa2f014 [tx-robot] updated from transifex 2013-11-26 10:47:07 -05:00
Arthur Schiwon 69518b9013 Make sure Avatar is set from LDAP upon first login, not later, but also not before due to missing user folder 2013-11-26 12:57:39 +01:00
Jenkins for ownCloud dc67c7efa9 [tx-robot] updated from transifex 2013-11-26 04:04:05 -05:00
Arthur Schiwon 03375d6c52 LDAP: username2dn should only return DNs that belong to the current LDAP server. Might be not perfect. Easy perfect solution would increase communication with LDAP server. Let's see if it is good enough 2013-11-25 22:08:11 +01:00
Arthur Schiwon 3955388f20 LDAP: proxy: configurable return to determine when to try the next LDAP server and when to return (multi server setup) 2013-11-25 22:05:00 +01:00
Jenkins for ownCloud ba0e09adce [tx-robot] updated from transifex 2013-11-24 00:14:51 -05:00
Arthur Schiwon d9347f2c9b LDAP: last avatar lookup must be stored per user. Someone had a blackout, eh? 2013-11-22 23:58:30 +01:00
Arthur Schiwon 6fdce3b7e9 LDAP: user proxy must support canChangeAvatar too 2013-11-22 13:25:20 +01:00
Arthur Schiwon 54f0deff2a LDAP: get user photo from LDAP and set it as avatar if available 2013-11-22 13:25:20 +01:00
Jenkins for ownCloud 5d9731cef2 [tx-robot] updated from transifex 2013-11-21 10:05:34 -05:00
Arthur Schiwon dd5e1092c7 LDAP Wizard: add objectclass for group detection in Zimbra 2013-11-21 11:20:31 +01:00
Arthur Schiwon ce1318c9f1 LDAP Wizard: clear the cache on save so changes have immediate effect 2013-11-20 15:56:25 +01:00
Arthur Schiwon ff9ecc8a51 LDAP Wizard: proper behaviour for raw filter input. remember the editing mode and compose filter only when desired. 2013-11-19 23:58:08 +01:00
Jenkins for ownCloud c3746e866a [tx-robot] updated from transifex 2013-11-15 22:56:31 -05:00
blizzz cb968c77d1 Merge pull request #5772 from owncloud/fix5741
LDAP Wizard: introduce configuration status indicator, fixes #5741
2013-11-15 08:52:41 -08:00
Thomas Müller 1e863cd959 Merge pull request #5700 from owncloud/ldapWizSetDisplayNames
LDAP Wizard: do not forget to set display name attributes for user and g...
2013-11-15 01:12:54 -08:00
Arthur Schiwon 98c9334175 LDAP Wizard: move raw login filter field from advanced tab to login filter tab for consistency 2013-11-14 18:29:18 +01:00
Arthur Schiwon 84a882c651 LDAP Wizard: make 'Configuration OK' and 'Help' texts grey so they don't take too much awareness 2013-11-13 19:07:28 +01:00
Arthur Schiwon 7a61dcadd2 LDAP Wizard: move status indicator in one line with back and continue buttons 2013-11-13 19:07:28 +01:00
Arthur Schiwon 4ee296051b LDAP Wizard: introduce configuration status indicator, fixes #5741 2013-11-13 19:07:28 +01:00
Morris Jobke 5aae550b11 Merge pull request #5809 from owncloud/fix5753
LDAP Wizard: proper behaviour with anonymous bind, fixes #5753
2013-11-13 06:52:07 -08:00
Arthur Schiwon 550f2d0089 LDAP Wizard: make UI behaviour more consistent and more pleasant when determining Base DN 2013-11-11 19:27:38 +01:00
Arthur Schiwon 082357a670 LDAP Wizard: remove ugly whitespace where it should not be 2013-11-11 19:25:20 +01:00
Arthur Schiwon da61c6ef72 LDAP Wizard: determine port without credentials. don't hide the port input field 2013-11-11 15:16:54 +01:00
Arthur Schiwon ea9f392f4e LDAP Wizard: improve check for Agent DN and Credentials 2013-11-11 13:36:28 +01:00
Jenkins for ownCloud e431ba5ce8 [tx-robot] updated from transifex 2013-11-11 05:47:59 -05:00
Jenkins for ownCloud 3428c03b80 [tx-robot] updated from transifex 2013-11-09 01:45:32 -05:00
Arthur Schiwon 58aad1096f LDAP Wizard: keep Base DN always visible 2013-11-08 17:48:29 +01:00
blizzz 0b1749e581 Merge pull request #5682 from owncloud/fix5585
LDAP: make buttons on Expert page work again, fixes #5585
2013-11-07 03:34:49 -08:00
Jenkins for ownCloud 263603aa4c [tx-robot] updated from transifex 2013-11-06 21:44:36 -05:00
Arthur Schiwon 95a5ff63b8 LDAP: resolve namespace harakiri, fixes background job 2013-11-06 16:25:31 +01:00
Arthur Schiwon 8b3da23368 LDAP Wizard: l10ned Save button 2013-11-06 12:40:07 +01:00
Arthur Schiwon fc040755c1 LDAP Wizard: do not forget to set display name attributes for user and group, makes Test Connection succeed 2013-11-05 13:19:32 +01:00
miicha ef1183bf86 allows agent and password or neither agent nor password
this contribution is MIT licensed
2013-11-05 11:51:53 +01:00
miicha 5b9bdaadaa allow empty user-dn and password
help tooltip shows completely right: leave both blank for anonyous access. But if you leave it blank js doesn't allow you to edit any other settings...
2013-11-05 01:24:20 +01:00
Arthur Schiwon 3d6030b2ae LDAP: improve design and placement of Save button 2013-11-04 16:54:48 +01:00
Arthur Schiwon 17820fbef6 LDAP: make buttons on Expert page work again, fixes #5585 2013-11-04 16:48:40 +01:00
Andreas Fischer 26ecf2062c Merge pull request #5656 from owncloud/fix-wizard-typo
Fix typo in LDAP wizard

* owncloud/fix-wizard-typo:
  Excpetion->Exception
2013-11-04 09:39:19 +01:00
Jenkins for ownCloud e89f080f09 [tx-robot] updated from transifex 2013-11-03 14:39:28 -05:00
Jenkins for ownCloud 07e540613e [tx-robot] updated from transifex 2013-11-03 12:44:12 -05:00
VicDeo 4e9a23dffe Excpetion->Exception 2013-11-01 12:19:44 +03:00
Vincent Petry 4c7ef85252 Merge pull request #5616 from owncloud/fixing-l10n-master
Fixing l10n master
2013-10-30 02:44:54 -07:00
Jenkins for ownCloud 54ae799cd9 [tx-robot] updated from transifex 2013-10-30 03:33:25 -04:00
Thomas Müller ffb0e14d7b replacing ownCloud by theme-able name or avoid it's usage 2013-10-29 23:29:16 +01:00
Jenkins for ownCloud b0b76fe064 [tx-robot] updated from transifex 2013-10-29 07:31:51 -04:00
Jenkins for ownCloud 8df8211225 [tx-robot] updated from transifex 2013-10-27 07:27:22 -04:00
Jenkins for ownCloud 119ecc6f34 [tx-robot] updated from transifex 2013-10-27 02:32:11 -04:00
Arthur Schiwon 81dbe7dab7 Port PR #5457 to master 2013-10-25 14:15:05 +02:00
Donald Buczek 3fc232370e make sure the shared ldap connection is rebound to the configured user after being used for password checking. 2013-10-25 11:12:18 +02:00
Arthur Schiwon c48157e3b8 LDAP: don't validate unconfigured (new) LDAP server configs, fixes #5518 2013-10-24 20:26:05 +02:00
Arthur Schiwon 7fa418c81a LDAP Wizard: always show correct Back+Continue Buttons, fixes #5520 2013-10-24 18:21:02 +02:00
Arthur Schiwon 20f46602bd LDAP: when multiline values are passed as array, do not try to preg_split them. Fixes #5521 2013-10-24 14:27:33 +02:00
Arthur Schiwon 6284e95e2b typo, fixes #5517 2013-10-24 14:16:58 +02:00
Arthur Schiwon 30c0f5dee6 LDAP Wizard: proper strings and translations for user and group count text 2013-10-23 12:20:13 +02:00
Arthur Schiwon d78a80a689 merge master with resolved conflicts 2013-10-23 12:01:45 +02:00
Arthur Schiwon 76a195a0be LDAP Wizard: l10n improvements 2013-10-21 23:15:21 +02:00
Thomas Müller 148d2616e5 introduce link_to_docs() and migrate links 2013-10-21 21:29:45 +02:00
Jenkins for ownCloud 6aee83cadf [tx-robot] updated from transifex 2013-10-19 08:27:13 -04:00
Arthur Schiwon e61d961efb LDAP: Fix base-comparison with multibyte characters, fixes #5081. Thanks to @sfyang 2013-10-19 00:51:37 +02:00
Arthur Schiwon 17010e8f58 Don't set Base User and Base Group when Base DN was detected, would case problems but does not provide any benefit. also make sure that empty string is saved instead of false for multiline values 2013-10-17 20:58:43 +02:00
Arthur Schiwon 183dd813d3 Fix Spinner issues with Base DN field 2013-10-17 20:57:19 +02:00
Jenkins for ownCloud 2845747528 [tx-robot] updated from transifex 2013-10-17 13:48:52 -04:00
Arthur Schiwon 6acd01d9f2 resolve merge conflicts from rebase 2013-10-17 19:40:59 +02:00
Arthur Schiwon 0b90cc0b4b Ldap Wizard: also disable tabs, if the first step is not complete 2013-10-17 19:13:29 +02:00
Arthur Schiwon 6b160d8507 LDAP Wizard: make Back and Continue work 2013-10-17 19:13:29 +02:00
Arthur Schiwon 63e9c56d48 LDAP Wizard: Use Ajax Spinner to indicate something is happening, especiall port detection 2013-10-17 19:13:29 +02:00
Arthur Schiwon f64ae75107 LDAP Wizard: fix couple more or less nasty bugs aka polishing 2013-10-17 19:13:28 +02:00
Arthur Schiwon 7ad8319488 do not instantiate LDAP Proxy if there are no active configurations 2013-10-17 19:13:28 +02:00
Arthur Schiwon 109ddde944 Wizard: autodetection of group-member-assoc attribute 2013-10-17 19:13:28 +02:00
Arthur Schiwon 5606b60f36 LDAP: set displayname as default attribute for user display name 2013-10-17 19:13:28 +02:00
Arthur Schiwon c975021a67 clean up 2013-10-17 19:13:28 +02:00
Arthur Schiwon 3ae696f843 Wizard does not need data-defaults here 2013-10-17 19:13:28 +02:00
Arthur Schiwon f6b60c6586 LDAP Wizard: add forgotten templates 2013-10-17 19:13:28 +02:00
Arthur Schiwon def834b0a1 LDAP: dissolve LDAP Basic settings, move Login Filter to Advanced and clean up Advanced settings, too. This is all done via Wizard, now. 2013-10-17 19:13:28 +02:00
Arthur Schiwon b2ccb712e2 Ldap Wizard: Group Filter configuration 2013-10-17 19:13:28 +02:00
Arthur Schiwon 7c6a9c2256 Ldap Wizard: Login filter UI, detection of username attribute, composing of login filter 2013-10-17 19:13:28 +02:00
Arthur Schiwon e903db7887 LDAP Wizard: create user list filter, show number of user that will have access to OC 2013-10-17 19:13:28 +02:00
Arthur Schiwon 5c99645f7d Cleanup code, sort results 2013-10-17 19:13:27 +02:00
Arthur Schiwon 162bfb231a Ldap Wizard: find out whether server supports memberOf in LDAP Filter and disable group chooser if not 2013-10-17 19:13:27 +02:00
Arthur Schiwon e87b091536 cleanup and coding style 2013-10-17 19:13:27 +02:00
Arthur Schiwon 87bd5a2bbb cleanup, doc and todo 2013-10-17 19:13:27 +02:00
Arthur Schiwon 3cafcc2d47 LDAP Wizard: add detection, load and save of LDAP groups for filter purposes 2013-10-17 19:13:27 +02:00
Arthur Schiwon 5425511259 Remove debug output 2013-10-17 19:13:27 +02:00
Arthur Schiwon ee1b597345 css cleanup 2013-10-17 19:13:27 +02:00
Arthur Schiwon 3b1822cf91 LDAP Wizard: add detection, load and save of LDAP objectClasses for filter purposes 2013-10-17 19:13:27 +02:00
Arthur Schiwon 8290929aa6 LDAP Wizard: autodetect base DN 2013-10-17 19:13:14 +02:00
Arthur Schiwon 7c60384f20 ignore autodetect-attribute on public save method 2013-10-17 19:13:14 +02:00
Arthur Schiwon 3fe400a3ca Simplify WizardResult 2013-10-17 19:13:14 +02:00
Arthur Schiwon 53db1fe5ac First stage of new Wizard, neither feature complete nor ready 2013-10-17 19:13:14 +02:00
Arthur Schiwon 652caa1c88 LDAP: move Configuration out of Connection into class of its own. The new wizard requires it. 2013-10-17 19:13:14 +02:00
Arthur Schiwon 02f292d0fd Doc fix 2013-10-17 19:01:08 +02:00
Jenkins for ownCloud 630be99ddf [tx-robot] updated from transifex 2013-10-16 00:31:48 -04:00
Jenkins for ownCloud f3336f8877 [tx-robot] updated from transifex 2013-10-13 20:33:30 -04:00
Jenkins for ownCloud 44a5b0bad0 [tx-robot] updated from transifex 2013-10-10 22:30:58 -04:00
blizzz 666e52a46b Merge pull request #5114 from owncloud/ldap_uuid_attr_groups
LDAP: allow different UUID attributes for groups and users
2013-10-10 03:27:28 -07:00
Jenkins for ownCloud 3613e79e10 [tx-robot] updated from transifex 2013-10-06 19:16:10 -04:00
raghunayyar cf84154ee0 Cleans up Core apps for relative(em) to absolute(px) styles. 2013-10-06 23:38:24 +05:30
Arthur Schiwon 0c837cefb6 LDAP: allow different UUID attributes for groups and users 2013-10-04 11:47:40 +02:00
Morris Jobke c38638fdf4 Merge pull request #4815 from owncloud/ldap_improve_testing
LDAP modularization and tests
2013-10-04 02:41:06 -07:00
Jenkins for ownCloud a711399e62 [tx-robot] updated from transifex 2013-09-30 10:19:22 -04:00
Arthur Schiwon 3e1bdd8a04 remove outdated (thus failing) and anyway insufficient group tests - for now 2013-09-27 13:34:16 +02:00
Arthur Schiwon 05ee6606f1 give test file a proper name 2013-09-27 13:34:16 +02:00
Arthur Schiwon 2cebd8b92e added user_ldap tests via public api calls 2013-09-27 13:34:16 +02:00
Arthur Schiwon a1aff3e8a1 LDAP: don't throw exceptions in the wrapper, errors are handled in the code. nevertheless, log unexpected errors 2013-09-27 13:34:16 +02:00
Arthur Schiwon 81cf4a22ef LDAP: coding style 2013-09-27 13:34:15 +02:00
Arthur Schiwon 84f522f406 LDAP: simple tests for the user backend 2013-09-27 13:34:15 +02:00
Arthur Schiwon bb162b1f94 LDAP: get rid of some PHP Warnings 2013-09-27 13:34:15 +02:00
Arthur Schiwon d4f92494a2 LDAP: make Access be a dependency to the user and group backend instead of inheriting it. 2013-09-27 13:34:15 +02:00
Arthur Schiwon b9cc2ad660 Whitespaces 2013-09-27 13:34:15 +02:00
Arthur Schiwon f04aa1af5d LDAP: don't check var type when you can specify the type in the parameter list 2013-09-27 13:34:15 +02:00
Arthur Schiwon b9cd22cf78 LDAP: use wrapper, not direct function call 2013-09-27 13:34:15 +02:00
Arthur Schiwon 5090ca3eb4 LDAP: add phpdoc 2013-09-27 13:34:15 +02:00
Arthur Schiwon 6e850e0bee LDAP: establish wrapper interface to allow proper mocking 2013-09-27 13:34:15 +02:00
Arthur Schiwon 52454e39b7 LDAP: move is_resource check to ldap wrapper to make it mockable 2013-09-27 13:34:15 +02:00
Arthur Schiwon d34fbf3a86 LDAP: move PHP LDAP functions calls to an LDAP Wrapper for better isolation and mock testing 2013-09-27 13:34:15 +02:00
Arthur Schiwon 1a020e0696 Resolve merge conflict 2013-09-27 13:34:15 +02:00
Jenkins for ownCloud f31d31844e [tx-robot] updated from transifex 2013-09-27 00:02:30 -04:00
Jenkins for ownCloud 28918d61d2 [tx-robot] updated from transifex 2013-09-22 12:58:42 -04:00
Jenkins for ownCloud 5b95e7aa0f [tx-robot] updated from transifex 2013-09-20 10:50:14 -04:00
Jenkins for ownCloud 6b1843d91b [tx-robot] updated from transifex 2013-09-18 11:50:02 -04:00
Jenkins for ownCloud 556bd1ef23 [tx-robot] updated from transifex 2013-09-13 21:49:24 -04:00
Jenkins for ownCloud 68015b2761 [tx-robot] updated from transifex 2013-09-11 06:50:06 -04:00
Jenkins for ownCloud 72689f643b [tx-robot] updated from transifex 2013-09-10 10:42:16 -04:00
Jenkins for ownCloud 0527fb05ad [tx-robot] updated from transifex 2013-09-05 07:37:32 -04:00
Jenkins for ownCloud dbc78b1a58 [tx-robot] updated from transifex 2013-08-30 09:38:20 -04:00
Arthur Schiwon 321c514782 LDAP: case insensitive replace for more robustness 2013-08-27 22:23:48 +02:00
Jenkins for ownCloud d5062b9e0e [tx-robot] updated from transifex 2013-08-27 11:23:18 -04:00
Thomas Müller c9123263ab kill zh_CN.GB2312 2013-08-27 01:27:05 +02:00
Jenkins for ownCloud d587146a5a [tx-robot] updated from transifex 2013-08-25 19:21:52 -04:00
Jenkins for ownCloud 596ac40b7f [tx-robot] updated from transifex 2013-08-23 20:17:08 -04:00
Jenkins for ownCloud 02b2b5a808 [tx-robot] updated from transifex 2013-08-22 10:37:23 -04:00
Arthur Schiwon c482512e23 LDAP: fix wrong hook name 2013-08-22 00:00:33 +02:00
Jenkins for ownCloud a89199cc7b [tx-robot] updated from transifex 2013-08-21 08:14:27 -04:00
Christopher 90da518e3e Merge pull request #4262 from owncloud/fix_jslint_kondou
Fix some JSLint warnings
2013-08-20 12:45:10 -07:00
Jenkins for ownCloud e9644c2f52 [tx-robot] updated from transifex 2013-08-19 15:14:38 -04:00
Kondou c7af26ec84 Merge pull request #4497 from owncloud/newlines_at_eof_kondou
Add newlines at the end of files
2013-08-18 07:16:15 -07:00
Bart Visscher dda5eb2530 Merge pull request #4486 from owncloud/ldap_adjust_cache
LDAP: use memcache if available
2013-08-18 02:50:41 -07:00
kondou 9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
Jan-Christoph Borchardt ce9103d522 Merge pull request #4426 from owncloud/ldap_settings_design
Ldap settings design
2013-08-18 01:52:51 -07:00
kondou edd92e4c09 Merge branch 'master' into fix_jslint_kondou
Conflicts:
	apps/files/js/file-upload.js
2013-08-18 00:38:52 +02:00
Arthur Schiwon f41c4312ff LDAP: use memcache if available 2013-08-17 17:22:54 +02:00
Arthur Schiwon c538ac3081 LDAP: only connect to LDAP once on login 2013-08-17 12:16:51 +02:00
Thomas Müller de52157e76 remove ru_RU - fixes #3135 2013-08-17 11:43:37 +02:00
Arthur Schiwon 42fc2295e4 LDAP: Update Host in configuration chooser on Save 2013-08-15 16:10:49 +02:00
Arthur Schiwon 479f893f6d LDAP: Show Host name in configuration drop down 2013-08-15 15:55:06 +02:00
Arthur Schiwon cbfee81068 LDAP: slightly smaller input fields 2013-08-15 12:45:37 +02:00
Arthur Schiwon 7b17fd2f17 LDAP: move small info text strings into tooltips 2013-08-14 16:51:38 +02:00
Arthur Schiwon a4fc9bbe8c LDAP: right align labels on settings page 2013-08-14 16:38:25 +02:00
Jenkins for ownCloud 9492aeffe9 [tx-robot] updated from transifex 2013-08-13 09:13:11 -04:00
Jenkins for ownCloud 98f836363a [tx-robot] updated from transifex 2013-08-09 08:06:31 -04:00
Jenkins for ownCloud 17fe748abc [tx-robot] updated from transifex 2013-08-03 01:56:46 -04:00
Jenkins for ownCloud b037f2dc6e [tx-robot] updated from transifex 2013-08-01 01:57:04 -04:00
kondou aaf0fec9f5 Fix some JSLint warnings 2013-07-31 21:21:02 +02:00
Jenkins for ownCloud 761f40328c [tx-robot] updated from transifex 2013-07-31 02:01:45 -04:00
Jenkins for ownCloud 88e1ccbce3 [tx-robot] updated from transifex 2013-07-30 01:57:50 -04:00
Jenkins for ownCloud 0fde473cb7 [tx-robot] updated from transifex 2013-07-29 01:57:04 -04:00
Jenkins for ownCloud 48621115c1 [tx-robot] updated from transifex 2013-07-28 01:58:28 -04:00
Jenkins for ownCloud fa35650e0a [tx-robot] updated from transifex 2013-07-27 02:03:03 -04:00
Björn Schießle 003ae7b916 use OC_Defaults directly from the template 2013-07-24 12:04:18 +02:00
Thomas Müller 9d91ceade4 fix php syntax 2013-07-24 10:49:33 +02:00
Thomas Müller 1a73e607bd Merge branch 'master' into more-themable-strings
Conflicts:
	lib/template.php
2013-07-24 09:35:33 +02:00
Jenkins for ownCloud 01f3f8e0cc [tx-robot] updated from transifex 2013-07-22 02:03:23 -04:00
Arthur Schiwon f6d133955e LDAP: fix background job, resolves #3528 2013-07-19 18:41:29 +02:00
Jenkins for ownCloud a8acbfdf7b [tx-robot] updated from transifex 2013-07-16 02:06:21 -04:00
Jenkins for ownCloud 3fbf7ab189 [tx-robot] updated from transifex 2013-07-12 02:12:25 +02:00
Jan-Christoph Borchardt 83b2411b81 reword LDAP config and use themable strings, fix rest of #3791 2013-07-11 17:45:13 +02:00
Arthur Schiwon 5387e5c354 LDAP: even better check for emptiness, fixes #3815 2013-07-10 11:39:47 +02:00
Jenkins for ownCloud 3cb4a72960 [tx-robot] updated from transifex 2013-07-08 02:09:41 +02:00
Jenkins for ownCloud 096d7674fc [tx-robot] updated from transifex 2013-07-07 02:06:06 +02:00
Jenkins for ownCloud d2f50bc089 [tx-robot] updated from transifex 2013-06-29 02:09:10 +02:00