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

2065 commits

This branch
This branch
All branches
Author SHA1 Message Date
Georg Ehrke
9ce15667d5 Merge branch 'calendar' of gitorious.org:owncloud/owncloud 2011-10-16 15:41:00 +02:00
Robin Appelman
512d226d43 merge database into master 2011-10-16 13:54:21 +02:00
Brice Maron
5d09a5e37e Add some color in error messages + img for hints 2011-10-16 13:12:11 +02:00
Georg Ehrke
323a98adb7 Merge branch 'master' of gitorious.org:owncloud/owncloud into calendar 2011-10-15 17:16:00 +02:00
Bart Visscher
c383543ec9 Remove unused parameter 2011-10-15 11:45:58 +02:00
Bart Visscher
9cfae56df5 Fix calendar colors with new calendar 2011-10-15 11:45:58 +02:00
Brice Maron
8d4039b678 Add loading message to image lightbox and tweak events 2011-10-14 23:51:51 +02:00
Robin Appelman
f29dc0c0fb correct language name 2011-10-14 20:50:55 +02:00
Robin Appelman
125da4722e Merge commit 'refs/merge-requests/61' of git://gitorious.org/owncloud/owncloud 2011-10-14 20:45:13 +02:00
Robin Appelman
8450785379 Merge commit 'refs/merge-requests/57' of git://gitorious.org/owncloud/owncloud 2011-10-14 20:38:42 +02:00
Robin Appelman
9a5af50f32 Merge commit 'refs/merge-requests/59' of git://gitorious.org/owncloud/owncloud 2011-10-14 20:34:36 +02:00
Brice Maron
169dd7da77 Prevent category in jquery-ui on cal. to overflow 2011-10-14 19:09:07 +02:00
Brice Maron
c0b011e714 Initialise hasOtherDB var when not true in installation 2011-10-14 18:04:50 +02:00
Georg Ehrke
ea8461e83d scrolling in calendar 2011-10-14 13:46:28 +02:00
Georg Ehrke
a01d10e57d Merge branch 'master' into calendar 2011-10-13 21:59:16 +02:00
Robin Appelman
db2fb38746 prevent error involving webdav workaround 2011-10-13 21:55:02 +02:00
Robin Appelman
f1fd374a6f webdav workaround for apache+php-cgi 2011-10-13 16:33:39 +02:00
Robin Appelman
d7fa2a0f77 mimetype icon improvements 2011-10-13 16:33:39 +02:00
Robin Appelman
ffb9a0475e webdav workaround for apache+php-cgi 2011-10-13 16:31:01 +02:00
Michiel@unhosted
8da00e2d9a avoiding notice if ['HTTPS'] is not set 2011-10-13 15:50:08 +02:00
Patrick Stricker
2cc5f5e19e made work with http authentication kind of sso login 2011-10-13 10:04:39 +02:00
John Kristensen
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
John Kristensen
ef8826ac2d remove 'description' from OC_Connector_Sabre_CalDAV propertyMap 
* the description field was removed in commit:
     f3f5d775b5
   but the field was still trying to be mapped - causing errors with CalDAV
 2011-10-12 15:10:59 +11:00
Joar Wandborg
9d3c7badb5 Fixed a bug in checkWebserverUser 
checkWebserverUser would return the owner of the document
root instead of the owner of the web server process.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
 2011-10-11 21:46:14 +02:00
Georg Ehrke
4cbae823eb Merge branch 'master' into calendar 2011-10-10 21:08:11 +02:00
Robin Appelman
9ba384b9a4 merge master into database 2011-10-10 21:05:39 +02:00
Robin Appelman
8b3c4e9a52 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-10-10 20:57:15 +02:00
Frank Karlitschek
6163351ea2 master is now on the way to ownCloud 3 2011-10-10 18:48:40 +02:00
Georg Ehrke
c48fbd3609 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-10-10 12:07:45 +02:00
Georg Ehrke
f49ecee24c reload calendar automatically 2011-10-10 12:03:30 +02:00
Thomas Schmidt
e710bcb6d3 add owncloud autosetup option 2011-10-10 11:48:58 +02:00
Michiel@unhosted
e2468c4343 fix webfinger install script 2011-10-09 17:24:18 +02:00
Michiel@unhosted
6e62911a4e Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-10-09 17:13:34 +02:00
Michiel@unhosted
f4fb6356cd use install.php properly 2011-10-09 17:12:16 +02:00
Bart Visscher
203f7a3a87 Move contact delete button to top right corner 2011-10-09 00:04:37 +02:00
Bart Visscher
88aa40e6ac Show add contact form on opening contacts page 2011-10-09 00:04:37 +02:00
Robin Appelman
949494ccfd mimetype icon improvements 2011-10-08 21:18:47 +02:00
Florian Pritz
19d4e6e1d5 apps/bookmarks: remove unused variable 
This is not needed anymore since commit
6b64aa3faf.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
 2011-10-08 21:07:43 +02:00
Florian Pritz
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
Tom Needham
deaeab3d92 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-08 15:47:03 +01:00
Tom Needham
adebefad84 Fixed editor loading and file saving issue 2011-10-08 15:46:38 +01:00
Marvin Thomas Rabe
bbd96fdd39 webkit searchfield bug fixed 2011-10-08 16:02:43 +02:00
Marvin Thomas Rabe
6b64aa3faf removed description. changed target to _blank. removed sorting. updated layout. 2011-10-08 13:54:45 +02:00
Marvin Thomas Rabe
f3f5d775b5 removed description field for calendar 2011-10-08 13:28:01 +02:00
Marvin Thomas Rabe
39e7db7db4 added missing files 2011-10-08 13:11:13 +02:00
Marvin Thomas Rabe
590ff0ced9 moved bookmarklet to personal. username must be provided when adding a new user. 2011-10-08 13:10:49 +02:00
Jan-Christoph Borchardt
71caa4a20c added code and license links next to version number 2011-10-08 10:10:29 +02:00
Jan-Christoph Borchardt
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
Bart Visscher
a13d42fdaf Fixes for adding contact property 2011-10-07 23:01:49 +02:00
Bart Visscher
46b8703b71 Display contact name without label and in bold 2011-10-07 22:42:50 +02:00