Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

our_own_cloud_project
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents

Snippets Groups Projects

4b616764

Commit 4b616764 authored 12 years ago by Robin Appelman

Downloads
- Plain Diff

Merge branch 'master' into filesystem

parents c22a7237 1313cad1

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

apps/user_ldap/lib/access.php 115 additions, 20 deletions

apps/user_ldap/lib/access.php
apps/user_ldap/lib/connection.php 6 additions, 1 deletion

apps/user_ldap/lib/connection.php
apps/user_ldap/user_ldap.php 29 additions, 15 deletions

apps/user_ldap/user_ldap.php
core/ajax/navigationdetect.php 22 additions, 0 deletions

core/ajax/navigationdetect.php
core/js/jquery.infieldlabel.js 0 additions, 140 deletions

core/js/jquery.infieldlabel.js
core/js/jquery.infieldlabel.min.js 11 additions, 11 deletions

core/js/jquery.infieldlabel.min.js
lib/helper.php 4 additions, 9 deletions

lib/helper.php
lib/public/share.php 30 additions, 1 deletion

lib/public/share.php
settings/js/apps.js 34 additions, 0 deletions

settings/js/apps.js

with 251 additions and 197 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment