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

58a781d9

Commit 58a781d9 authored 13 years ago by Tom Needham

Downloads
- Plain Diff

Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor

parents ffd47ef4 34a47840

No related branches found

No related tags found

Loading

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

3rdparty/MDB2/Driver/Manager/pgsql.php 3 additions, 3 deletions

3rdparty/MDB2/Driver/Manager/pgsql.php
3rdparty/MDB2/Driver/pgsql.php 1 addition, 1 deletion

3rdparty/MDB2/Driver/pgsql.php
apps/calendar/ajax/importdialog.php 5 additions, 8 deletions

apps/calendar/ajax/importdialog.php
apps/calendar/import.php 104 additions, 28 deletions

apps/calendar/import.php
apps/calendar/import_tmp/Info 2 additions, 0 deletions

apps/calendar/import_tmp/Info
apps/calendar/js/loader.js 67 additions, 5 deletions

apps/calendar/js/loader.js
apps/calendar/templates/part.import.php 22 additions, 64 deletions

apps/calendar/templates/part.import.php
apps/gallery/ajax/galleryOp.php 1 addition, 0 deletions

apps/gallery/ajax/galleryOp.php
apps/gallery/css/styles.css 2 additions, 2 deletions

apps/gallery/css/styles.css
apps/gallery/js/album_cover.js 1 addition, 1 deletion

apps/gallery/js/album_cover.js
apps/gallery/lib/album.php 18 additions, 0 deletions

apps/gallery/lib/album.php
apps/gallery/lib/hooks_handlers.php 55 additions, 37 deletions

apps/gallery/lib/hooks_handlers.php
apps/gallery/lib/photo.php 5 additions, 0 deletions

apps/gallery/lib/photo.php
lib/base.php 1 addition, 1 deletion

lib/base.php
lib/db.php 4 additions, 0 deletions

lib/db.php
settings/personal.php 1 addition, 1 deletion

settings/personal.php

with 292 additions and 151 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