d2d2c9a46d
fixes #5367
2013-10-17 20:20:13 +02:00
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
2845747528
[tx-robot] updated from transifex
2013-10-17 13:48:52 -04:00
6acd01d9f2
resolve merge conflicts from rebase
2013-10-17 19:40:59 +02:00
0b90cc0b4b
Ldap Wizard: also disable tabs, if the first step is not complete
2013-10-17 19:13:29 +02:00
6b160d8507
LDAP Wizard: make Back and Continue work
2013-10-17 19:13:29 +02:00
63e9c56d48
LDAP Wizard: Use Ajax Spinner to indicate something is happening, especiall port detection
2013-10-17 19:13:29 +02:00
f64ae75107
LDAP Wizard: fix couple more or less nasty bugs aka polishing
2013-10-17 19:13:28 +02:00
7ad8319488
do not instantiate LDAP Proxy if there are no active configurations
2013-10-17 19:13:28 +02:00
109ddde944
Wizard: autodetection of group-member-assoc attribute
2013-10-17 19:13:28 +02:00
5606b60f36
LDAP: set displayname as default attribute for user display name
2013-10-17 19:13:28 +02:00
c975021a67
clean up
2013-10-17 19:13:28 +02:00
3ae696f843
Wizard does not need data-defaults here
2013-10-17 19:13:28 +02:00
f6b60c6586
LDAP Wizard: add forgotten templates
2013-10-17 19:13:28 +02:00
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
b2ccb712e2
Ldap Wizard: Group Filter configuration
2013-10-17 19:13:28 +02:00
7c6a9c2256
Ldap Wizard: Login filter UI, detection of username attribute, composing of login filter
2013-10-17 19:13:28 +02:00
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
5c99645f7d
Cleanup code, sort results
2013-10-17 19:13:27 +02:00
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
e87b091536
cleanup and coding style
2013-10-17 19:13:27 +02:00
87bd5a2bbb
cleanup, doc and todo
2013-10-17 19:13:27 +02:00
3cafcc2d47
LDAP Wizard: add detection, load and save of LDAP groups for filter purposes
2013-10-17 19:13:27 +02:00
5425511259
Remove debug output
2013-10-17 19:13:27 +02:00
ee1b597345
css cleanup
2013-10-17 19:13:27 +02:00
3b1822cf91
LDAP Wizard: add detection, load and save of LDAP objectClasses for filter purposes
2013-10-17 19:13:27 +02:00
8290929aa6
LDAP Wizard: autodetect base DN
2013-10-17 19:13:14 +02:00
7c60384f20
ignore autodetect-attribute on public save method
2013-10-17 19:13:14 +02:00
3fe400a3ca
Simplify WizardResult
2013-10-17 19:13:14 +02:00
53db1fe5ac
First stage of new Wizard, neither feature complete nor ready
2013-10-17 19:13:14 +02:00
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
02f292d0fd
Doc fix
2013-10-17 19:01:08 +02:00
d8f22160a4
Merge pull request #5393 from owncloud/files-downloadzipwhenzipsizeiszero
...
Fixed zip download button for unlimited filesize in public mode
2013-10-17 08:23:20 -07:00
5633043ecf
Merge pull request #5392 from owncloud/update-3rdparty-submodule
...
update 3rdparty submodule
2013-10-17 07:57:53 -07:00
6a60a47d59
add options to disable the check for a working .htaccess file in data and for a working WebDAV server. This are advanced settings that are needed in special situations where our check fail and the user runs into an http timeout.
2013-10-17 16:27:43 +02:00
c3c27b3e58
Merge pull request #5394 from owncloud/sabre-server-location
...
Move OC_Connector_Sabre_Server to expected location.
2013-10-17 07:11:50 -07:00
5ee74b656c
Move OC_Connector_Sabre_Server to expected location.
2013-10-17 16:04:59 +02:00
e7dc6b21c8
split up reset()['path'] to make it compatible with older PHP versions
2013-10-17 15:47:36 +02:00
b4bffad99a
Fixed zip download button for unlimited filesize in public mode
...
Added missing condition to check whenever allowed zip size is unlimited.
Fixes #3717
2013-10-17 15:30:08 +02:00
58d1fba436
update 3rdparty submodule
2013-10-17 15:25:43 +02:00
e0af42d124
Merge pull request #5389 from owncloud/fix_shell_exec
...
only call shell_exec if enabled
2013-10-17 06:21:04 -07:00
4c5959e1f5
fix comment
2013-10-17 15:19:15 +02:00
e55d2359b1
removing pointless calls on quoteIdentifier() - reason: name on $tableDiff doesn't exist and my design the name cannot be changed
...
adding PHPDoc
2013-10-17 14:54:37 +02:00
01349850b0
Merge pull request #5381 from owncloud/files-sharingstateafterupload
...
Fixed sharing status update for new/uploaded files
2013-10-17 05:51:12 -07:00
8a5c761239
Added missing var in share.js
2013-10-17 14:39:20 +02:00
521277b8b6
only call shell_exec if enabled
2013-10-17 14:31:07 +02:00
9c8d1190c0
Merge pull request #5385 from owncloud/generate-sql-migration-master
...
new console command to generate sql migration scripts
2013-10-17 04:53:18 -07:00
d2b1a361cc
Merge pull request #5379 from owncloud/undefined-shipped
...
fix undefined "shipped"
2013-10-17 04:37:40 -07:00
467f864db4
Fixed sharing status update for new/uploaded files
...
Creating new files, folders or uploading files now have their sharing
icon updated accordingly.
For this, the global share status list that is cached in
OC.Share.statuses is reused for new files.
Performance should improve as the sharing list is now only loaded once
per navigation session.
In OC.Share, split loadIcons into loadIcons + updateIcons.
Fixes #4977
2013-10-17 12:55:10 +02:00
6e1881dbe4
new console command to generate sql migration scripts
2013-10-17 12:51:30 +02:00
Thomas Müller
Björn Schießle
Arthur Schiwon
Morris Jobke
Frank Karlitschek
Andreas Fischer
Bjoern Schiessle
Vincent Petry
Georg Ehrke