Push to the project "citadel.org ": The branch, master has been updated
via ae972bc8e758bdc8d92fcd2b9571aeeccd32101d (commit)
via 02e276e3229bd93deac8926195c624f063f931e3 (commit)
via fb3ea255b85754d58344d116e2f3a130fd2c8fe7 (commit)
from b6292366a603fa89e22afcce4c3d4a7f5bafc268 (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=ae972bc8e758bdc8d92fcd2b9571aeeccd32101d
commit ae972bc8e758bdc8d92fcd2b9571aeeccd32101d
Merge: 02e276e b629236
Author: the_mgt <[email protected]>
Date: Fri Jul 1 03:06:58 2011 +0200
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
commit b6292366a603fa89e22afcce4c3d4a7f5bafc268
Merge: db483f6 850f3b4
Author: Wilfried Goesgens <[email protected]>
Date: Thu Jun 30 21:13:10 2011 +0000
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
commit db483f6909c7371d06cdabf807de235880fd334c
Author: Wilfried Goesgens <[email protected]>
Date: Thu Jun 30 21:11:14 2011 +0000
fix off by one while checking for the maximum number of tokens
http://code.citadel.org/cgit.cgi/git.citadel.org/commit/?id=02e276e3229bd93deac8926195c624f063f931e3
commit 02e276e3229bd93deac8926195c624f063f931e3
Author: the_mgt <[email protected]>
Date: Fri Jul 1 03:05:37 2011 +0200
reverted 755 permissions on files to 644. Wherever that came from, sorry...
Also renamed an icon to the proper .png name
http://code.citadel.org/cgit.cgi/git.citadel.org/commit/?id=fb3ea255b85754d58344d116e2f3a130fd2c8fe7
commit fb3ea255b85754d58344d116e2f3a130fd2c8fe7
Author: the_mgt <[email protected]>
Date: Fri Jul 1 02:53:43 2011 +0200
Added new iconset "Essen" from http://pc.de/icons/ and modified all files
under static/t accordingly
Icons are in subfolder "icons/essen" so we can eventually add other
iconsets and make them choosable from Webcit
Moved some commonly used icons we need to keep to newly created icons/ dir
Old icons will go to subfolder "icons/old" after the transition, so retro
enthusiasts can choose them eventually
Places in c-files will follow in next commit
-----------------------------------------------------------------------
Summary of changes:
webcit/static/{ => icons}/8paint16.gif | Bin 1033 -> 1033 bytes
webcit/static/{ => icons}/bubble.gif | Bin 1535 -> 1535 bytes
webcit/static/{ => icons}/bubble_filler.gif | Bin 71 -> 71 bytes
webcit/static/{ => icons}/citadel-button-32x32.gif | Bin 1549 -> 1549 bytes
webcit/static/{ => icons}/closewindow.gif | Bin 357 -> 357 bytes
webcit/static/icons/essen/16x16/account.png | Bin 0 -> 497 bytes
webcit/static/icons/essen/16x16/activeuser.png | Bin 0 -> 739 bytes
webcit/static/icons/essen/16x16/addcontact.png | Bin 0 -> 738 bytes
webcit/static/icons/essen/16x16/attachement.png | Bin 0 -> 481 bytes
webcit/static/icons/essen/16x16/back.png | Bin 0 -> 490 bytes
webcit/static/icons/essen/16x16/blog.png | Bin 0 -> 503 bytes
webcit/static/icons/essen/16x16/calendar.png | Bin 0 -> 533 bytes
webcit/static/icons/essen/16x16/chat.png | Bin 0 -> 456 bytes
webcit/static/icons/essen/16x16/config.png | Bin 0 -> 830 bytes
webcit/static/icons/essen/16x16/contacts.png | Bin 0 -> 531 bytes
webcit/static/icons/essen/16x16/delete.png | Bin 0 -> 640 bytes
webcit/static/icons/essen/16x16/draft.png | Bin 0 -> 654 bytes
webcit/static/icons/essen/16x16/email.png | Bin 0 -> 580 bytes
webcit/static/icons/essen/16x16/file.png | Bin 0 -> 508 bytes
webcit/static/icons/essen/16x16/forward.png | Bin 0 -> 495 bytes
webcit/static/icons/essen/16x16/logout.png | Bin 0 -> 724 bytes
webcit/static/icons/essen/16x16/network.png | Bin 0 -> 503 bytes
webcit/static/icons/essen/16x16/nextroom.png | Bin 0 -> 467 bytes
webcit/static/icons/essen/16x16/note.png | Bin 0 -> 463 bytes
webcit/static/icons/essen/16x16/pen.png | Bin 0 -> 652 bytes
webcit/static/icons/essen/16x16/pencil.png | Bin 0 -> 604 bytes
webcit/static/icons/essen/16x16/readallmsg.png | Bin 0 -> 491 bytes
webcit/static/icons/essen/16x16/refresh.png | Bin 0 -> 707 bytes
webcit/static/icons/essen/16x16/room.png | Bin 0 -> 400 bytes
webcit/static/icons/essen/16x16/rss.png | Bin 0 -> 623 bytes
webcit/static/icons/essen/16x16/search.png | Bin 0 -> 712 bytes
webcit/static/icons/essen/16x16/skiproom.png | Bin 0 -> 479 bytes
webcit/static/icons/essen/16x16/summary.png | Bin 0 -> 921 bytes
webcit/static/icons/essen/16x16/task.png | Bin 0 -> 349 bytes
webcit/static/icons/essen/16x16/taskday.png | Bin 0 -> 512 bytes
webcit/static/icons/essen/16x16/user.png | Bin 0 -> 719 bytes
webcit/static/icons/essen/32x32/account.png | Bin 0 -> 1038 bytes
webcit/static/icons/essen/32x32/activeuser.png | Bin 0 -> 2013 bytes
webcit/static/icons/essen/32x32/addcontact.png | Bin 0 -> 2075 bytes
webcit/static/icons/essen/32x32/attachement.png | Bin 0 -> 1073 bytes
webcit/static/icons/essen/32x32/back.png | Bin 0 -> 728 bytes
webcit/static/icons/essen/32x32/blog.png | Bin 0 -> 812 bytes
webcit/static/icons/essen/32x32/calendar.png | Bin 0 -> 968 bytes
webcit/static/icons/essen/32x32/chat.png | Bin 0 -> 721 bytes
webcit/static/icons/essen/32x32/check.png | Bin 0 -> 1504 bytes
webcit/static/icons/essen/32x32/config.png | Bin 0 -> 2228 bytes
webcit/static/icons/essen/32x32/contact.png | Bin 0 -> 1272 bytes
webcit/static/icons/essen/32x32/delete.png | Bin 0 -> 1409 bytes
webcit/static/icons/essen/32x32/draft.png | Bin 0 -> 1168 bytes
webcit/static/icons/essen/32x32/email.png | Bin 0 -> 1118 bytes
webcit/static/icons/essen/32x32/feed.png | Bin 0 -> 1232 bytes
webcit/static/icons/essen/32x32/file.png | Bin 0 -> 1018 bytes
webcit/static/icons/essen/32x32/forward.png | Bin 0 -> 717 bytes
webcit/static/icons/essen/32x32/logout.png | Bin 0 -> 1766 bytes
webcit/static/icons/essen/32x32/network.png | Bin 0 -> 871 bytes
webcit/static/icons/essen/32x32/nextroom.png | Bin 0 -> 913 bytes
webcit/static/icons/essen/32x32/note.png | Bin 0 -> 809 bytes
webcit/static/icons/essen/32x32/pen.png | Bin 0 -> 1427 bytes
webcit/static/icons/essen/32x32/pencil.png | Bin 0 -> 1319 bytes
webcit/static/icons/essen/32x32/readallmsg.png | Bin 0 -> 859 bytes
webcit/static/icons/essen/32x32/refresh.png | Bin 0 -> 1621 bytes
webcit/static/icons/essen/32x32/room.png | Bin 0 -> 633 bytes
webcit/static/icons/essen/32x32/search.png | Bin 0 -> 1711 bytes
webcit/static/icons/essen/32x32/skiproom.png | Bin 0 -> 891 bytes
webcit/static/icons/essen/32x32/summary.png | Bin 0 -> 2343 bytes
webcit/static/icons/essen/32x32/task.png | Bin 0 -> 1060 bytes
webcit/static/icons/essen/32x32/taskday.png | Bin 0 -> 1099 bytes
webcit/static/icons/essen/32x32/user.png | Bin 0 -> 2015 bytes
webcit/static/{ => icons}/openid-32x32.gif | Bin 1424 -> 1424 bytes
webcit/static/{ => icons}/openid-small.gif | Bin 237 -> 237 bytes
webcit/static/{ => icons}/resizecorner.png | Bin 530 -> 530 bytes
webcit/static/{ => icons}/resizegrippy.gif | Bin 144 -> 144 bytes
webcit/static/{ => icons}/throbber.gif | Bin 12249 -> 12249 bytes
webcit/static/instant_messenger.html | 2 +-
webcit/static/styles/iconbaricns.css | 30 ++--
webcit/static/styles/webcit.css | 32 ++--
webcit/static/t/aide/edituser/select.html | 29 ++--
webcit/static/t/aide/serverrestart/box.html | 2 +-
.../static/t/aide/serverrestart/box_page_do.html | 2 +-
webcit/static/t/confirmlogoff.html | 10 +-
webcit/static/t/edit_message.html | 12 +-
webcit/static/t/edit_message/attachments_pane.html | 43 ++---
webcit/static/t/files/section_onefile.html | 4 +-
webcit/static/t/get_logged_in.html | 6 +-
webcit/static/t/iconbar/edit.html | 181 ++++++++++----------
webcit/static/t/iconbar/save.html | 17 +-
webcit/static/t/msg_listview.html | 2 +-
webcit/static/t/navbar.html | 47 +++---
webcit/static/t/openid_manual_create.html | 2 +-
webcit/static/t/room/edit/tab_access.html | 22 ++--
webcit/static/t/room/edit/tab_listserv.html | 38 ++--
webcit/static/t/room/view_picture.html | 18 +-
webcit/static/t/room/zap_entry.html | 15 +-
webcit/static/t/roomchat.html | 2 +-
webcit/static/t/vnoteitem.html | 6 +-
webcit/static/t/who.html | 30 ++--
webcit/static/t/who/box_list_static.html | 26 ++--
webcit/static/t/who/section.html | 68 +++++---
webcit/static/t/who/summary_section.html | 41 +++--
99 files changed, 347 insertions(+), 340 deletions(-)
rename webcit/static/{ => icons}/8paint16.gif (100%)
rename webcit/static/{ => icons}/bubble.gif (100%)
rename webcit/static/{ => icons}/bubble_filler.gif (100%)
rename webcit/static/{ => icons}/citadel-button-32x32.gif (100%)
rename webcit/static/{ => icons}/closewindow.gif (100%)
create mode 100644 webcit/static/icons/essen/16x16/account.png
create mode 100644 webcit/static/icons/essen/16x16/activeuser.png
create mode 100644 webcit/static/icons/essen/16x16/addcontact.png
create mode 100644 webcit/static/icons/essen/16x16/attachement.png
create mode 100644 webcit/static/icons/essen/16x16/back.png
create mode 100644 webcit/static/icons/essen/16x16/blog.png
create mode 100644 webcit/static/icons/essen/16x16/calendar.png
create mode 100644 webcit/static/icons/essen/16x16/chat.png
create mode 100644 webcit/static/icons/essen/16x16/config.png
create mode 100644 webcit/static/icons/essen/16x16/contacts.png
create mode 100644 webcit/static/icons/essen/16x16/delete.png
create mode 100644 webcit/static/icons/essen/16x16/draft.png
create mode 100644 webcit/static/icons/essen/16x16/email.png
create mode 100644 webcit/static/icons/essen/16x16/file.png
create mode 100644 webcit/static/icons/essen/16x16/forward.png
create mode 100644 webcit/static/icons/essen/16x16/logout.png
create mode 100644 webcit/static/icons/essen/16x16/network.png
create mode 100644 webcit/static/icons/essen/16x16/nextroom.png
create mode 100644 webcit/static/icons/essen/16x16/note.png
create mode 100644 webcit/static/icons/essen/16x16/pen.png
create mode 100644 webcit/static/icons/essen/16x16/pencil.png
create mode 100644 webcit/static/icons/essen/16x16/readallmsg.png
create mode 100644 webcit/static/icons/essen/16x16/refresh.png
create mode 100644 webcit/static/icons/essen/16x16/room.png
create mode 100644 webcit/static/icons/essen/16x16/rss.png
create mode 100644 webcit/static/icons/essen/16x16/search.png
create mode 100644 webcit/static/icons/essen/16x16/skiproom.png
create mode 100644 webcit/static/icons/essen/16x16/summary.png
create mode 100644 webcit/static/icons/essen/16x16/task.png
create mode 100644 webcit/static/icons/essen/16x16/taskday.png
create mode 100644 webcit/static/icons/essen/16x16/user.png
create mode 100644 webcit/static/icons/essen/32x32/account.png
create mode 100644 webcit/static/icons/essen/32x32/activeuser.png
create mode 100644 webcit/static/icons/essen/32x32/addcontact.png
create mode 100644 webcit/static/icons/essen/32x32/attachement.png
create mode 100644 webcit/static/icons/essen/32x32/back.png
create mode 100644 webcit/static/icons/essen/32x32/blog.png
create mode 100644 webcit/static/icons/essen/32x32/calendar.png
create mode 100644 webcit/static/icons/essen/32x32/chat.png
create mode 100644 webcit/static/icons/essen/32x32/check.png
create mode 100644 webcit/static/icons/essen/32x32/config.png
create mode 100644 webcit/static/icons/essen/32x32/contact.png
create mode 100644 webcit/static/icons/essen/32x32/delete.png
create mode 100644 webcit/static/icons/essen/32x32/draft.png
create mode 100644 webcit/static/icons/essen/32x32/email.png
create mode 100644 webcit/static/icons/essen/32x32/feed.png
create mode 100644 webcit/static/icons/essen/32x32/file.png
create mode 100644 webcit/static/icons/essen/32x32/forward.png
create mode 100644 webcit/static/icons/essen/32x32/logout.png
create mode 100644 webcit/static/icons/essen/32x32/network.png
create mode 100644 webcit/static/icons/essen/32x32/nextroom.png
create mode 100644 webcit/static/icons/essen/32x32/note.png
create mode 100644 webcit/static/icons/essen/32x32/pen.png
create mode 100644 webcit/static/icons/essen/32x32/pencil.png
create mode 100644 webcit/static/icons/essen/32x32/readallmsg.png
create mode 100644 webcit/static/icons/essen/32x32/refresh.png
create mode 100644 webcit/static/icons/essen/32x32/room.png
create mode 100644 webcit/static/icons/essen/32x32/search.png
create mode 100644 webcit/static/icons/essen/32x32/skiproom.png
create mode 100644 webcit/static/icons/essen/32x32/summary.png
create mode 100644 webcit/static/icons/essen/32x32/task.png
create mode 100644 webcit/static/icons/essen/32x32/taskday.png
create mode 100644 webcit/static/icons/essen/32x32/user.png
rename webcit/static/{ => icons}/openid-32x32.gif (100%)
rename webcit/static/{ => icons}/openid-small.gif (100%)
rename webcit/static/{ => icons}/resizecorner.png (100%)
rename webcit/static/{ => icons}/resizegrippy.gif (100%)
rename webcit/static/{ => icons}/throbber.gif (100%)
hooks/post-receive
--
citadel.org
