Commit Graph

2118 Commits

Author SHA1 Message Date
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
Tom Needham 538abb99f1 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-07 17:10:50 +01:00
Robin Appelman 1f562a2e83 fixes for the mimetype icons 2011-10-07 18:09:49 +02:00
Tom Needham 66db81309b Merge branch 'ace-editor' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-07 17:09:36 +01:00
Tom Needham 65a491eabd Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-07 17:02:56 +01: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
Robin Appelman d0107a0c0a Merge branch 'master' into ace-editor 2011-10-07 00:07:21 +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
Tom Needham d9464de690 Updated saving feedback 2011-10-05 21:59:03 +01:00
Bartek Przybylski f92fa6989e another query fix 2011-10-05 22:28:17 +02:00
Tom Needham 30343f15e2 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-05 20:49:08 +01: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
Tom Needham edd958836e Moved addScript and addStyle calls to app.php 2011-10-05 16:32:01 +01:00
Tom Needham 86825ee3b5 Cleanup of code. Fixed breadcrumb removal issue 2011-10-05 16:10:11 +01: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
Borjan Tchakaloff 5570222b40 Added the missing quotes on the filename. 2011-10-05 15:20:32 +04:00
Borjan Tchakaloff 3388381deb Fixed the 'Undefined index "user_id"' bug when requesting a publicly shared folder and being logged-out.
The OC_App::navigation array contains by default only the help menu.
2011-10-05 14:31:33 +04:00
Borjan Tchakaloff 0cde2a3146 Fixed the file sharing listing bug (filename is empty when it has no extension in a publicly shared folder). 2011-10-05 14:27:50 +04:00
Robin Appelman 15e5bd16ab use texteditor for search results 2011-10-05 02:44:24 +02:00
Robin Appelman c6a73bee5e remove now unneeded textviewer 2011-10-05 02:38:55 +02:00
Robin Appelman 1fba8619d4 move some code to where it belongs and remove duplicated editor app 2011-10-05 02:36:54 +02:00
Robin Appelman a8621265e2 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-10-05 02:11:44 +02:00
Florian Jacob 813e8b274a Added all the remaining extensions to filetypes
mapping which ace-editor supports.
2011-10-05 00:23:16 +02:00
Marvin Thomas Rabe 7579fc7bc9 updated margins 2011-10-04 21:39:13 +02:00