Vincent Petry
|
7a1d0b8497
|
Merge pull request #5321 from owncloud/settings-applistwidths
Fixed app list right container to not overlap left container scrollbar
|
2013-10-18 05:18:49 -07:00 |
Frank Karlitschek
|
05523e7a70
|
Merge pull request #3219 from owncloud/disabled-links-ui
Disabled links UI fixes
|
2013-10-18 05:02:06 -07:00 |
Arthur Schiwon
|
33c4747fdf
|
Use display name from magic cookie, fixes #4884
|
2013-10-18 13:36:33 +02:00 |
Björn Schießle
|
c954b04973
|
Merge pull request #5412 from owncloud/fix_5141
give getSelectedFilesTrash() a unique name for the trash.js
|
2013-10-18 03:51:54 -07:00 |
Morris Jobke
|
1f1fcc6129
|
Remove "link" shares right after disabling the "allow_link_share" setting
|
2013-10-18 11:37:13 +02:00 |
Bjoern Schiessle
|
1c611a3dfb
|
give getSelectedFilesTrash() a unique name for the trash.js to avoid confusions with the same function in files.js
|
2013-10-18 10:57:10 +02:00 |
Vincent Petry
|
33cf4708d5
|
Merge pull request #5411 from owncloud/ocs_share_api_cleanup
filter duplicates directly in the sql query
|
2013-10-18 01:41:15 -07:00 |
Morris Jobke
|
0febccee49
|
readability: single line -> multiple lines
|
2013-10-18 10:39:02 +02:00 |
Michael Gapczynski
|
7f9ff51308
|
Fix accidental deletion of if
|
2013-10-18 10:34:31 +02:00 |
Michael Gapczynski
|
a2c80bbc68
|
Don't show links option in dropdown if disabled
|
2013-10-18 10:34:30 +02:00 |
Michael Gapczynski
|
4cf328e3b9
|
Don't return links for shared files if disabled
|
2013-10-18 10:34:30 +02:00 |
Morris Jobke
|
0755aca501
|
Merge pull request #5405 from owncloud/sharing-chromehangswithversionenabled
Disable versions app JS in public mode
|
2013-10-18 01:27:30 -07:00 |
Bjoern Schiessle
|
48cd9d9444
|
filter duplicates directly in the sql query
|
2013-10-18 10:23:34 +02:00 |
Vincent Petry
|
5c5621d84e
|
Merge pull request #5395 from owncloud/more_check_options
add options to disable the check for a working .htaccess file in data
|
2013-10-18 01:23:20 -07:00 |
Vincent Petry
|
11cfb9dc48
|
Merge pull request #5358 from owncloud/postinstall-ocdavclientwithtimeout
Added timeout for WebDAV post setup check
|
2013-10-18 01:10:04 -07:00 |
Vincent Petry
|
b1f72edc57
|
Fixed spaces
|
2013-10-17 23:22:19 +02:00 |
Vincent Petry
|
41c6c44221
|
Disable versions app JS in public mode
Since the version JS code isn't used in public link mode, disable it to
prevent Chrome freezing bugs due to the t() call being synchronous.
Fixes #4545
|
2013-10-17 21:04:18 +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 |
Jan-Christoph Borchardt
|
07b885e291
|
correctly position ... overflow in breadcrumbs, fix #5158
|
2013-10-17 21:22:55 +03:00 |
Thomas Müller
|
d2d2c9a46d
|
fixes #5367
|
2013-10-17 20:20:13 +02:00 |
Björn Schießle
|
76be7cd1ac
|
Merge pull request #5382 from owncloud/sharing_api_include_reshares
add reshare option for the OCS Share API
|
2013-10-17 11:07:47 -07: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 |