cyklotron

branches
  •  
Options
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Wednesday 25 Jan
5:24 pm

Rafal Krzewski

release 2.20.5
release 2.20.5
Options
    • -1
    • +1
    ./2.20/cyklotron-ui-fckeditor/pom.xml
    • -1
    • +1
    ./2.20/cyklotron-ui/pom.xml
    • -1
    • +1
    ./2.20/cyklotron-common/project.properties
    • -1
    • +1
    ./2.20/cyklotron-common/pom.xml
    • -1
    • +1
    ./2.20/cyklotron-webapp/pom.xml
    • -1
    • +1
    ./2.20/cyklotron-core/pom.xml
5:23 pm

Rafal Krzewski

CYKLO-837, CYKLO-875 merged changes 10608-10610 from trunk.
CYKLO-837, CYKLO-875 merged changes 10608-10610 from trunk.
Options
    • -0
    • +0
    ./2.20/cyklotron-common
    • -0
    • +14
    ./2.20/cyklotron-ui/src/main/java/net/cyklotron/cms/modules/components/BaseCMSComponent.java
    • -0
    • +0
    ./2.20/cyklotron-webapp
    • -0
    • +0
    ./2.20/cyklotron-core
    • -27
    • +37
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/syndication/internal/DefaultIncomingFeedsManager.java
    • -0
    • +0
    ./2.20/cyklotron-ui-fckeditor
    • -0
    • +0
    ./2.20/cyklotron-ui
    • -4
    • +4
    ./2.20/cyklotron-ui/src/main/java/net/cyklotron/cms/modules/components/syndication/IncomingFeedView.java
Monday 09 Jan
3:57 pm

Rafal Krzewski

release 2.20.4
release 2.20.4
Options
    • -1
    • +1
    ./2.20/cyklotron-ui-fckeditor/pom.xml
    • -1
    • +1
    ./2.20/cyklotron-ui/pom.xml
    • -1
    • +1
    ./2.20/cyklotron-common/project.properties
    • -1
    • +1
    ./2.20/cyklotron-common/pom.xml
    • -1
    • +1
    ./2.20/cyklotron-webapp/pom.xml
    • -1
    • +1
    ./2.20/cyklotron-core/pom.xml
3:40 pm

Rafal Krzewski

CYKLO-873 ,CYKLO-872 : set defined footer to imported documents. Set different clean up profile for content, abstract and title. HTMLCleanUpProfile removed. (merged change 10599 from trunk)
CYKLO-873 ,CYKLO-872 : set defined footer to imported documents. Set different clean up profile for content, abstract and title. HTMLCleanUpProfile removed. (merged change 10599 from trunk)
Options
    • -5
    • +19
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/docimport/PersistentImportSourceConfiguration.java
    • -0
    • +7
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/docimport/DocumentPostingServiceImpl.java
    • -1
    • +4
    ./2.20/cyklotron-core/src/main/rml/cyklotron/docimport/docimport.rml
    • -1
    • +13
    ./2.20/cyklotron-core/src/test/java/net/cyklotron/cms/docimport/TestImportSourceConfiguration.java
    • -0
    • +6
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/docimport/PersistentImportTargetConfiguration.java
    • -2
    • +12
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/docimport/ImportSourceConfiguration.java
    • -3
    • +3
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/docimport/DocumentImportServiceImpl.java
    • -19
    • +208
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/docimport/ImportResourceImpl.java
    • -10
    • +76
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/docimport/ImportResource.java
    • -0
    • +7
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/docimport/ImportTargetConfiguration.java
Wednesday 28 Dec 2011
10:43 pm

Rafal Krzewski

release 2.20.3
release 2.20.3
Options
    • -1
    • +1
    ./2.20/cyklotron-ui-fckeditor/pom.xml
    • -1
    • +1
    ./2.20/cyklotron-ui/pom.xml
    • -1
    • +1
    ./2.20/cyklotron-common/project.properties
    • -1
    • +1
    ./2.20/cyklotron-common/pom.xml
    • -1
    • +1
    ./2.20/cyklotron-webapp/pom.xml
    • -1
    • +1
    ./2.20/cyklotron-core/pom.xml
