Stefan Frauenknecht
|
5a9b7fdca5
|
Use permission 'can_see_orga_items' also to show/hide duration column and agenda time scheduling. (via Emanuel)
|
2013-01-31 20:37:55 +01:00 |
|
Emanuel Schuetze
|
82ad5e2de0
|
Major changes for new twitter bootstrap template (e.g. replaced icons)
|
2013-01-31 10:19:56 +01:00 |
|
Stefan Frauenknecht
|
65ebcbc991
|
#41 Time for each agenda item finished
|
2013-01-30 17:39:53 +01:00 |
|
Stefan Frauenknecht
|
bc9dcffff4
|
#41 Time for each agenda item
|
2013-01-29 14:28:42 +01:00 |
|
Emanuel Schuetze
|
a4592ec849
|
Reworked projector activate buttons in agenda widget.
|
2013-01-18 21:44:47 +01:00 |
|
Emanuel Schuetze
|
586425354d
|
Reworked new template, especially agenda and dashboard.
|
2013-01-08 23:05:35 +01:00 |
|
Emanuel Schuetze
|
13cd52bd96
|
Merged (conflicts).
|
2013-01-05 15:29:57 +01:00 |
|
Oskar Hahn
|
804f842650
|
Updated the url template tag
|
2012-12-14 15:10:14 +01:00 |
|
Emanuel Schuetze
|
473c2c347f
|
Removed unused base_agenda.html template.
|
2012-09-10 23:37:59 +02:00 |
|
Emanuel Schuetze
|
ce233fc870
|
Updated config template.
|
2012-09-10 17:40:41 +02:00 |
|
Emanuel Schuetze
|
6a3bead5f6
|
Cleanup template code and style.
|
2012-09-06 23:59:03 +02:00 |
|
Emanuel Schuetze
|
7fde53a09e
|
Updated template with twitter bootstrap. Step 1: agenda and application.
|
2012-09-05 00:20:28 +02:00 |
|
Oskar Hahn
|
705fb972b1
|
removed projector link from agenda
|
2012-08-15 13:44:15 +02:00 |
|
Norman Jäckel
|
e74e80299f
|
Fix application links in the widgets.
|
2012-07-23 00:41:44 +02:00 |
|
Oskar Hahn
|
fedfe802e3
|
#315 remove 'application' from agenda/widget.html, too
|
2012-07-20 13:26:45 +02:00 |
|
Oskar Hahn
|
ff4529d8eb
|
#315 remove application from agenda by appending a new methode get_application_title_supplement
|
2012-07-20 11:22:09 +02:00 |
|
Oskar Hahn
|
469e93e21d
|
rm beamer.html from agenda. created by merging the 1.2-dev branch in the default branch
|
2012-07-20 10:55:57 +02:00 |
|
Emanuel Schuetze
|
7ff3d1382d
|
#304: Added link to projector-view for non-admins
|
2012-07-19 07:54:49 +02:00 |
|
Oskar Hahn
|
8f4970e16c
|
merge 1.2-dev with default branch
|
2012-07-18 10:37:23 +00:00 |
|
Oskar Hahn
|
0b033271f8
|
fix some typos, mostly {%trans to {% trans
|
2012-07-16 14:00:29 +02:00 |
|
Norman Jäckel
|
5d5e7c10f5
|
Change strings in agenda overview and agenda widget concerning application items
|
2012-07-16 00:39:46 +02:00 |
|
Emanuel Schuetze
|
969816be37
|
Use new close icon to keep old done icon.
|
2012-07-13 07:58:00 +02:00 |
|
Norman Jäckel
|
e99e5ab290
|
Clean up browsertitles (#282) in assignment and participant tab
|
2012-07-13 01:10:58 +02:00 |
|
Norman Jäckel
|
32c80caa37
|
Clean up browsertitles (#282) in agenda and application
|
2012-07-13 00:44:12 +02:00 |
|
Emanuel Schuetze
|
ed7221e0f0
|
Changed to other 'done' icon to better defferentiate the projector activate icon.
Changed link help text.
|
2012-07-12 17:17:53 +02:00 |
|
Emanuel Schuetze
|
0c64309c91
|
Rename summary icon.
|
2012-07-12 17:11:33 +02:00 |
|
Emanuel Schuetze
|
531f0d9abb
|
Added link help text.
|
2012-07-12 17:02:59 +02:00 |
|
Emanuel Schuetze
|
7487cf1601
|
Set summary icon in agenda widget at the right side to other action
icons.
|
2012-07-12 16:57:23 +02:00 |
|
Norman Jäckel
|
812d7a3c83
|
Fix #275
|
2012-07-05 00:23:42 +02:00 |
|
Oskar Hahn
|
7f2d10c9ca
|
fix hide-closed-item function for non-manager
|
2012-07-04 13:12:07 +02:00 |
|
Oskar Hahn
|
29d25d30d6
|
cleanup the agenda app
|
2012-07-04 12:50:33 +02:00 |
|
Oskar Hahn
|
a72832842b
|
#267 fixt typo.
syncdb is required
|
2012-07-04 11:00:58 +02:00 |
|
Norman Jäckel
|
32a5b61da8
|
Insert type of an related item in the agenda widget as string behind the name
of the item
|
2012-07-04 00:55:37 +02:00 |
|
Oskar Hahn
|
f903f350b8
|
insert item-summary link in the widget
|
2012-07-01 16:13:34 +02:00 |
|
Oskar Hahn
|
ff19e6d2c8
|
#247 summary of items for the projector
|
2012-07-01 16:10:26 +02:00 |
|
Norman Jäckel
|
c19118e774
|
Fix #230
|
2012-06-30 14:17:15 +02:00 |
|
Oskar Hahn
|
b9f783e9f1
|
#237 translate the related type
|
2012-06-30 11:06:32 +02:00 |
|
Oskar Hahn
|
e8e664b92e
|
#237, #238 only show the first line of a comment in the agenda
|
2012-06-30 10:39:58 +02:00 |
|
Norman Jäckel
|
b1ed56176e
|
Edit and View Links and Symbols in Widgets fixed (#206)
|
2012-06-23 10:43:01 +02:00 |
|
Oskar Hahn
|
b12ae6b0a0
|
#191 Create assignment-agenda Items
|
2012-06-23 10:27:58 +02:00 |
|
Oskar Hahn
|
b6cb4223f2
|
#217 show agenda text again.
|
2012-06-19 10:19:43 +02:00 |
|
Oskar Hahn
|
239f328372
|
rewrote projector-widget system
|
2012-06-11 13:43:48 +02:00 |
|
Oskar Hahn
|
965b682abc
|
edit, delete, slide for releated item in agenda
|
2012-06-03 09:35:26 +02:00 |
|
Emanuel Schuetze
|
0ab900cb7a
|
Fixed missing permission of agenda submenu.
|
2012-05-23 14:30:42 +02:00 |
|
Emanuel Schuetze
|
92a64d38cf
|
Add projector view link on front page. Fixed column for can_manage_projector permission.
|
2012-05-20 20:51:11 +02:00 |
|
Emanuel Schuetze
|
23fb97c7a2
|
#170: Use second submenu for agenda items.
|
2012-05-19 08:26:59 +02:00 |
|
Emanuel Schuetze
|
4cef2762fe
|
Fixed style in empty agenda overview table.
|
2012-05-17 21:38:37 +02:00 |
|
Emanuel Schuetze
|
114b719cad
|
Added comment column in agenda overview.
|
2012-05-14 21:55:36 +02:00 |
|
Emanuel Schuetze
|
fbf2256493
|
#182: Wrong permission for edit button in view template.
|
2012-05-14 21:55:02 +02:00 |
|
Emanuel Schuetze
|
3a0d243a6c
|
Added agenda 'edit' button in view template.
|
2012-04-29 20:47:54 +02:00 |
|
Emanuel Schuetze
|
59c342ba8d
|
#158: Move 'change tree' notification to correct position (above page title).
|
2012-04-27 21:53:50 +02:00 |
|
Emanuel Schuetze
|
822264ef7b
|
#158: Added success notification for ItemCreate/ItemUpdate View.
|
2012-04-27 21:36:12 +02:00 |
|
Emanuel Schuetze
|
3bcf4fd9c3
|
Added missing 'required' helptext to all forms.
|
2012-04-26 17:50:46 +02:00 |
|
Emanuel Schuetze
|
719ea6ec79
|
#93: Show application number in header of projector template.
Some more projetor style work.
|
2012-04-24 22:27:16 +02:00 |
|
Emanuel Schuetze
|
d56dcba7d4
|
#119: Adjusted icon filenames.
|
2012-04-23 21:27:22 +02:00 |
|
Emanuel Schuetze
|
81a0c9661e
|
#119: Adjusted some icon filenames.
|
2012-04-23 08:07:21 +02:00 |
|
Emanuel Schuetze
|
f1908bca89
|
Fixed permissions for action columns.
|
2012-04-20 22:58:57 +02:00 |
|
Emanuel Schuetze
|
3886449b2c
|
#106: Action column for applications.
#121 (partly): Activate links for agenda and applications table.
|
2012-04-20 22:43:12 +02:00 |
|
Emanuel Schuetze
|
42a2e44390
|
Updated translations.
|
2012-04-20 11:15:15 +02:00 |
|
Emanuel Schuetze
|
ae5efcfa9d
|
Some minor fixes for agenda, application, participant overview table.
|
2012-04-20 08:14:23 +02:00 |
|
Oskar Hahn
|
4e904c7356
|
now it is possible to create a item, witch is realted to another object, for example an application.
|
2012-04-19 12:46:04 +02:00 |
|
Emanuel Schuetze
|
4adb221a9d
|
#92: Projector control: Add projector preview icon for all entries.
|
2012-04-18 22:00:58 +02:00 |
|
Emanuel Schuetze
|
4ce8facd1a
|
#98: Add new filter for active/inactive items.
|
2012-04-18 18:29:31 +02:00 |
|
Oskar Hahn
|
49e2f73df4
|
#92 preview for slides
|
2012-04-18 15:47:51 +02:00 |
|
Oskar Hahn
|
67384d0644
|
indent items in control view
|
2012-04-18 14:53:19 +02:00 |
|
Emanuel Schuetze
|
bc31a2df1a
|
Automated merge with ssh://openslides.org/openslides
|
2012-04-15 15:53:10 +02:00 |
|
Emanuel Schuetze
|
f44f2723dc
|
Added link to activate agenda item in overview table.
|
2012-04-15 15:53:05 +02:00 |
|
Oskar Hahn
|
90038c1ad2
|
fix error by activating the Agenda
|
2012-04-15 15:46:32 +02:00 |
|
Emanuel Schuetze
|
4967b2b358
|
New agenda view template.
|
2012-04-15 15:21:19 +02:00 |
|
Emanuel Schuetze
|
0657ff340d
|
Show clickable done action in first column in agenda overview.
|
2012-04-15 14:28:01 +02:00 |
|
Emanuel Schuetze
|
ddeaea88c4
|
Moved agenda pdf link to submenu.
|
2012-04-15 14:16:00 +02:00 |
|
Emanuel Schuetze
|
4d7940cb12
|
Automated merge with ssh://openslides.org/openslides
|
2012-04-15 12:39:35 +02:00 |
|
Emanuel Schuetze
|
95d5929449
|
Added participant and version config page. Moved system settings to general. Some style work.
|
2012-04-15 12:39:28 +02:00 |
|
Oskar Hahn
|
a46e96841b
|
remove AgendaSummary
|
2012-04-15 11:33:26 +02:00 |
|
Oskar Hahn
|
361bc40821
|
view for Agenda.item
|
2012-04-15 09:55:21 +02:00 |
|
René Köcher
|
f674897505
|
Split static files in application specific directories and use django 1.4 staticfiles app.
|
2012-04-14 14:51:56 +02:00 |
|
Oskar Hahn
|
6f377453bc
|
rename system in config. Add default config in each apps
|
2012-04-14 12:52:56 +02:00 |
|
Emanuel Schuetze
|
5e6180a465
|
Some style changes for projector and agenda template.
|
2012-04-10 21:11:50 +02:00 |
|
Emanuel Schuetze
|
fdc83048f4
|
More AJAX for projector control template. Moved projector stuff from agenda overview to new control page.
|
2012-04-10 20:09:10 +02:00 |
|
Emanuel Schuetze
|
e5ef0ac424
|
#79: Replaced winner cup icon of elected candidates into green check.
|
2012-04-02 07:30:52 +02:00 |
|
Emanuel Schuetze
|
0976206eb4
|
Reverted changset r279 from Default branch (because it's for
1.2-dev-branch only).
|
2012-03-28 15:20:43 +02:00 |
|
Emanuel Schuetze
|
c6a40f4dcb
|
Reverted changset r281 from Default branch (because it's for
1.2-dev-branch only).
|
2012-03-28 15:17:50 +02:00 |
|
Emanuel Schuetze
|
a06d20a8d8
|
Reverted changset r282 from Default branch (because it's for
1.2-dev-branch only).
|
2012-03-28 15:17:29 +02:00 |
|
Oskar Hahn
|
ad38a8eead
|
put some lines in agenda template in seperate File
|
2012-03-18 15:11:01 +01:00 |
|
Oskar Hahn
|
fb17b16fae
|
config pages in apps
|
2012-03-16 14:31:59 +01:00 |
|
Emanuel Schuetze
|
55c4299a7f
|
Updated projector control template. Fixed some slidemodel strings and urls.
Updated jquery to 1.7.1. Added jquery-ui.
|
2012-03-06 08:19:49 +01:00 |
|
Oskar Hahn
|
50360dde96
|
side-menu for projector
|
2012-03-03 11:19:58 +01:00 |
|
Oskar Hahn
|
c55f240e84
|
some bug fixes
|
2012-02-20 20:35:12 +01:00 |
|
Oskar Hahn
|
22ef402a50
|
use django-mptt to ordner the Agenda
http://django-mptt.github.com
you have to run:
pip install django-mptt
|
2012-02-20 00:14:54 +01:00 |
|
Oskar Hahn
|
0957de83a9
|
start to rewrite the poll-api
|
2012-02-14 16:31:21 +01:00 |
|
Oskar Hahn
|
6498095e2b
|
create setup.py to install openslides
|
2012-02-09 16:57:10 +01:00 |
|
Oskar Hahn
|
7808783145
|
register functions als slide
|
2012-02-09 01:46:58 +01:00 |
|
Oskar Hahn
|
16c37661f7
|
renamed beamer in projector
|
2012-02-06 22:08:08 +01:00 |
|
Oskar Hahn
|
8275484d84
|
some errors occured with the new beamer app in agenda
|
2012-02-06 10:10:20 +01:00 |
|
Oskar Hahn
|
5f6c96b3e8
|
assignment and application can be beamt without a item-element
|
2012-02-03 23:12:28 +01:00 |
|
Oskar Hahn
|
6273f0ff44
|
beamer zeug in extra app ausgelagert
|
2012-02-03 20:49:16 +01:00 |
|
Emanuel Schuetze
|
c88ff41805
|
Reordered config tab subpages.
|
2011-11-14 23:40:19 +01:00 |
|
Emanuel Schuetze
|
b0f9ab09d5
|
Added link to countdown timer config option.
|
2011-11-14 20:17:48 +01:00 |
|
Emanuel Schuetze
|
9feca83bb3
|
Fixed IE CSS issues (with white-space: nowrap).
|
2011-11-14 20:14:56 +01:00 |
|
Emanuel Schuetze
|
eb35289e4e
|
Fixed #57: <button> inside <a> tag not working in IE.; Added new icon for anonymous login.
|
2011-11-14 19:33:45 +01:00 |
|