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

15243 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Morris Jobke
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
Morris Jobke
5633043ecf Merge pull request #5392 from owncloud/update-3rdparty-submodule 
update 3rdparty submodule
 2013-10-17 07:57:53 -07:00
Morris Jobke
f9bbfad3e5 Fix sharing error message - id -> file name 
fixe #2827
 2013-10-17 16:45:11 +02:00
Frank Karlitschek
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
Thomas Müller
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
Andreas Fischer
5ee74b656c Move OC_Connector_Sabre_Server to expected location. 2013-10-17 16:04:59 +02:00
Bjoern Schiessle
e7dc6b21c8 split up reset()['path'] to make it compatible with older PHP versions 2013-10-17 15:47:36 +02:00
Vincent Petry
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
Thomas Müller
58d1fba436 update 3rdparty submodule 2013-10-17 15:25:43 +02:00
Morris Jobke
e0af42d124 Merge pull request #5389 from owncloud/fix_shell_exec 
only call shell_exec if enabled
 2013-10-17 06:21:04 -07:00
Georg Ehrke
4c5959e1f5 fix comment 2013-10-17 15:19:15 +02:00
Thomas Müller
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
Morris Jobke
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
Vincent Petry
8a5c761239 Added missing var in share.js 2013-10-17 14:39:20 +02:00
Georg Ehrke
521277b8b6 only call shell_exec if enabled 2013-10-17 14:31:07 +02:00
Morris Jobke
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
Frank Karlitschek
d2b1a361cc Merge pull request #5379 from owncloud/undefined-shipped 
fix undefined "shipped"
 2013-10-17 04:37:40 -07:00