10:39 pm

Rafal Krzewski

CYKLO-764: remote documents import (merged changes 10570 - 10590 from trunk)
CYKLO-764: remote documents import (merged changes 10570 - 10590 from trunk)
Options
    • -0
    • +311
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/docimport/ImportTraceResourceImpl.java
    • -0
    • +122
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/docimport/ImportTraceResource.java
    • -0
    • +0
    ./2.20/cyklotron-common
    • binary
    ./2.20/cyklotron-core/src/test/resources/ngo/um/karta_naboru_eksperckiego_kultura.doc
    • -0
    • +51
    ./2.20/cyklotron-core/src/main/rml/cyklotron/docimport/docimport.rml
    • -0
    • +0
    ./2.20/cyklotron-ui/src/main/java/net/cyklotron/cms/modules/jobs/docimport
    • binary
    ./2.20/cyklotron-core/src/test/resources/ngo/um/5363_2309zal_zal14.doc
    • binary
    ./2.20/cyklotron-core/src/test/resources/ngo/um/zgoda_na_przetwarzanie_danych_osobowych.doc
    • -0
    • +68
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/docimport/PersistentImportTargetConfiguration.java
    • binary
    ./2.20/cyklotron-core/src/test/resources/ngo/um/5363_23091.doc
    • binary
    ./2.20/cyklotron-core/src/test/resources/ngo/um/5363_2309zal1.doc
    • binary
    ./2.20/cyklotron-core/src/test/resources/ngo/um/ankieta_rady_seniorow.doc
    • -0
    • +9
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/files/FilesService.java
    • -0
    • +51
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/docimport/ImportTargetConfiguration.java
    • -0
    • +190
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/docimport/PersistentImportSourceConfiguration.java
  16. … 34 more files in changeset.
Tuesday 20 Dec 2011
1:27 pm

Rafal Krzewski

release 2.20.2
release 2.20.2
Options
    • -1
    • +1
    ./2.20/cyklotron-ui-fckeditor/pom.xml
    • -1
    • +1
    ./2.20/cyklotron-ui/pom.xml
    • -1
    • +1
    ./2.20/cyklotron-common/project.properties
    • -1
    • +1
    ./2.20/cyklotron-common/pom.xml
    • -1
    • +1
    ./2.20/cyklotron-webapp/pom.xml
    • -1
    • +1
    ./2.20/cyklotron-core/pom.xml
1:26 pm

Rafal Krzewski

