Emanuel Schuetze
|
6b4ee0e4f6
|
Updated translation.
|
2013-02-05 23:09:23 +01:00 |
|
Emanuel Schuetze
|
e49efb40d8
|
template: Added new css class for minimum column width.
|
2013-02-05 22:03:43 +01:00 |
|
Emanuel Schuetze
|
d809ff95bb
|
template: Removed unused participant.css
|
2013-02-05 21:51:09 +01:00 |
|
Emanuel Schuetze
|
64e3c1f3cb
|
template: Removed unused 'load staticfiles'.
|
2013-02-05 21:41:26 +01:00 |
|
Emanuel Schuetze
|
0c5459f96e
|
template: Removed old icons. Added some new glyphicons. Updated template style. Some fixes.
|
2013-02-05 20:40:55 +01:00 |
|
Emanuel Schuetze
|
404bf7f0b5
|
template: Added missing back link.
|
2013-02-04 13:38:29 +01:00 |
|
Emanuel Schuetze
|
82ad5e2de0
|
Major changes for new twitter bootstrap template (e.g. replaced icons)
|
2013-01-31 10:19:56 +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 |
|
Emanuel Schuetze
|
4ae7f3e243
|
Merge remote branch 'upstream/master' into newtemplate
Conflicts:
openslides/application/views.py
openslides/assignment/templates/assignment/overview.html
openslides/assignment/templates/assignment/view.html
openslides/assignment/views.py
openslides/locale/de/LC_MESSAGES/django.mo
openslides/locale/de/LC_MESSAGES/django.po
openslides/motion/templates/motion/config.html
openslides/motion/templates/motion/edit.html
openslides/motion/templates/motion/import.html
openslides/motion/templates/motion/overview.html
openslides/motion/templates/motion/poll_view.html
openslides/motion/templates/motion/view.html
openslides/participant/templates/participant/base_participant.html
openslides/participant/templates/participant/config.html
openslides/participant/templates/participant/group_edit.html
openslides/participant/templates/participant/group_overview.html
openslides/participant/templates/participant/overview.html
openslides/projector/templates/projector/base_projector.html
openslides/projector/templates/projector/dashboard.html
openslides/projector/templates/projector/live_view_widget.html
openslides/static/styles/base.css
openslides/templates/base.html
openslides/templates/front_page.html
openslides/utils/utils.py
|
2013-01-02 23:01:43 +01:00 |
|
Norman Jäckel
|
046db10d3a
|
Hide group registered in the group widget.
Make custom slides text scrollable.
Fix template of personal_info_widget.
|
2012-12-01 19:32:58 +01:00 |
|
Oskar Hahn
|
ab4c5791ad
|
Merge pull request #61 from ostcar/master
Forbid the deletion of the registered group
|
2012-11-28 05:16:10 -08:00 |
|
Oskar Hahn
|
8306e7bf6e
|
Don't allow to remove the registered group
|
2012-11-28 13:59:14 +01:00 |
|
Emanuel Schuetze
|
94928c20c5
|
Updated translation msg strings.
|
2012-11-27 21:22:57 +01:00 |
|
Emanuel Schuetze
|
40984a6508
|
Merge remote branch 'upstream/master'
|
2012-11-27 20:10:13 +01:00 |
|
Emanuel Schuetze
|
bba301a4b3
|
#420: Use clean layout for group slide: Remove printing group users; print group name and number of members only. (Later we need a solution to print users fullname not username.)
|
2012-11-22 22:07:33 +01:00 |
|
Oskar Hahn
|
1049141483
|
Created a default group for registered users
|
2012-11-22 18:39:54 +01:00 |
|
Oskar Hahn
|
e168445497
|
fixed error, which allowed admins to delete the anonymous grou
|
2012-11-22 17:29:49 +01:00 |
|
Emanuel Schuetze
|
cbd04327bb
|
Reverted: Administrator can be deleted by other manager. (partly reverted 533c65562d after discus it with oskar because import also possible as non-admin)
|
2012-11-21 23:26:54 +01:00 |
|
Emanuel Schuetze
|
830f85109d
|
Minor formatting work.
|
2012-11-21 23:03:14 +01:00 |
|
Emanuel Schuetze
|
ec1a15a835
|
#175: Adjusted group slide; analog to user slide.
|
2012-11-21 21:45:19 +01:00 |
|
Oskar Hahn
|
2acfd02144
|
Merge pull request #45 from normanjaeckel/GroupSlide
Insert a slide for groups
|
2012-11-21 12:18:17 -08:00 |
|
Emanuel Schuetze
|
f3c865ee3c
|
#176: Adjusted user slide. Show only relevant information in a nice and clear layout.
|
2012-11-21 21:05:56 +01:00 |
|
Norman Jäckel
|
8e886a22ef
|
Insert a slide for groups
|
2012-11-21 14:22:30 +01:00 |
|
Norman Jäckel
|
00e77ba0fc
|
Use join for the group list also in the participant view
|
2012-11-21 14:09:47 +01:00 |
|
Norman Jäckel
|
5939b98772
|
Use join for group list in UserSlide.html
|
2012-11-21 14:07:14 +01:00 |
|
Emanuel Schuetze
|
0fbb7dced3
|
Rename participant field 'details' to 'structure level' (Gliederungsebene). (DB rebuild required!)
|
2012-11-19 23:30:09 +01:00 |
|
Emanuel Schuetze
|
533c65562d
|
Don't allow to deactivate or delete the superuser or yourself.
Otherwise it's very danger to lock out your current (superuser) session.
|
2012-11-08 18:57:53 +01:00 |
|
Oskar Hahn
|
de7d4ed6cd
|
Merge pull request #34 from normanjaeckel/UserSlide
Add UserSlide with new template.
|
2012-11-08 00:25:04 -08:00 |
|
Emanuel Schuetze
|
9d183e9746
|
Rename user group to group. Updated translations. Clean up new french po file.
|
2012-11-07 22:16:11 +01:00 |
|
Emanuel Schuetze
|
7b64d464f5
|
Added user view url also for last_name.
|
2012-11-07 21:27:59 +01:00 |
|
Norman Jäckel
|
35e41873a0
|
Add UserSlide with new template.
|
2012-11-06 00:02:44 +01:00 |
|
Emanuel Schuetze
|
a363efe2ef
|
Fixed #390: Added new user field 'about me'
|
2012-11-03 09:34:42 +01:00 |
|
Emanuel Schuetze
|
005cb2f15e
|
Updated translations.
|
2012-11-03 08:59:34 +01:00 |
|
Norman Jäckel
|
3b4e19ad3b
|
Enhence template of UserView and GroupView
|
2012-10-31 14:47:42 +01:00 |
|
Norman Jäckel
|
c13f4ba52d
|
Add UserView and GroupView part 2
|
2012-10-30 00:07:25 +01:00 |
|
Norman Jäckel
|
015dc159ed
|
Add UserView and GroupView part 1
|
2012-10-27 18:17:22 +02:00 |
|
Norman Jäckel
|
3f0c31d12b
|
Add user widget and group widget, see # 379
|
2012-10-26 18:16:09 +02:00 |
|
Norman Jäckel
|
510aca54eb
|
Add widget with personal info, ticket #25
|
2012-10-25 23:58:32 +02:00 |
|
Oskar Hahn
|
57d591fee8
|
Renamed category to detail
|
2012-10-24 12:30:45 +02:00 |
|
Oskar Hahn
|
681d909fa3
|
rename application to motion
|
2012-10-24 11:07:36 +02:00 |
|
Oskar Hahn
|
760f8e042e
|
some fixes
|
2012-09-12 10:17:51 +02:00 |
|
Emanuel Schuetze
|
ce233fc870
|
Updated config template.
|
2012-09-10 17:40:41 +02:00 |
|
Emanuel Schuetze
|
74ffad6ced
|
Minor changes for template style.
|
2012-09-10 17:17:22 +02:00 |
|
Emanuel Schuetze
|
94ffb3ab45
|
Redesign login template.
|
2012-09-07 21:25:18 +02:00 |
|
Emanuel Schuetze
|
7c90206b3f
|
Adjusted new template for participant app. Added new generic form.
|
2012-09-06 22:41:24 +02:00 |
|
Emanuel Schuetze
|
13cfdb36af
|
Updated login form to new template style.
|
2012-09-05 00:43:19 +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
|
df40de67b0
|
rename openslidesuser to user and openslidesgroup to group
|
2012-08-12 12:52:38 +02:00 |
|
Oskar Hahn
|
bb00eb3eb4
|
rewrote participant status view as class based view
|
2012-08-10 19:19:41 +02:00 |
|