Commit Graph

1945 Commits

Author SHA1 Message Date
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
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
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
Bart Visscher f95e8c62c9 Save the right contact property 2011-10-07 22:38:19 +02:00
Bart Visscher 8ea9c39241 Fix saving properties with a new contact 2011-10-07 22:25:26 +02:00
Bart Visscher bc54f13636 Fix name when adding contact 2011-10-07 21:59:25 +02:00
Robin Appelman 7e0da0cb25 fix amapache url 2011-10-07 18:13:46 +02:00
Robin Appelman 1f562a2e83 fixes for the mimetype icons 2011-10-07 18:09:49 +02:00
Robin Appelman 6449a45695 disable openid on default 2011-10-07 17:02:55 +02:00
Robin Appelman 4fc8e28fba Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-10-07 16:46:18 +02:00
Jan-Christoph Borchardt ab5e26dd32 renamed icons 2011-10-07 16:30:37 +02:00
Jan-Christoph Borchardt fa72f1c3cc some icon corrections 2011-10-07 16:18:47 +02:00
Jan-Christoph Borchardt 0aaa1fb64e added Silk icons by Mark James (CC-BY) 2011-10-07 16:05:39 +02:00
Bart Visscher 980a0893f0 Change colorselector to use border for selected color 2011-10-07 16:03:26 +02:00
Robin Appelman 20554be9f4 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-10-07 00:15:54 +02:00
Marvin Thomas Rabe e345fbd386 conflicts solved 2011-10-06 22:40:11 +02:00
Marvin Thomas Rabe 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
Marvin Thomas Rabe 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
Marvin Thomas Rabe 543e8456b7 Merge commit 'refs/merge-requests/53' of git://gitorious.org/owncloud/owncloud into merge-requests/53 2011-10-06 22:36:06 +02:00
Marvin Thomas Rabe 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
Bart Visscher 3cc7212c82 Add icon for calendar color selector 2011-10-06 21:22:55 +02:00
Bart Visscher b0847a61f5 Start using OC_JSON in gallery app 2011-10-06 21:22:01 +02:00
Bart Visscher 4786ed321e Replace _ in timezone setting with a space 2011-10-06 13:22:36 +02:00
Bart Visscher c28f1e0276 Implement timezone fix from Stephen Rees-Carter 2011-10-06 13:22:36 +02:00
Georg Ehrke bf017fb4bd Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-10-06 13:21:38 +02:00
Georg Ehrke 55ab68a332 support of RRULE in calendar app 2011-10-06 13:21:13 +02:00
Stephen Rees-Carter c853fc75a1 BUGFIX: removed the hard-coded Continent selection for Calendar Timezones. 2011-10-06 10:31:05 +11:00
Stephen Rees-Carter 08c38c8158 Updating .gitignore to ignore *.geany project files. 2011-10-06 10:30:17 +11:00
Bartek Przybylski f92fa6989e another query fix 2011-10-05 22:28:17 +02:00
Michiel@unhosted af6eb52b5e correct wrong variable name in remoteStorage app 2011-10-05 20:01:58 +02:00
Bartek Przybylski d5931b8c48 gallery db query fix 2011-10-05 19:32:30 +02:00
Jan-Christoph Borchardt 28dcbe3cb0 disabled gallery app by default until it's in a branch 2011-10-05 14:54:34 +02:00
Jan-Christoph Borchardt 8e532b5ceb removed extra calendar settings. Also, table layout? 2011-10-05 14:32:25 +02:00