CYKLO-870 fetch vote status and data using XDR from designated voting domain. Otherwise the session and history cookies are separate for voting and checking and user may vote multiple times. (merged c…
CYKLO-870 fetch vote status and data using XDR from designated voting domain. Otherwise the session and history cookies are separate for voting and checking and user may vote multiple times. (merged change 10561)
Options
    • -3
    • +1
    ./2.20/cyklotron-ui/src/main/webapp/templates/components/documents/CommunityVotes.pl_PL.vt
    • -5
    • +4
    ./2.20/cyklotron-ui/src/main/webapp/content/script/documents/CommunityVotes.js
    • -3
    • +1
    ./2.20/cyklotron-ui/src/main/webapp/templates/components/documents/CommunityVotes.vt
Monday 19 Dec 2011
10:35 pm

Rafal Krzewski

CYKLO-868 fix for organization id clearing problem (merged change 10558 from trunk)
CYKLO-868 fix for organization id clearing problem (merged change 10558 from trunk)
Options
    • -1
    • +1
    ./2.20/cyklotron-ui/src/main/webapp/content/script/ngodatabase/autocomplete.js
10:28 pm

Rafal Krzewski

webby 0.2.1 compatible launcher
webby 0.2.1 compatible launcher
Options
    • -4
    • +4
    ./2.19/cyklotron-webapp/eclipse/cyklotron webby+jrebel.launch
Friday 16 Dec 2011
12:21 am

Rafal Krzewski

webby 0.2.1 compatible launcher
webby 0.2.1 compatible launcher
Options
    • -0
    • +19
    ./2.20/cyklotron-webapp/eclipse/webby+jrebel.launch
Thursday 15 Dec 2011
12:38 am

Rafal Krzewski

release 2.20.1
release 2.20.1
Options
    • -1
    • +1
    ./2.20/cyklotron-ui-fckeditor/pom.xml
    • -1
    • +1
    ./2.20/cyklotron-ui/pom.xml
    • -1
    • +1
    ./2.20/cyklotron-common/project.properties
    • -1
    • +1
    ./2.20/cyklotron-common/pom.xml
    • -1
    • +1
    ./2.20/cyklotron-webapp/pom.xml
    • -1
    • +1
    ./2.20/cyklotron-core/pom.xml
12:34 am

Rafal Krzewski

CYKLO-868 fix for merging omission: retrieve cleanup profile name from screen configuration, with "proposeDocument" default value.
CYKLO-868 fix for merging omission: retrieve cleanup profile name from screen configuration, with "proposeDocument" default value.
Options
    • -0
    • +1
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/structure/internal/ProposedDocumentData.java
Thursday 08 Dec 2011
6:52 pm

Rafal Krzewski

CYKLO-868 fixed formtool group references
CYKLO-868 fixed formtool group references
Options
    • -2
    • +2
    ./2.20/cyklotron-ui/src/main/webapp/templates/views/editorui/EditDocument.pl_PL.vt
    • -2
    • +2
    ./2.20/cyklotron-ui/src/main/webapp/templates/views/editorui/EditDocument.vt
    • -2
    • +2
    ./2.20/cyklotron-ui/src/main/webapp/templates/views/documents/EditDocument.pl_PL.vt
    • -2
    • +2
    ./2.20/cyklotron-ui/src/main/webapp/templates/views/documents/EditDocument.vt
6:51 pm

Rafal Krzewski

CYKLO-868 typo
CYKLO-868 typo
Options
    • -1
    • +1
    ./2.20/cyklotron-ui/src/main/webapp/locale/ledge-config-forms-new-document-form-xml_pl_PL.xml
Thursday 01 Dec 2011
2:44 pm

Rafal Krzewski

CYKLO-824: fixed autocomplete in EditDocument view: group identifiers shifted after HTML cleanup action button was added. (merged change 10515 from trunk)
CYKLO-824: fixed autocomplete in EditDocument view: group identifiers shifted after HTML cleanup action button was added. (merged change 10515 from trunk)
Options
    • -10
    • +10
    ./2.20/cyklotron-ui/src/main/webapp/content/script/ngodatabase/autocomplete.js
12:24 pm

Rafal Krzewski

CYKLO-824: simplified and (hopefully) improved query building (merged change 10512 from trunk)
CYKLO-824: simplified and (hopefully) improved query building (merged change 10512 from trunk)
Options
    • -13
    • +34
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/ngodatabase/organizations/OrganizationsIndex.java
12:24 pm

Rafal Krzewski

CYKLO-824: removed grouping nonus from stopwords list, sometimes they may be necessary for searching (merged change 10511 from trunk)
CYKLO-824: removed grouping nonus from stopwords list, sometimes they may be necessary for searching (merged change 10511 from trunk)
Options
    • -17
    • +0
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/ngodatabase/organizations/name_stop_words.txt
Tuesday 29 Nov 2011
6:55 pm

Rafal Krzewski

CYKLO-824: use stopwords when analyzin organization name (merged change 10509 from trunk)
CYKLO-824: use stopwords when analyzin organization name (merged change 10509 from trunk)
Options
    • -12
    • +49
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/ngodatabase/organizations/OrganizationsIndex.java
    • -0
    • +28
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/ngodatabase/organizations/name_stop_words.txt
Wednesday 23 Nov 2011
12:53 am

Rafal Krzewski

CYKLO-834 remove keyword button (merged change 10504 from trunk)
CYKLO-834 remove keyword button (merged change 10504 from trunk)
Options
    • -1
    • +1
    ./2.20/cyklotron-ui/src/main/webapp/templates/views/documents/EditKeyword.vt
    • -1
    • +1
    ./2.20/cyklotron-ui/src/main/webapp/templates/views/documents/AddKeyword.vt
Tuesday 22 Nov 2011
12:21 pm

Rafal Krzewski

CYKLO-834 merged changes 10490,10491,10494,10495,10496 from trunk
CYKLO-834 merged changes 10490,10491,10494,10495,10496 from trunk
Options
    • -5
    • +15
    ./2.20/cyklotron-ui/src/main/webapp/templates/views/documents/EditKeyword.vt
    • -8
    • +31
    ./2.20/cyklotron-ui/src/main/java/net/cyklotron/cms/modules/actions/documents/UpdateKeyword.java
    • -0
    • +126
    ./2.20/cyklotron-ui/src/main/webapp/templates/views/category/ChooseCategories.pl_PL.vt
    • -0
    • +7
    ./2.20/cyklotron-ui/src/main/webapp/content/script/CMSPopups.js
    • -0
    • +126
    ./2.20/cyklotron-ui/src/main/webapp/templates/views/category/ChooseCategories.vt
    • -2
    • +2
    ./2.20/cyklotron-ui/src/main/webapp/templates/views/documents/AddKeyword.vt
    • -1
    • +12
    ./2.20/cyklotron-ui/src/main/webapp/templates/views/documents/KeywordsList.vt
    • -0
    • +147
    ./2.20/cyklotron-ui/src/main/java/net/cyklotron/cms/modules/views/category/ChooseCategories.java
    • -8
    • +25
    ./2.20/cyklotron-ui/src/main/java/net/cyklotron/cms/modules/actions/documents/AddKeyword.java
    • -0
    • +5
    ./2.20/cyklotron-ui/src/main/webapp/templates/common/CMSPopups.vt
12:14 pm

Rafal Krzewski

CYKLO-868 merged changes 10497 - 10504 from trunk
CYKLO-868 merged changes 10497 - 10504 from trunk
Options
    • -0
    • +1
    ./2.20/cyklotron-ui/src/main/webapp/locale/cms.documents_pl_PL.xml
    • -4
    • +17
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/documents/internal/DocumentServiceImpl.java
    • -0
    • +3
    ./2.20/cyklotron-ui/src/main/webapp/locale/ledge-config-forms-new-document-form-xml_en_US.xml
    • -2
    • +2
    ./2.20/cyklotron-ui/src/main/java/net/cyklotron/cms/modules/views/structure/ReviewProposedChanges.java
    • -0
    • +7
    ./2.20/cyklotron-webapp/src/main/webapp/config/org.objectledge.html.HTMLService.xml
    • -0
    • +6
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/documents/internal/DocumentServiceImpl.rng
    • -0
    • +1
    ./2.20/cyklotron-webapp/src/main/webapp/config/net.cyklotron.cms.documents.DocumentService.xml
    • -0
    • +1
    ./2.20/cyklotron-ui/src/main/webapp/locale/cms.documents_en_US.xml
    • -123
    • +113
    ./2.20/cyklotron-webapp/src/main/webapp/config/forms/new-document-ui.xml
    • -3
    • +3
    ./2.20/cyklotron-ui/src/main/java/net/cyklotron/cms/modules/views/editorui/ReviewProposedChanges.java
    • -0
    • +8
    ./2.20/cyklotron-ui/src/main/webapp/templates/views/documents/ProposeDocumentConf.vt
    • -12
    • +7
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/structure/internal/ProposedDocumentData.java
    • -1
    • +1
    ./2.20/cyklotron-ui/src/main/webapp/templates/common/forms/Default.vt
    • -2
    • +9
    ./2.20/cyklotron-ui/src/main/java/net/cyklotron/cms/modules/views/documents/ProposeDocumentConf.java
    • -0
    • +57
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/documents/DocumentFormContentCleanupAction.java
    • -0
    • +3
    ./2.20/cyklotron-ui/src/main/webapp/locale/ledge-config-forms-new-document-form-xml_pl_PL.xml
Monday 14 Nov 2011
2:32 pm

Rafal Krzewski

CYKLO-867 wrap document abstract in a CDATA section, inculude document id in exception message on parse errors (merged change 10487 from trunk)
CYKLO-867 wrap document abstract in a CDATA section, inculude document id in exception message on parse errors (merged change 10487 from trunk)
Options
    • -10
    • +19
    ./2.19/cyklotron-core/src/main/java/net/cyklotron/cms/structure/internal/ProposedDocumentData.java
2:28 pm

Rafal Krzewski

CYKLO-867 wrap document abstract in a CDATA section, inculude document id in exception message on parse errors (merged change 10487 from trunk)
CYKLO-867 wrap document abstract in a CDATA section, inculude document id in exception message on parse errors (merged change 10487 from trunk)
Options
    • -10
    • +19
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/structure/internal/ProposedDocumentData.java
Wednesday 02 Nov 2011
6:51 pm

Rafal Krzewski

CYKLO-834: restrict keyword application using multiple categories. Keyword is applied only if the document is assigned all selected categories. (merged change 10485 from trunk)
CYKLO-834: restrict keyword application using multiple categories. Keyword is applied only if the document is assigned all selected categories. (merged change 10485 from trunk)
Options
    • -1
    • +1
    ./2.20/cyklotron-core/src/main/rml/cyklotron/structure/structure.rml
    • -1
    • +1
    ./2.20/cyklotron-webapp/src/main/rml/fixes/fix_2.20.rml
    • -2
    • +2
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/documents/internal/DocumentServiceImpl.java
    • -2
    • +11
    ./2.20/cyklotron-ui/src/main/java/net/cyklotron/cms/modules/actions/documents/UpdateKeyword.java
    • -10
    • +10
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/documents/keywords/KeywordResource.java
    • -20
    • +20
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/documents/keywords/KeywordResourceImpl.java
    • -3
    • +11
    ./2.20/cyklotron-ui/src/main/java/net/cyklotron/cms/modules/actions/documents/AddKeyword.java
4:12 pm

Rafal Krzewski

CYKLO-856, CYKLO-857 collapse whitespace sequences, convert bulleted paragraphs to lists (merged changes 10480 - 10483 from trunk)
CYKLO-856, CYKLO-857 collapse whitespace sequences, convert bulleted paragraphs to lists (merged changes 10480 - 10483 from trunk)
Options
    • -0
    • +3
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/structure/internal/ProposedDocumentData.java
Sunday 30 Oct 2011
11:26 pm

Rafal Krzewski

there's no point sharing these files, because they contain machine-specific paths
there's no point sharing these files, because they contain machine-specific paths
Options
    • -18
    • +0
    ./2.20/cyklotron-webapp/eclipse/cyklotron webby.launch
    • -19
    • +0
    ./2.20/cyklotron-webapp/eclipse/cyklotron webby+jrebel.launch
Saturday 29 Oct 2011
8:25 pm

Rafal Krzewski

CYKLO-466 clean up DocumentAliases relation when deleting site (merged change 10477 from trunk)
CYKLO-466 clean up DocumentAliases relation when deleting site (merged change 10477 from trunk)
Options
    • -2
    • +1
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/structure/internal/StructureServiceImpl.java
    • -1
    • +14
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/structure/StructureSiteDestructionListener.java
Tuesday 25 Oct 2011
1:36 pm

Rafal Krzewski

CYKLO-466 site deletion fixes and improvements (merged change 10474)
CYKLO-466 site deletion fixes and improvements (merged change 10474)
Options
    • -1
    • +0
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/files/FilesListener.java
    • -3
    • +17
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/banner/BannerListener.java
    • -28
    • +58
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/category/CategoryListener.java
    • -1
    • +15
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/structure/StructureSiteDestructionListener.java
    • -1
    • +1
    ./2.20/cyklotron-webapp/src/main/webapp/config/container.xml
1:35 pm

Rafal Krzewski

CYKLO-466 prevent NPE when deleting sites with not well structured security registry (merged change 10473)
CYKLO-466 prevent NPE when deleting sites with not well structured security registry (merged change 10473)
Options
    • -2
    • +5
    ./2.20/cyklotron-core/src/main/java/net/cyklotron/cms/security/internal/SecurityServiceImpl.java
Earlier activity No later activity