Commit graph

279 commits

Author SHA1 Message Date
27720799f8 merge branch master 2012-07-21 08:20:06 +02:00
8ed023c962 provide additional fields for agenda item 2012-07-17 09:29:02 +02:00
142e1cb20b provide separate interfaces and type concepts for events and agenda items, e.g. for improving meeting minutes 2012-07-17 08:42:36 +02:00
e21adfa364 Merge branch 'master' into bbmaster 2012-07-16 10:05:38 +02:00
14b670166a provide new 'getViewForObject()' method for getting views in listings; use new view attribute 'listingTitle' in listings 2012-07-13 18:19:46 +02:00
0aa539e8f8 merge branch master 2012-07-10 09:08:25 +02:00
b924051d49 work in progress: input of report parameters, work statement as example 2012-07-09 16:31:23 +02:00
d0ef48e692 provide work report view 'work.html' using its context object for the 'tasks' query criteria, use this instead of 'results.html' 2012-07-09 11:23:12 +02:00
54c3a9e8aa merge branch master 2012-07-03 13:15:54 +02:00
670ebf95f1 meeting minutes: fix listing of tasks, access to task for work item listing 2012-07-02 08:46:56 +02:00
2fdf3a99b9 merge branch master - important: 'limits' parameter for reports 2012-06-18 10:29:24 +02:00
2e8618b375 creation of follow-up meeting with copying of tasks OK 2012-06-12 18:20:16 +02:00
719bd165aa work in progress: Competence and Certification Management (CCM): fix structure, start with form for qualification record creation 2012-06-11 17:32:34 +02:00
707a1dd8c4 show meeting minutes as Word document 2012-06-11 10:17:40 +02:00
4447ea04ef provide generation of meeting minutes Word document 2012-06-10 18:04:45 +02:00
59bb401b8f create follow-up event: extend form showing tasks of base event for selection 2012-06-10 16:29:33 +02:00
7d2a66b3c3 revert last change 2012-06-05 18:05:49 +02:00
dc5f579511 tolerate empty (None) userNam in tracks 2012-06-05 17:58:41 +02:00
2ecf05e5e9 Merge branch 'master' into bbmaster 2012-06-01 08:28:11 +02:00
3aa6649f11 work in progress: follow-up events, i.e. events that are connected to a previous event 2012-05-31 09:02:36 +02:00
009d91ffee define and register separate action for creating events 2012-05-30 15:37:21 +02:00
7813f8d806 merge branch master 2012-05-20 15:58:52 +02:00
0e56543900 fix doctests after removal of knowledge.setup.SetupManager 2012-05-19 17:21:25 +02:00
f9dca48cde merge branch master 2012-05-15 16:52:55 +02:00
a930ec1f63 check also for '_x' states when displaying source or target work items 2012-05-09 09:44:38 +02:00
b289b41807 inactivate last change (show 'closed' state by default in listings), seems not to be really useful 2012-05-09 09:36:15 +02:00
1ba43979a8 show 'closed' state by default in listings 2012-05-09 09:28:56 +02:00
095fd9b032 meeting minutes: translate state, improve layout 2012-05-08 07:45:31 +02:00
0a72c9bda9 fix states list for meeting minutes 2012-05-07 17:57:19 +02:00
61735e5bc0 Merge branch 'master' of ssh://git.cy55.de/home/hplattner/git/loops 2012-05-07 17:52:32 +02:00
hplattner
f0bc424168 fix: useExisting in MemberRegistration 2012-05-07 17:14:58 +02:00
2412688b0e meeting minutes: layout improvements 2012-05-05 18:28:58 +02:00
2f9fbb215e work in progress: meeting minutes: view + corresponding portlet action 2012-05-05 10:35:22 +02:00
058de979d8 work in progress: meeting minutes: selection and output working 2012-05-04 16:13:02 +02:00
f24851fa8b merge branch master 2012-04-25 13:59:06 +02:00
hplattner
c74af2b960 fix: integration doctest/ MemberRegistrationManager groups param 2012-04-25 13:52:41 +02:00
5a6111acb7 vocabulary: handle integer and string tokens as equivalent 2012-03-17 16:53:42 +01:00
90466aad79 Merge branch 'master' into bbmaster 2012-03-17 11:56:38 +01:00
ec1628dd00 fix generation of result set for subreport fields 2012-03-17 11:53:39 +01:00
a30ed80e16 fix subreport field definition - needs a reportFactory parameter 2012-03-16 12:01:54 +01:00
5eda7ef9c7 show name of track if title is empty 2012-03-08 15:29:40 +01:00
5d3bcf3cfa provide more control on what is shown in list or grid via new 'represents' predicate for resources 2012-03-05 18:36:27 +01:00
d8c7ae86af ignore missing concept type error 2012-03-05 12:40:39 +01:00
1f681de414 ignore errors because of missing principal; allow overwriting password when principal exists 2012-03-05 12:25:02 +01:00
f03f11372e Merge branch 'master' into bbmaster 2012-03-05 10:00:51 +01:00
48395b19cf correctly handle events spanning two months also for months with less than 31 days 2012-03-04 16:35:51 +01:00
1b344e7489 provide option 'organize.stateful' to directly bind a states definition to a type
in addition extend, clean up standard import files
2012-03-03 11:57:57 +01:00
6e36c6708c Merge branch 'master' into bbmaster 2012-02-26 10:24:37 +01:00
b55ee6a7dd bug fix for comments: use correct target URL 2012-02-17 13:47:39 +01:00
2c141a9285 Merge branch 'master' into bbmaster 2012-01-05 12:37:20 +01:00