jensp
18d1304c5b
CCM NG/ccm-cms: Avoid NPE in ItemWorkflowRequestLocalHelper when no workflow is assigned to a ContentItem.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4790 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 06a336d252
2017-06-20 11:25:05 +00:00
jensp
21bc4a1ec4
More bugfixes for ContentItemPage and related classes (ContentItemPage is now displayed)
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4787 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 4f59db0042
2017-06-19 13:07:23 +00:00
jensp
145a5806c6
CCM NG/ccm-cms: More bugfixes
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4786 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: def2c4e659
2017-06-16 17:46:48 +00:00
jensp
53c58faccd
CCM NG/ccm-cms: More work for getting ContentItemPage working
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4785 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 47c5e2c9d2
2017-06-15 16:44:46 +00:00
jensp
46e09293c9
CCM NG/ccm-cms: Bugfixes
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4784 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: bca4d95dbd
2017-06-15 12:55:30 +00:00
jensp
382b1ca920
CCM NG: Several bugfixes
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4783 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 29e9cce905
2017-06-15 08:38:15 +00:00
jensp
7ebd041957
CCM NG/ccm-core: Bugfix for ContentSectionSetup
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4782 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: db051c3aef
2017-06-14 17:17:50 +00:00
jensp
5f68646ebd
CCM NG:
...
- Cleanup pom.xml files
- UI for import/export
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4779 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 5696059efd
2017-06-14 12:35:44 +00:00
jensp
c82aa708af
CCM NG/ccm-cms: Several changes/fixes for getting the authoring kits working
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4778 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 014fc32ed8
2017-06-13 12:04:03 +00:00
jensp
cfafa974cb
CCM NG/ccm-cms: MultiPartArticleEdit ported to CCM NG
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4763 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 2841e29333
2017-06-08 12:58:32 +00:00
jensp
54069591f9
CCM NG/ccm-cms: EventPropertiesStep and associated ported to NG.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4762 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: d809c7611b
2017-06-08 12:36:39 +00:00
jensp
eb3de37948
CCM NG/ccm-cms: NewsItemPropertiesStep and NewsItemProperty from old system
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4757 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 3447dbe9e2
2017-06-06 09:19:09 +00:00
jensp
9b2f79c9e2
CCM NG/ccm-cms: ItemCategoryStep migrated to CCM NG
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4752 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 24f01f6f88
2017-05-22 13:21:29 +00:00
jensp
ab47a14967
CCM NG/ccm-cms: GenericArticleBody and associated classes
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4745 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: d9cd1e4984
2017-05-20 15:22:14 +00:00
jensp
b54961fd04
CCM NG/ccm-cms: ArticlePropertiesStep: Added parameter for selected language (for finished yet)
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4744 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: be14263177
2017-05-19 18:11:24 +00:00
jensp
afe409c447
CCM NG/ccm-cms: ArticlePropertiesStep and dependencies
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4743 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 97a98c6a9b
2017-05-18 17:39:40 +00:00
jensp
ada3da57f3
CCM NG/ccm-cms: Some bugfixes
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4742 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 776788c101
2017-05-18 08:42:24 +00:00
baka
3da8786056
Ticket #2684 - Implements the class, adds the resources to the bundles and adds annotations
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4740 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 43ae5e9d2c
2017-05-17 12:52:38 +00:00
baka
14a18c75ab
Ticket #2685 - Forgot the annotations and resource bundles
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4739 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 9b643491bc
2017-05-17 12:17:03 +00:00
baka
61e9ef8ed0
Ticket #2683 & #2682 - Fixes minor stuff
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4738 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 6a2e34fae8
2017-05-17 12:02:50 +00:00
baka
85cf3c31a6
Ticket #2685 - Implements the form
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4737 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 409581f5dd
2017-05-17 12:01:14 +00:00
jensp
07b15b279f
CCM NG/ccm-cms: First part of migration of ArticlesPropertiesStep
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4736 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 565b103bfa
2017-05-15 17:43:46 +00:00
jensp
660b2926c6
CCM NG/ccm-cms: AssetRepository queries now check permissions
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4733 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: f5f485e360
2017-05-13 09:38:30 +00:00
jensp
8beb8bf94c
CCM NG/ccm-cms: Queries used by ContentItemRepository now include permissions.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4732 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 98d4858ff8
2017-05-12 19:04:13 +00:00
jensp
74944668d1
CCM NG/ccm-cms: Extended named queries for ContentItem to take permissions into account
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4731 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 9084ade61e
2017-05-11 18:13:47 +00:00
jensp
16bfe12fc8
CCM NG/ccm-cms: Some progress for the ContentItemPage
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4730 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 6c7022eafc
2017-05-11 18:01:30 +00:00
jensp
2f7a60b751
CCM NG/ccm-cms: Several optimisations
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4729 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 4248d0073b
2017-05-11 17:11:30 +00:00
jensp
af87170dbe
CCM NG/ccm-cms: Query for retrieving ContentItems by ID which takes the permissions into account.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4726 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 12fed67308
2017-05-10 17:38:24 +00:00
baka
aa653c936c
Ticket #2683 - Missed something.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4724 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 8ad687f95b
2017-05-10 15:44:56 +00:00
baka
8e4811bf7a
Ticket #2683 - Implements the image form
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4723 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 8c1dd9d8a1
2017-05-10 15:39:25 +00:00
jensp
eb498dd899
CCM NG/ccm-cms: Fixed some more test failures
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4722 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 99333a3886
2017-05-10 15:33:34 +00:00
baka
9e9accac14
Ticket #2683 - Localization for the audio asset form
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4720 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 17cba4ee16
2017-05-10 14:00:47 +00:00
jensp
89832fd8ee
CCM NG/ccm-cms: Working on the ContentTypeRepositoryTest
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4719 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 1b612e6908
2017-05-10 14:00:08 +00:00
baka
ba5f265a7c
Ticket #2683 - Implements a form for external video assets.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4718 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 25eb975951
2017-05-10 13:58:06 +00:00
jensp
494d4cfac6
CCM NG/ccm-cms: Fixed test failures in ContentTypeRepositoryTest caused by missing dependencies
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4717 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 7b889c1c98
2017-05-10 09:01:34 +00:00
jensp
1cd656cc7c
CCM NG/ccm-cms: Fixes more test failures
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4713 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: bd1ff6d18a
2017-05-08 18:04:21 +00:00
jensp
d302d5f976
CCM NG/ccm-cms: Some bugfixes for the ContentItemManager fixing test failures
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4712 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 84bb34ff13
2017-05-08 09:28:20 +00:00
jensp
697414851c
CCM NG/ccm-cms: Some bugfixes
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4704 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 2c7f064e4f
2017-05-03 18:16:06 +00:00
jensp
95a2200327
CCM NG/ccm-cms: Fixed some test failures
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4701 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: a734e0eee7
2017-05-02 13:16:31 +00:00
jensp
1410e7fe3f
CCM NG/ccm-cms: Fixed some test failures
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4700 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 72827e8e3d
2017-05-02 09:06:52 +00:00
jensp
8e70f29f3a
CCM NG/ccm-cms: Extended test for developing query which takes permissions into acccount when retrieving ContentItems from the database.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4699 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 76a1e0f10b
2017-05-02 09:02:36 +00:00
jensp
4503775b6d
CCM NG/ccm-cms:
...
- CreateForm for Event
- Cleanup resources. Some files were accendentily copied to the wrong place.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4698 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 9e3b58914d
2017-05-01 15:48:28 +00:00
jensp
861ed62ba3
CCM NG/ccm-cms: CreateForm for NewsItem
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4697 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 5885bea3be
2017-05-01 15:33:07 +00:00
jensp
36703ed468
CCM NG/ccm-cms: Some dependencies were missing from the test archive for ContentItemPermissionTest causing test failures
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4696 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 458ff05097
2017-04-30 11:34:19 +00:00
jensp
af612dc774
CCM NG/ccm-cms: Creating content items works now
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4695 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 0153f10833
2017-04-29 14:53:14 +00:00
jensp
1f7b24f50d
CCM NG/ccm-cms: Forms for creating items of type Article, Event, MultiPartArticle and News
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4692 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: c4cfcf8b55
2017-04-27 14:52:52 +00:00
jensp
bc4a31c492
CCM NG/ccm-cms: Ported forms for creating new items
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4691 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 8657ce76e3
2017-04-26 17:35:02 +00:00
baka
850f1e3849
Implements Deleteform Text
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4688 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 26aeebe0f5
2017-04-24 13:16:27 +00:00
baka
6d540b6292
Edited the admin pane to use the context model again. May still be wrong, needs testing
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4687 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 577b0ad3c7
2017-04-24 13:04:21 +00:00
baka
d9d7b30618
Implementes using points discussed during last meeting
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4686 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 390aa17f13
2017-04-24 12:39:36 +00:00
jensp
85f9008a57
CCM NG/ccm-cms: Changes from todays coding session
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4684 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 3f184ce092
2017-04-20 14:51:37 +00:00
jensp
bf26656114
CCM NG: Vaadin Prototype for UI
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4683 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 25dc47cddc
2017-04-19 19:36:44 +00:00
jensp
6d34f60a26
CCM NG/ccm-core: Bugfixes for handeling or wrapped ServletRequests and Multipart requests
...
CCM NG/ccm-cms: Base form for binary assets now works
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4682 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 197cc84391
2017-04-19 06:18:41 +00:00
jensp
c62d231f0c
CCM NG/ccm-cms: Some bugfixes and translations for the BinaryAssetForm
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4681 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 90c73c0e34
2017-04-18 13:38:33 +00:00
jensp
554e201452
CCM NG/ccm-cms:
...
- Form for FileAsset
- Added FileAsset to known asset types
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4680 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 423715a5bd
2017-04-18 11:05:41 +00:00
jensp
2770215182
CCM NG/ccm-cms:
...
- Ported FormUploadSection to NG
- BinaryAssetForm as base for all other assets which extend BinaryAsset
CCM NG/ccm-core:
- First part of a JPQL console for testing JPQL queries
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4679 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: ef0f16d99c
2017-04-18 10:57:10 +00:00
jensp
00ab4ac68a
CCM NG/ccm-cms: Fixed some tests
...
CCM NG/ccm-core: Vaadin prototype (UI)
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4678 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 4d27baca2a
2017-04-17 18:56:03 +00:00
jensp
0db08e9241
CCM NG/ccm-cms: Removed obsolete class
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4677 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 991f7e85d8
2017-04-17 16:09:58 +00:00
jensp
66a3ba62f3
CCM NG/ccm-cms:
...
- AssetSearchWidget
- Form für ExternalVideoAsset
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4675 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 41a937882e
2017-04-17 15:36:15 +00:00
baka
0e92c0a5cd
Many small changes, now all classes in category package compile. Needs to be checked in detail
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4674 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 7a691b184a
2017-04-14 14:23:59 +00:00
jensp
94d0837a0c
CCM NG/ccm-cms : AssetSearchPage
...
CCM NG/ccm-core: GlobalizationHelper now provides a method for retrieving the value most suitable for the negioated locale form a LocalizedString
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4673 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 7d7202ca50
2017-04-13 12:30:02 +00:00
jensp
33d8d6848f
CCM NG/ccm-cms: Fixed some bugs in the AssetRepository
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4672 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: d66287322c
2017-04-13 09:36:16 +00:00
jensp
95531ee989
CCM NG/ccm-cms: AssetSearchService including JAX-RS methods to support assets in RichTextEditor
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4670 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 3227166333
2017-04-12 18:37:42 +00:00
jensp
8d54a8ffcb
CCM NG/ccm-cms: Started implementation of an AssetSearchWidget (similar to the ItemSearchWidget)
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4668 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: cd9c948870
2017-04-11 17:18:18 +00:00
jensp
f66850ff5d
CCM NG/ccm-cms: AssetForm improvement, Form for SideNote asset
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4667 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: f9806fea35
2017-04-11 08:23:07 +00:00
jensp
9499fc1667
CCM NG/ccm-cms: AssetForm localisation
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4666 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 0bf25ccb05
2017-04-10 17:02:48 +00:00
jensp
2ece488abb
CCM NG/ccm-cms: AssetForm including localisation for assets
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4663 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: ee7280dc6b
2017-04-07 18:41:40 +00:00
jensp
65c0776a67
CCM NG/ccm-cms: AssetPane, creation of assets.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4662 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 3095b11a2f
2017-04-06 13:09:58 +00:00
jensp
1971c8b43d
CCM NG/ccm-cms: AssetPane
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4661 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: e7f6f11e38
2017-04-05 16:53:44 +00:00
jensp
11dd004ca7
CCM NG/ccm-cms: Localisations for AssetPane
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4659 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 4a17567816
2017-04-05 12:44:28 +00:00
jensp
a751d00349
CCM NG/ccm-cms: Some bugfixes for the AssetPane
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4658 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 5a9510928f
2017-04-04 11:56:30 +00:00
jensp
7d3829cb1d
CCM NG/ccm-cms: AssetFolderBrowser
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4657 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 2a5dfcf6ed
2017-04-03 15:54:12 +00:00
jensp
5d9fe9de2b
CCM NG/ccm-cms: Some work for the AssetFolderBrowser
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4656 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: f06ba48a5f
2017-03-31 16:49:41 +00:00
jensp
4fa468a0d7
CCM NG/ccm-cms: Fixed some typos in the classes associated with the AssetPane
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4655 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: e1aeeaff4c
2017-03-30 13:23:56 +00:00
jensp
64275f2469
CCM NG/ccm-cms: Next part of AssetPane
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4654 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: d1743342a6
2017-03-30 10:44:53 +00:00
jensp
1af16deed7
CCM NG/ccm-cms: Next part of AssetPane
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4652 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: a78ab32db6
2017-03-29 18:21:41 +00:00
jensp
6f041f332e
CCM NG/ccm-cms: First part of new AssetPane
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4650 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: d75fffae81
2017-03-29 15:40:58 +00:00
jensp
7f215e9dc7
CCM NG/ccm-cms: AssetTypesManager for retrieving information about available asset types.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4649 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: ebbee41a84
2017-03-29 08:27:11 +00:00
jensp
a71470f570
CCM NG/ccm-cms: Typos in JavaDoc etc.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4648 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 1421206eb6
2017-03-29 08:26:11 +00:00
jensp
355a98ffe0
CCM NG/ccm-cms: Typos in JavaDoc
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4647 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 9dea4c7473
2017-03-29 06:28:05 +00:00
baka
6f1ff6ec64
Missed two files in last commit, now everything is fine
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4637 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 51f333c7ff
2017-03-22 17:13:11 +00:00
baka
1de004f2e1
More "Getting Category Stuff Done" Commits
...
Lots of commented code, but it gets better
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4636 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 41518b9a27
2017-03-22 17:11:44 +00:00
jensp
d3235eed28
CCM NG/ccm-cms: Content Types Tab
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4635 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 62f33a6d3b
2017-03-21 10:49:32 +00:00
jensp
c0ffc3ccea
CCM NG/ccm-cms: Lifecycles tab
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4634 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 965d6d3ce1
2017-03-17 16:42:06 +00:00
jensp
8318eca7cf
CCM NG/ccm-cms: Removing roles from task
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4630 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 61c6859a3a
2017-03-15 09:10:33 +00:00
jensp
6a3ffde868
CCM NG/ccm-cms Tab Workflows
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4629 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: c438e8fc5c
2017-03-14 18:56:16 +00:00
baka
170e02fea3
Adds more implementations for the category part of the cms frontend 2nd!
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4628 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: c5a1508e2d
2017-03-14 17:38:38 +00:00
baka
406f645407
Adds more implementations for the category part of the cms frontend
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4627 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 0bf76b01e2
2017-03-14 17:37:58 +00:00
jensp
157f4fe96c
CCM NG/ccm-cms: Workflow tab
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4626 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 96b150582c
2017-03-13 19:13:08 +00:00
jensp
0b7b74b720
CCM NG/ccm-cms: Workflows Tab bug hunting
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4625 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 45f9e5bda0
2017-03-11 18:20:49 +00:00
jensp
ea84d04c77
CCM NG/ccm-cms: Roles tab
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4624 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 6a8fe951a4
2017-03-08 19:18:15 +00:00
jensp
7414d83525
CCM NG/ccm-cms: Several bug fixes for RoleAdminPane
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4623 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 56ba52be5e
2017-03-07 18:17:37 +00:00
jensp
29b12e1ba3
CCM NG/ccm-core: Removed org.libreccm.formbuilder.WidgetLabel.java. In its current implementation it caused strange problems when querying the database.
...
CCM NG/ccm-cms: Granting/Revoking permissions using the PermissionsPane in the FolderBrowser now works
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4622 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 33b9f3048a
2017-03-03 19:45:54 +00:00
jensp
6bd636763d
CCM NG/ccm-cms: Copying folders (including subfolders and items)
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4621 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: a4d96a60b8
2017-03-03 18:22:45 +00:00
jensp
7742b16afc
CCM NG/ccm-cms: Moving folders
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4620 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 1f8e40d392
2017-03-03 18:05:09 +00:00
jensp
39d695730c
CCM NG/ccm-cms: Moving/Copying items.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4619 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 67cb51c572
2017-03-03 15:26:33 +00:00
jensp
b847caf6d1
CCM NG/ccm-cms: Copying items in the FolderBrowser now works
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4618 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: e1b296b5dd
2017-03-03 14:02:24 +00:00
jensp
dd66deaea9
CCM NG/ccm-cms: Typo
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4614 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 46e9fed570
2017-03-02 18:21:47 +00:00
jensp
159abff396
CCM NG/ccm-cms: Still working on the FolderManipulator
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4613 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: d23818c69c
2017-03-02 14:13:00 +00:00
jensp
6a503b37a5
CCM NG/ccm-cms: Finding invalid targets for copying/moving items/folders.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4612 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: be8df1b0e0
2017-03-02 11:42:46 +00:00
jensp
0b44ac66ce
CCM NG/ccm-cms: FolderManipulator Copy/Move (not finished yet).
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4611 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 76c878866c
2017-03-01 19:48:33 +00:00
jensp
f7e7736c10
CCM NG: Profiles wildfly-arquillian-container-managed (starts Wildfly automatically).
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4605 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 53d60320b6
2017-02-28 20:37:50 +00:00
jensp
7b1e45f223
CCM NG/ccm-cms: Creating new folders.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4597 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 08fc76d7e6
2017-02-23 20:49:00 +00:00
jensp
fdac7c4fd8
CCM NG/ccm-cms: FolderPath now shows correct path.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4596 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 8fe3363c53
2017-02-23 14:14:42 +00:00
jensp
468a4b9473
CCM NG/ccm-cms: Renaming folders
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4595 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 82f51a1d70
2017-02-23 09:38:32 +00:00
jensp
7b50e1b830
CCM NG: Fixed several test failures due to recent changes.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4594 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 46ff680193
2017-02-22 20:40:07 +00:00
jensp
871669496e
CCM NG: Schema generation is now using Oracle12c dialect instead of Oracle10g dialect.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4593 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 207aea48ea
2017-02-22 18:00:25 +00:00
jensp
310f190145
CCM NG/ccm-cms: Deleting items from FolderBrowser
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4591 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 0f5f728ffe
2017-02-22 12:37:17 +00:00
jensp
327770385d
CCM NG/ccm-cms FolderBrower: Link deleting non-live items now show up.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4590 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: d0f46755e9
2017-02-22 09:52:16 +00:00
jensp
4b5ce9db84
CCM NG/ccm-cms FolderBrowser: Link for deleting empty folders now shows up.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4589 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 9af0a34a98
2017-02-22 09:45:48 +00:00
jensp
b2966f9392
CCM NG/ccm-cms: Sorting for the FolderBrowser.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4588 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: a4f74d8880
2017-02-22 08:41:06 +00:00
jensp
9d18356999
CCM NG/ccm-cms: Additional fields for content item to provide easier access to auditing data.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4586 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 251c2efb7a
2017-02-21 14:20:32 +00:00
jensp
b51ca7fcad
CCM NG/ccm-cms: FolderBrowser optimization and cleanup
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4585 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: c919701915
2017-02-20 17:50:21 +00:00
jensp
2ff03eb176
CCM NG/ccm-cms/BrowseTab: Changing the current folder by the links in the item list now works. Also the link for going the edit form of an content item is correct now.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4582 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: a3f3deb118
2017-02-17 19:50:49 +00:00
jensp
bb41d6df9e
CCM NG/ccm-cms: BrowsePane: Changing current folder using the folder on the left now works.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4581 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 87780f49dc
2017-02-17 16:43:49 +00:00
jensp
0a25f0f03e
CCM NG/ccm-cms: BrowsePane Expanding/collapsing of the folder on the left.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4580 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: c381a96446
2017-02-17 13:55:21 +00:00
jensp
36483ce25f
CCM NG/ccm-cms: More work for the FolderBrowser
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4579 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 0842b94cf9
2017-02-16 18:07:31 +00:00
jensp
e58cebd92f
CCM NG:
...
- Database cleanup scripts for tests now running before test methods and not after. This means that the database is still intact after a test is run. Useful for debugging.
- ContentSectionSetup now add content types to content section
- Some things for the Documents tab in the content centre
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4578 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: bc466c0618
2017-02-16 13:17:48 +00:00
jensp
cb0460ebbe
CCM NG: Removed JPA metamodel generator. The generated classes caused problems (memory issues) when deploying to Wildfly.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4575 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: c6c137945d
2017-02-15 21:11:19 +00:00
baka
e4f87724c9
Localization Stuff, the 2nd
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4574 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: cb69cdd941
2017-02-15 16:29:13 +00:00
baka
df2b08d4ac
Implements the use of setIndexObject into IndexItemSelectionForm.
...
Is the exception handling correct?
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4573 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: f3ad0e491e
2017-02-15 16:02:24 +00:00
baka
2c5afa14bc
Begin of reimplementation of CategoryLocalization
...
Also adds a lot of key/value pairs to the CmsResources
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4572 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: db8725c222
2017-02-15 15:52:01 +00:00
baka
6d29d3fdc6
Reimplements CategoryAdminContainer to work with ng.
...
It may be not the correct way how the permisson is passed to the constructor, though.
Must be checked for correctness.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4570 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 43a9c2621b
2017-02-15 10:34:39 +00:00
jensp
79797797ca
CCM NG: Enabled generation of Criteria Metamodel classes required for completly type safe criteria queries.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4569 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 3d7a522844
2017-02-15 10:25:18 +00:00
baka
6816b5938b
Refactored CategorizedObjectsList, but removed sorting for now
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4568 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 9b448912ed
2017-02-15 10:18:50 +00:00
jensp
c94fe84b4c
CCM NG: Reenabled defaultCleanupPhase=NONE in arquillian.xml. All tests should have @CleanupUsingScript which is executed regardless of the configured cleanup phase. Setting
...
defaultCleanupPhase=NONE makes it easier to disable the cleanup (just by commenting the annotation on the test class out) for debugging purposes.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4567 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 5a8dddfdfe
2017-02-15 09:33:52 +00:00
jensp
1d6af9cb44
CCM NG/ccm-cms: Missing file
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4562 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 8de4cc2f3f
2017-02-14 18:27:19 +00:00
jensp
f3c30fe82d
CCM NG/ccm-cms: FolderBrowser now shows up, buts needs more testing
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4561 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 98059e41db
2017-02-14 18:26:07 +00:00
jensp
bdf8b5c0bf
CCM NG/ccm-cms: Next part of migration of the FolderBrowser
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4560 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 119cabe733
2017-02-11 18:15:52 +00:00
jensp
f030d102f6
CCM NG/ccm-cms: Trying to get FolderBrowser working...
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4559 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: c18a28562f
2017-02-09 11:20:12 +00:00
baka
40a70c49e0
Adds some localization strings
...
Refactored and reimplemented IndexItemSelectionForm
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4558 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: d64f8c5b30
2017-02-08 19:21:45 +00:00
jensp
a08e1138bc
CCM NG/ccm-cms: FolderBrowser now shows up. Needs testing.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4557 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: ecb3a5c2ab
2017-02-08 18:07:03 +00:00
jensp
b22235d53a
CCM NG: Several small things
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4556 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 642b528358
2017-02-08 15:01:21 +00:00
jensp
25491c4b87
CCM NG/ccm-cms: Next part of new CMSPermissionsTable
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4555 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 448900e386
2017-02-08 08:18:19 +00:00
jensp
e10dbc3639
CCM NG/ccm-cms: Migration of CMSPermissionsTables to new API (not completly finished yet)
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4553 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 00d2858e0d
2017-02-06 18:13:39 +00:00
jensp
7caa9cc652
CCM NG: Several things, mostly importantly removal of all usages of legacy log4j 1.2 API. Dependency for artifact log4j-1.2-api has been removed.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4551 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: db12e1447d
2017-02-04 16:37:18 +00:00
jensp
b41b5e7c93
CCM NG: Some repositories still returned null instead of Optional
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4550 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 95b2d335fa
2017-02-03 07:40:13 +00:00
jensp
fecde66302
CCM NG: Refactored all (hopefully) Repositories to return an Optional instead of a result or null for the methods returning a single entity as result.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4549 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 285cc3b6c5
2017-02-03 07:24:38 +00:00
jensp
75e8b10e6c
CCM NG:
...
- Removed EntityGraphs. They did not work as intended.
- Moved operations on entities in CcmShiroRealm to separate class. The CcmShiroRealmController wraps these operations into a transaction to avoid LazyInititalizationExceptions.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4548 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: e1b612a2fb
2017-02-01 20:34:43 +00:00
jensp
f006894cbb
CCM NG/ccm-cms: Several things for the dispatching prodecure.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4547 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: dae2186488
2017-02-01 14:03:46 +00:00
jensp
4b426b4026
CCM NG: Bugfixes for the CCMDispatcherServlet and some other things.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4546 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: b3c89804e3
2017-02-01 12:40:34 +00:00
jensp
69e4b2f5a5
CCM NG: Some fixes
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4543 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 3e7bfa33aa
2017-01-30 18:51:18 +00:00
jensp
6949d6f496
CCM NG/ccm-cms: Fixed typo in after-add-role dataset.
...
CCM NG/ccm-shortcuts:
- Necssary changes due to changed permission behaviour (only in the test datasets).
- ccm-shortcuts now uses standard cleanup procedure between integratio tests
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4542 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: f74bfb2618
2017-01-28 20:23:15 +00:00
jensp
a1f26f283c
CCM NG: JavaDoc for the recursive permissions behaviour.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4541 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 255516772f
2017-01-28 14:13:56 +00:00
jensp
454a097c5c
CCM NG/ccm-cms: All tests pass again
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4540 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: e72aaa7d62
2017-01-28 13:49:31 +00:00
jensp
2d0ceeb3ce
CCM NG/ccm-cms: Bugfixing
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4539 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: fbc487b44a
2017-01-27 19:16:52 +00:00
jensp
3d97680d99
CCM NG/ccm-cms: DatatypeFactory for DBUnit enabled in Arquillian configuration for PostgreSQL
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4538 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 5555d424d0
2017-01-26 13:49:35 +00:00
jensp
9b855ee184
CCM NG/ccm-cms: Is now using Arquillian database cleanup
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4537 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 32abf07ebf
2017-01-26 13:40:09 +00:00
jensp
b49aa8b6a5
CCM NG: Inherited permissions are now stored in the database for each object making it possible to check permissions when querying data from the database. The InheritsPermissions interface has been removed.
...
Also, the usage of the cleanup script has been changed. The automatic cleanup of Arquillian is not longer disabled (in ccm-core). Instead a custom cleanup script is applied using the @CleanupUsingScript annotation on the test classes.
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4536 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 22dda86fee
2017-01-25 20:18:00 +00:00
jensp
60a545456a
CCM NG: Changes for the PermissionManager to pass tests.
...
git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4535 8810af33-2d31-482b-a856-94f89814c4df
Former-commit-id: 39b74d511a
2017-01-24 16:32:57 +00:00