59eac3bc29
Correct little typo/bug in log display and remove ending php tag
2011-10-18 20:10:17 +02:00
2ac00b378a
Fix file sharing : Don't give a unused param to execute
2011-10-17 23:39:23 +02:00
492931562f
Fix bookmark listing with mysql: limit is binded as string.
2011-10-17 13:49:33 +02:00
4d1776faf9
catch some edge cases in media player
2011-10-17 01:25:11 +02:00
595b13f1e0
prevent the remaining ob_clean related errors
2011-10-17 01:18:02 +02:00
330c513015
prevent error in media player ajax api
2011-10-17 00:25:13 +02:00
1f6be85719
Fix bookmarks app to work with postgresql.
...
Rework the bookmark app to manage postgresql.
Add a fetchOne function into the PdoStmtWrapper
Fix a tipo in comments.
2011-10-16 23:03:03 +02:00
b0127e3918
use OC_Log instead of error_log
2011-10-16 21:42:24 +02:00
323a98adb7
Merge branch 'master' of gitorious.org:owncloud/owncloud into calendar
2011-10-15 17:16:00 +02:00
c383543ec9
Remove unused parameter
2011-10-15 11:45:58 +02:00
9cfae56df5
Fix calendar colors with new calendar
2011-10-15 11:45:58 +02:00
8d4039b678
Add loading message to image lightbox and tweak events
2011-10-14 23:51:51 +02:00
8450785379
Merge commit 'refs/merge-requests/57' of git://gitorious.org/owncloud/owncloud
2011-10-14 20:38:42 +02:00
ea8461e83d
scrolling in calendar
2011-10-14 13:46:28 +02:00
a01d10e57d
Merge branch 'master' into calendar
2011-10-13 21:59:16 +02:00
8da00e2d9a
avoiding notice if ['HTTPS'] is not set
2011-10-13 15:50:08 +02:00
c86d1824fe
Improve handling of calendar export $_GET params
...
* a notice would be reported if either of the 'cal' or 'event' $_GET params
where not supplied, which would result in 'Cannot modify header information'
warnings
2011-10-12 15:23:39 +11:00
ef8826ac2d
remove 'description' from OC_Connector_Sabre_CalDAV propertyMap
...
* the description field was removed in commit:
f3f5d775b5
2011-10-12 15:10:59 +11:00
4cbae823eb
Merge branch 'master' into calendar
2011-10-10 21:08:11 +02:00
f49ecee24c
reload calendar automatically
2011-10-10 12:03:30 +02:00
e2468c4343
fix webfinger install script
2011-10-09 17:24:18 +02:00
6e62911a4e
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-09 17:13:34 +02:00
f4fb6356cd
use install.php properly
2011-10-09 17:12:16 +02:00
203f7a3a87
Move contact delete button to top right corner
2011-10-09 00:04:37 +02:00
88aa40e6ac
Show add contact form on opening contacts page
2011-10-09 00:04:37 +02:00
19d4e6e1d5
apps/bookmarks: remove unused variable
...
This is not needed anymore since commit
6b64aa3faf
2011-10-08 21:07:43 +02:00
4a4e6eb071
apps/bookmarks: follow redirects when fetching title
...
This solves a problem where hitting a redirect page would lead to a "302
Found" title.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-10-08 20:36:40 +02:00
deaeab3d92
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-08 15:47:03 +01:00
adebefad84
Fixed editor loading and file saving issue
2011-10-08 15:46:38 +01:00
6b64aa3faf
removed description. changed target to _blank. removed sorting. updated layout.
2011-10-08 13:54:45 +02:00
f3f5d775b5
removed description field for calendar
2011-10-08 13:28:01 +02:00
39e7db7db4
added missing files
2011-10-08 13:11:13 +02:00
590ff0ced9
moved bookmarklet to personal. username must be provided when adding a new user.
2011-10-08 13:10:49 +02:00
0bb3270503
Revert "support of RRULE in calendar app"
...
Reverting as per Georg's request (not stable enough yet)
This reverts commit 55ab68a332
2011-10-08 00:12:57 +02:00
a13d42fdaf
Fixes for adding contact property
2011-10-07 23:01:49 +02:00
46b8703b71
Display contact name without label and in bold
2011-10-07 22:42:50 +02:00
f95e8c62c9
Save the right contact property
2011-10-07 22:38:19 +02:00
8ea9c39241
Fix saving properties with a new contact
2011-10-07 22:25:26 +02:00
bc54f13636
Fix name when adding contact
2011-10-07 21:59:25 +02:00
7e0da0cb25
fix amapache url
2011-10-07 18:13:46 +02:00
65a491eabd
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-07 17:02:56 +01:00
6449a45695
disable openid on default
2011-10-07 17:02:55 +02:00
4fc8e28fba
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-07 16:46:18 +02:00
fa72f1c3cc
some icon corrections
2011-10-07 16:18:47 +02:00
980a0893f0
Change colorselector to use border for selected color
2011-10-07 16:03:26 +02:00
20554be9f4
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-07 00:15:54 +02:00
e345fbd386
conflicts solved
2011-10-06 22:40:11 +02:00
bb26fe9300
Merge commit 'refs/merge-requests/55' of git://gitorious.org/owncloud/owncloud into merge-requests/55
2011-10-06 22:37:06 +02:00
ae56bb63c6
Merge commit 'refs/merge-requests/52' of git://gitorious.org/owncloud/owncloud into merge-requests/52
2011-10-06 22:36:34 +02:00
878178145d
Merge commit 'refs/merge-requests/54' of git://gitorious.org/owncloud/owncloud into merge-requests/54
2011-10-06 22:35:36 +02:00
Brice Maron
Robin Appelman
Georg Ehrke
Bart Visscher
Michiel@unhosted
John Kristensen
Florian Pritz
Tom Needham
Marvin Thomas Rabe
Jan-Christoph Borchardt