Push to the project "citadel.org ": The branch, master has been updated
via b56384947f2aa5a72dfea0ae90db983f1656f2b9 (commit)
via 608f0be330912658d8294a084cb773496d849ce8 (commit)
via ead34672ccee9ecd84a34ebd2db8441efe81dbd5 (commit)
from 1423eb9402b934a3f524a9b7bfd593e9b004cc0a (commit)
Those revisions listed above that are new to this repository have not appeared
on any other notification email; so we list those revisions in full, below.
- Log -----------------------------------------------------------------
http://code.citadel.org/cgit.cgi/git.citadel.org/commit/?id=b56384947f2aa5a72dfea0ae90db983f1656f2b9
commit b56384947f2aa5a72dfea0ae90db983f1656f2b9
Author: the_mgt <the...@ueberserver.de>
Date: Sun Jul 3 02:01:58 2011 +0200
Merged the changes dothebart and I did, wasnt that hard
http://code.citadel.org/cgit.cgi/git.citadel.org/commit/?id=608f0be330912658d8294a084cb773496d849ce8
commit 608f0be330912658d8294a084cb773496d849ce8
Merge: ead3467 1423eb9
Author: the_mgt <the...@ueberserver.de>
Date: Sun Jul 3 01:38:15 2011 +0200
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
Conflicts:
webcit/sieve.c
commit 1423eb9402b934a3f524a9b7bfd593e9b004cc0a
Merge: af9dbef 19f791f
Author: Wilfried Goesgens <dotheb...@citadel.org>
Date: Sat Jul 2 22:44:48 2011 +0000
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
Conflicts:
webcit/sieve.c
commit af9dbefecea322adce7a5837da7497f20d0939ab
Author: Wilfried Goesgens <dotheb...@citadel.org>
Date: Sat Jul 2 21:10:16 2011 +0000
Templatize sieve rules editor; return success/fail state of serverwrite
- return status of sending stuff to citserver, so we can abort loops in
time if our connection dies.
- add sieve scripts lists with content to the session for one request
- add hooks for listing sieve scripts and their contents
- add parser for our webcit embedded sieve editor
- add hooks for our webcit embedded sieve editor
- add templates with the contents from sieve.c
commit b77706908b601fa7dc740422f2f8db8b580d0af2
Author: Wilfried Goesgens <dotheb...@citadel.org>
Date: Sat Jul 2 21:07:39 2011 +0000
remove duplicate var instance.
http://code.citadel.org/cgit.cgi/git.citadel.org/commit/?id=ead34672ccee9ecd84a34ebd2db8441efe81dbd5
commit ead34672ccee9ecd84a34ebd2db8441efe81dbd5
Author: the_mgt <the...@ueberserver.de>
Date: Sun Jul 3 01:28:46 2011 +0200
Renamed the /icons directory to /webcit_icons because of incompatibility
with symlinking to local iconset for mimetypes
Also changed the references to reflect the new positions
-----------------------------------------------------------------------
Summary of changes:
webcit/addressbook_popup.c | 4 +-
webcit/buildpackages | 2 +-
webcit/calendar.c | 10 ++--
webcit/calendar_view.c | 12 +++---
webcit/debian/citadel-webcit.links | 2 +-
webcit/downloads.c | 4 +-
webcit/event.c | 2 +-
webcit/openid.c | 2 +-
webcit/roomchat.c | 2 +-
webcit/sieve.c | 10 ++--
webcit/smtpqueue.c | 2 +-
webcit/static/instant_messenger.html | 2 +-
webcit/static/styles/iconbaricns.css | 24 +++++-----
webcit/static/styles/webcit.css | 26 ++++++------
webcit/static/t/aide/edituser/select.html | 2 +-
webcit/static/t/aide/serverrestart/box.html | 2 +-
.../static/t/aide/serverrestart/box_page_do.html | 2 +-
webcit/static/t/confirmlogoff.html | 4 +-
webcit/static/t/edit_message.html | 12 +++---
webcit/static/t/edit_message/attachments_pane.html | 6 +-
webcit/static/t/files/section_onefile.html | 2 +-
webcit/static/t/get_logged_in.html | 6 +-
webcit/static/t/iconbar/edit.html | 20 ++++----
webcit/static/t/iconbar/save.html | 2 +-
webcit/static/t/msg_listview.html | 2 +-
webcit/static/t/navbar.html | 46 ++++++++++----------
webcit/static/t/openid_manual_create.html | 2 +-
webcit/static/t/room/edit/tab_access.html | 2 +-
webcit/static/t/room/edit/tab_listserv.html | 2 +-
webcit/static/t/room/view_picture.html | 18 ++++----
webcit/static/t/room/zap_entry.html | 4 +-
webcit/static/t/roomchat.html | 2 +-
webcit/static/t/vnoteitem.html | 4 +-
webcit/static/t/who.html | 2 +-
webcit/static/t/who/bio.html | 25 +++++++++++
webcit/static/t/who/box_list_static.html | 2 +-
webcit/static/t/who/section.html | 6 +-
webcit/static/t/who/summary_section.html | 6 +-
webcit/static/{icons => webcit_icons}/8paint16.gif | Bin 1033 -> 1033 bytes
webcit/static/{icons => webcit_icons}/blank.gif | Bin 42 -> 42 bytes
webcit/static/{icons => webcit_icons}/bubble.gif | Bin 1535 -> 1535 bytes
.../{icons => webcit_icons}/bubble_filler.gif | Bin 71 -> 71 bytes
.../citadel-button-32x32.gif | Bin 1549 -> 1549 bytes
.../static/{icons => webcit_icons}/closewindow.gif | Bin 357 -> 357 bytes
webcit/static/{icons => webcit_icons}/delete.gif | Bin 330 -> 330 bytes
.../{icons => webcit_icons}/down_pointer.gif | Bin 165 -> 165 bytes
webcit/static/{icons => webcit_icons}/error.gif | Bin 1332 -> 1332 bytes
.../{icons => webcit_icons}/essen/16x16/abort.png | Bin 640 -> 640 bytes
.../essen/16x16/account.png | Bin 497 -> 497 bytes
.../essen/16x16/activeuser.png | Bin 739 -> 739 bytes
.../essen/16x16/addcontact.png | Bin 738 -> 738 bytes
.../essen/16x16/attachement.png | Bin 481 -> 481 bytes
.../{icons => webcit_icons}/essen/16x16/back.png | Bin 490 -> 490 bytes
.../{icons => webcit_icons}/essen/16x16/blog.png | Bin 503 -> 503 bytes
.../essen/16x16/calendar.png | Bin 533 -> 533 bytes
.../{icons => webcit_icons}/essen/16x16/chat.png | Bin 456 -> 456 bytes
.../{icons => webcit_icons}/essen/16x16/config.png | Bin 830 -> 830 bytes
.../essen/16x16/contacts.png | Bin 531 -> 531 bytes
.../{icons => webcit_icons}/essen/16x16/delete.png | Bin 603 -> 603 bytes
.../{icons => webcit_icons}/essen/16x16/draft.png | Bin 654 -> 654 bytes
.../{icons => webcit_icons}/essen/16x16/email.png | Bin 580 -> 580 bytes
.../{icons => webcit_icons}/essen/16x16/file.png | Bin 508 -> 508 bytes
.../essen/16x16/forward.png | Bin 495 -> 495 bytes
.../{icons => webcit_icons}/essen/16x16/logout.png | Bin 724 -> 724 bytes
.../essen/16x16/network.png | Bin 503 -> 503 bytes
.../essen/16x16/nextroom.png | Bin 467 -> 467 bytes
.../{icons => webcit_icons}/essen/16x16/note.png | Bin 463 -> 463 bytes
.../{icons => webcit_icons}/essen/16x16/pen.png | Bin 652 -> 652 bytes
.../{icons => webcit_icons}/essen/16x16/pencil.png | Bin 604 -> 604 bytes
.../essen/16x16/readallmsg.png | Bin 491 -> 491 bytes
.../essen/16x16/refresh.png | Bin 707 -> 707 bytes
.../{icons => webcit_icons}/essen/16x16/room.png | Bin 400 -> 400 bytes
.../{icons => webcit_icons}/essen/16x16/rss.png | Bin 623 -> 623 bytes
.../{icons => webcit_icons}/essen/16x16/search.png | Bin 712 -> 712 bytes
.../essen/16x16/skiproom.png | Bin 479 -> 479 bytes
.../essen/16x16/summary.png | Bin 921 -> 921 bytes
.../{icons => webcit_icons}/essen/16x16/task.png | Bin 349 -> 349 bytes
.../essen/16x16/taskday.png | Bin 512 -> 512 bytes
.../{icons => webcit_icons}/essen/16x16/user.png | Bin 719 -> 719 bytes
.../{icons => webcit_icons}/essen/32x32/abort.png | Bin 1409 -> 1409 bytes
.../essen/32x32/account.png | Bin 1038 -> 1038 bytes
.../essen/32x32/activeuser.png | Bin 2013 -> 2013 bytes
.../essen/32x32/addcontact.png | Bin 2075 -> 2075 bytes
.../essen/32x32/attachement.png | Bin 1073 -> 1073 bytes
.../{icons => webcit_icons}/essen/32x32/back.png | Bin 728 -> 728 bytes
.../{icons => webcit_icons}/essen/32x32/blog.png | Bin 812 -> 812 bytes
.../essen/32x32/calendar.png | Bin 968 -> 968 bytes
.../{icons => webcit_icons}/essen/32x32/chat.png | Bin 721 -> 721 bytes
.../{icons => webcit_icons}/essen/32x32/check.png | Bin 1504 -> 1504 bytes
.../{icons => webcit_icons}/essen/32x32/config.png | Bin 2228 -> 2228 bytes
.../essen/32x32/contact.png | Bin 1272 -> 1272 bytes
.../{icons => webcit_icons}/essen/32x32/draft.png | Bin 1168 -> 1168 bytes
.../{icons => webcit_icons}/essen/32x32/email.png | Bin 1118 -> 1118 bytes
.../{icons => webcit_icons}/essen/32x32/feed.png | Bin 1232 -> 1232 bytes
.../{icons => webcit_icons}/essen/32x32/file.png | Bin 1018 -> 1018 bytes
.../essen/32x32/forward.png | Bin 717 -> 717 bytes
.../{icons => webcit_icons}/essen/32x32/logout.png | Bin 1766 -> 1766 bytes
.../essen/32x32/network.png | Bin 871 -> 871 bytes
.../essen/32x32/nextroom.png | Bin 913 -> 913 bytes
.../{icons => webcit_icons}/essen/32x32/note.png | Bin 809 -> 809 bytes
.../{icons => webcit_icons}/essen/32x32/pen.png | Bin 1427 -> 1427 bytes
.../{icons => webcit_icons}/essen/32x32/pencil.png | Bin 1319 -> 1319 bytes
.../essen/32x32/readallmsg.png | Bin 859 -> 859 bytes
.../essen/32x32/refresh.png | Bin 1621 -> 1621 bytes
.../{icons => webcit_icons}/essen/32x32/room.png | Bin 633 -> 633 bytes
.../{icons => webcit_icons}/essen/32x32/search.png | Bin 1711 -> 1711 bytes
.../essen/32x32/skiproom.png | Bin 891 -> 891 bytes
.../essen/32x32/summary.png | Bin 2343 -> 2343 bytes
.../{icons => webcit_icons}/essen/32x32/task.png | Bin 1060 -> 1060 bytes
.../essen/32x32/taskday.png | Bin 1099 -> 1099 bytes
.../{icons => webcit_icons}/essen/32x32/user.png | Bin 2015 -> 2015 bytes
.../{icons => webcit_icons}/openid-32x32.gif | Bin 1424 -> 1424 bytes
.../{icons => webcit_icons}/openid-small.gif | Bin 237 -> 237 bytes
.../{icons => webcit_icons}/resizecorner.png | Bin 530 -> 530 bytes
.../{icons => webcit_icons}/resizegrippy.gif | Bin 144 -> 144 bytes
.../static/{icons => webcit_icons}/sort_none.gif | Bin 133 -> 133 bytes
webcit/static/{icons => webcit_icons}/throbber.gif | Bin 12249 -> 12249 bytes
.../static/{icons => webcit_icons}/up_pointer.gif | Bin 165 -> 165 bytes
webcit/subst.c | 6 +-
webcit/summary.c | 2 +-
webcit/userlist.c | 4 +-
webcit/vcard_edit.c | 2 +-
122 files changed, 162 insertions(+), 137 deletions(-)
create mode 100644 webcit/static/t/who/bio.html
rename webcit/static/{icons => webcit_icons}/8paint16.gif (100%)
rename webcit/static/{icons => webcit_icons}/blank.gif (100%)
rename webcit/static/{icons => webcit_icons}/bubble.gif (100%)
rename webcit/static/{icons => webcit_icons}/bubble_filler.gif (100%)
rename webcit/static/{icons => webcit_icons}/citadel-button-32x32.gif (100%)
rename webcit/static/{icons => webcit_icons}/closewindow.gif (100%)
rename webcit/static/{icons => webcit_icons}/delete.gif (100%)
rename webcit/static/{icons => webcit_icons}/down_pointer.gif (100%)
rename webcit/static/{icons => webcit_icons}/error.gif (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/abort.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/account.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/activeuser.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/addcontact.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/attachement.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/back.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/blog.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/calendar.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/chat.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/config.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/contacts.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/delete.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/draft.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/email.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/file.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/forward.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/logout.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/network.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/nextroom.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/note.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/pen.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/pencil.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/readallmsg.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/refresh.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/room.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/rss.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/search.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/skiproom.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/summary.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/task.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/taskday.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/16x16/user.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/abort.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/account.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/activeuser.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/addcontact.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/attachement.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/back.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/blog.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/calendar.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/chat.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/check.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/config.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/contact.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/draft.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/email.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/feed.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/file.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/forward.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/logout.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/network.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/nextroom.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/note.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/pen.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/pencil.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/readallmsg.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/refresh.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/room.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/search.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/skiproom.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/summary.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/task.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/taskday.png (100%)
rename webcit/static/{icons => webcit_icons}/essen/32x32/user.png (100%)
rename webcit/static/{icons => webcit_icons}/openid-32x32.gif (100%)
rename webcit/static/{icons => webcit_icons}/openid-small.gif (100%)
rename webcit/static/{icons => webcit_icons}/resizecorner.png (100%)
rename webcit/static/{icons => webcit_icons}/resizegrippy.gif (100%)
rename webcit/static/{icons => webcit_icons}/sort_none.gif (100%)
rename webcit/static/{icons => webcit_icons}/throbber.gif (100%)
rename webcit/static/{icons => webcit_icons}/up_pointer.gif (100%)
hooks/post-receive
--
citadel.org
