Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
No related branches found
No related tags found
Showing
- apps/bookmarks/addBm.php 0 additions, 1 deletionapps/bookmarks/addBm.php
- apps/bookmarks/ajax/addBookmark.php 2 additions, 3 deletionsapps/bookmarks/ajax/addBookmark.php
- apps/bookmarks/ajax/editBookmark.php 1 addition, 2 deletionsapps/bookmarks/ajax/editBookmark.php
- apps/bookmarks/ajax/updateList.php 1 addition, 1 deletionapps/bookmarks/ajax/updateList.php
- apps/bookmarks/appinfo/app.php 6 additions, 19 deletionsapps/bookmarks/appinfo/app.php
- apps/bookmarks/appinfo/database.xml 0 additions, 7 deletionsapps/bookmarks/appinfo/database.xml
- apps/bookmarks/bookmarksHelper.php 0 additions, 4 deletionsapps/bookmarks/bookmarksHelper.php
- apps/bookmarks/css/bookmarks.css 24 additions, 36 deletionsapps/bookmarks/css/bookmarks.css
- apps/bookmarks/js/addBm.js 1 addition, 2 deletionsapps/bookmarks/js/addBm.js
- apps/bookmarks/js/bookmarks.js 10 additions, 36 deletionsapps/bookmarks/js/bookmarks.js
- apps/bookmarks/settings.php 13 additions, 0 deletionsapps/bookmarks/settings.php
- apps/bookmarks/templates/addBm.php 0 additions, 1 deletionapps/bookmarks/templates/addBm.php
- apps/bookmarks/templates/list.php 12 additions, 14 deletionsapps/bookmarks/templates/list.php
- apps/bookmarks/templates/settings.php 14 additions, 0 deletionsapps/bookmarks/templates/settings.php
- apps/calendar/ajax/createcalendar.php 1 addition, 1 deletionapps/calendar/ajax/createcalendar.php
- apps/calendar/ajax/getcal.php 34 additions, 665 deletionsapps/calendar/ajax/getcal.php
- apps/calendar/ajax/newcalendar.php 0 additions, 1 deletionapps/calendar/ajax/newcalendar.php
- apps/calendar/ajax/updatecalendar.php 1 addition, 1 deletionapps/calendar/ajax/updatecalendar.php
- apps/calendar/appinfo/database.xml 0 additions, 6 deletionsapps/calendar/appinfo/database.xml
- apps/calendar/import.php 1 addition, 1 deletionapps/calendar/import.php
Loading
Please register or sign in to comment