Commit Graph

2884 Commits (068796c3fc171e76974a4a8eabb931bd02ddfa8b)
 

Author SHA1 Message Date
tosmers 068796c3fc [Trunk][UPDATE]
- in PermissionConversion only creates new Role for users or groups if specified member-role '..._role' does not exist yet.
=> result: no duplicated roles in export files

git-svn-id: https://svn.libreccm.org/ccm/trunk@4800 8810af33-2d31-482b-a856-94f89814c4df
2017-06-23 16:12:45 +00:00
baka 9e8e20c322 Possible fix for the canceled download log spam problem.
The error with AJP messages comes up when a user closes connection
on an ongoing GET request. Since this is not a problem for us (no modifications take place),
we can just accept that it happened an go on with our lifes.

git-svn-id: https://svn.libreccm.org/ccm/trunk@4794 8810af33-2d31-482b-a856-94f89814c4df
2017-06-21 15:19:16 +00:00
pb e4f0ea268b Fixed module listing
git-svn-id: https://svn.libreccm.org/ccm/trunk@4793 8810af33-2d31-482b-a856-94f89814c4df
2017-06-20 23:17:33 +00:00
pb bfe3a5f2a1 Minor adaptations and finetuning
git-svn-id: https://svn.libreccm.org/ccm/trunk@4792 8810af33-2d31-482b-a856-94f89814c4df
2017-06-20 23:16:44 +00:00
jensp 9dc6d53ae6 Support for CKEditor in Foundry
git-svn-id: https://svn.libreccm.org/ccm/trunk@4789 8810af33-2d31-482b-a856-94f89814c4df
2017-06-19 14:45:50 +00:00
jensp b851db5f68 Support for CKEditor (replaces FCKEditor) in standard theme engine
git-svn-id: https://svn.libreccm.org/ccm/trunk@4777 8810af33-2d31-482b-a856-94f89814c4df
2017-06-13 07:02:38 +00:00
pb 9583369005 added ckeditor code version 4.7.0 package full.
git-svn-id: https://svn.libreccm.org/ccm/trunk@4776 8810af33-2d31-482b-a856-94f89814c4df
2017-06-13 04:26:34 +00:00
pb 07d20762d8 removed fckeditor code.
git-svn-id: https://svn.libreccm.org/ccm/trunk@4775 8810af33-2d31-482b-a856-94f89814c4df
2017-06-13 04:22:17 +00:00
jensp 3b8af0a6b2 Foundry support for SciPublications Talk content type
git-svn-id: https://svn.libreccm.org/ccm/trunk@4773 8810af33-2d31-482b-a856-94f89814c4df
2017-06-12 12:29:50 +00:00
pb 46ae57025e Nachziehen der Änderungen zu CKEditor in core r4769
git-svn-id: https://svn.libreccm.org/ccm/trunk@4772 8810af33-2d31-482b-a856-94f89814c4df
2017-06-12 07:45:53 +00:00
pb 5edc6dd125 Nachziehen der Änderungen zu CKEditor in core r4769
git-svn-id: https://svn.libreccm.org/ccm/trunk@4771 8810af33-2d31-482b-a856-94f89814c4df
2017-06-12 07:25:26 +00:00
pb aff32a12a9 Nachziehen der Änderungen zu CKEditor in core r4769
git-svn-id: https://svn.libreccm.org/ccm/trunk@4770 8810af33-2d31-482b-a856-94f89814c4df
2017-06-12 07:19:06 +00:00
pb 2905704ffc 1. Schritt Umnstellung FCKEditor auf CKEditor. FCKEditor ist jetzt nicht mehr nutzbar
git-svn-id: https://svn.libreccm.org/ccm/trunk@4769 8810af33-2d31-482b-a856-94f89814c4df
2017-06-12 07:16:14 +00:00
pb c106a46228 Löschen der Reste des Uralt-Themes und Anpassen stylesheet-path-txt
git-svn-id: https://svn.libreccm.org/ccm/trunk@4768 8810af33-2d31-482b-a856-94f89814c4df
2017-06-12 07:14:18 +00:00
jensp 771a391525 Some small bug fixes for the new Talk content type
git-svn-id: https://svn.libreccm.org/ccm/trunk@4764 8810af33-2d31-482b-a856-94f89814c4df
2017-06-09 07:28:23 +00:00
pb 006fbd0943 LibreCMS bundle renamed.
git-svn-id: https://svn.libreccm.org/ccm/trunk@4761 8810af33-2d31-482b-a856-94f89814c4df
2017-06-08 12:30:40 +00:00
pb 727d5a0e7e Added newer version of tomcat.
git-svn-id: https://svn.libreccm.org/ccm/trunk@4760 8810af33-2d31-482b-a856-94f89814c4df
2017-06-08 12:27:33 +00:00
jensp 961b77511d CLI-Tool for cleaning out orphaned terms
git-svn-id: https://svn.libreccm.org/ccm/trunk@4759 8810af33-2d31-482b-a856-94f89814c4df
2017-06-07 10:07:06 +00:00
jensp 3684065289 Fixed typo
git-svn-id: https://svn.libreccm.org/ccm/trunk@4758 8810af33-2d31-482b-a856-94f89814c4df
2017-06-07 10:06:45 +00:00
jensp f552d85ae7 ContentItem for Talks (as subtype of publication)
git-svn-id: https://svn.libreccm.org/ccm/trunk@4755 8810af33-2d31-482b-a856-94f89814c4df
2017-06-01 19:38:44 +00:00
jensp 929be68c01 Foundry support für Projektpartner
git-svn-id: https://svn.libreccm.org/ccm/trunk@4754 8810af33-2d31-482b-a856-94f89814c4df
2017-05-25 15:19:29 +00:00
jensp d360bee9ad Prevent another strange NPE
git-svn-id: https://svn.libreccm.org/ccm/trunk@4750 8810af33-2d31-482b-a856-94f89814c4df
2017-05-22 11:31:25 +00:00
jensp ddfd5de81c Protecting from possible NPE in SimpleXMLGenerator. At the moment a fatal error is reported polluting the log. Now only a warning will be put into the log.
git-svn-id: https://svn.libreccm.org/ccm/trunk@4746 8810af33-2d31-482b-a856-94f89814c4df
2017-05-21 07:20:57 +00:00
tosmers 3583e34978 [TRUNK][UPDATE]
- repaires ng-parties regex conditions for parameter 'name'

git-svn-id: https://svn.libreccm.org/ccm/trunk@4727 8810af33-2d31-482b-a856-94f89814c4df
2017-05-10 18:09:42 +00:00
tosmers a27a938489 [TRUNK][UPDATE]
- repaires ng-parties regex conditions for parameter 'name'

git-svn-id: https://svn.libreccm.org/ccm/trunk@4725 8810af33-2d31-482b-a856-94f89814c4df
2017-05-10 17:18:26 +00:00
tosmers c6d4c5c88b [UPDATE]
- adds progress output to terminal for export process

git-svn-id: https://svn.libreccm.org/ccm/trunk@4690 8810af33-2d31-482b-a856-94f89814c4df
2017-04-26 16:53:20 +00:00
jensp 5e12ad6b20 Fixed Problem with grantee when exporting permissions.
git-svn-id: https://svn.libreccm.org/ccm/trunk@4669 8810af33-2d31-482b-a856-94f89814c4df
2017-04-11 18:14:12 +00:00
jensp 3bf7248780 Typo
git-svn-id: https://svn.libreccm.org/ccm/trunk@4665 8810af33-2d31-482b-a856-94f89814c4df
2017-04-10 08:21:24 +00:00
jensp 4f1021e4c5 ccm-run now uses the log4j.properties in conf
git-svn-id: https://svn.libreccm.org/ccm/trunk@4664 8810af33-2d31-482b-a856-94f89814c4df
2017-04-10 07:59:33 +00:00
tosmers c3cbf3a90e [UPDATE]
- excludes remove process in GroupConversion
- changes process of PermissionConverion
- new error message in PermissionIdGenerator

git-svn-id: https://svn.libreccm.org/ccm/trunk@4660 8810af33-2d31-482b-a856-94f89814c4df
2017-04-05 15:09:14 +00:00
jensp f4699b096a Debug-Ausgabe
git-svn-id: https://svn.libreccm.org/ccm/trunk@4653 8810af33-2d31-482b-a856-94f89814c4df
2017-03-29 18:22:27 +00:00
tosmers 7891fb7371 [UPDATE]
- adds missing condition to permissions conversion for export, if roleCollection in groups is empty;
- replaces false id setting in ng-class for role with acsObjects generateId method

git-svn-id: https://svn.libreccm.org/ccm/trunk@4651 8810af33-2d31-482b-a856-94f89814c4df
2017-03-29 16:05:49 +00:00
tosmers 3c71f60e4d [UPDATE]
- adds id generation for ng class of permission

git-svn-id: https://svn.libreccm.org/ccm/trunk@4638 8810af33-2d31-482b-a856-94f89814c4df
2017-03-22 21:02:13 +00:00
tosmers 36e86ffda3 [UPDATE]
- adds IdGenerators and IdResolvers for the use of @JsonIdentityInfo

git-svn-id: https://svn.libreccm.org/ccm/trunk@4633 8810af33-2d31-482b-a856-94f89814c4df
2017-03-15 19:36:52 +00:00
tosmers d61efd3d30 [UPDATE]
- adds @JsonIdentityInfo annotations for export
- implements IdGenerators and IdResolvers for the use of @JsonIdentityInfo

git-svn-id: https://svn.libreccm.org/ccm/trunk@4632 8810af33-2d31-482b-a856-94f89814c4df
2017-03-15 19:08:45 +00:00
tosmers ad7c872d3a [UPDATE]
- changes jackson annotations, removes managed-back referenced connections and replaces them with jsonIgnore-jsonIdentityReference(alwaysAsId) links

git-svn-id: https://svn.libreccm.org/ccm/trunk@4631 8810af33-2d31-482b-a856-94f89814c4df
2017-03-15 16:10:25 +00:00
jensp 8ee76beef2 Foundry theme engine: Person list view can now be used for displaying authors in the detail view of a publication
git-svn-id: https://svn.libreccm.org/ccm/trunk@4608 8810af33-2d31-482b-a856-94f89814c4df
2017-03-01 08:16:48 +00:00
jensp c9c81352d0 Fixed a NPE when selecting a related link to another item.
git-svn-id: https://svn.libreccm.org/ccm/trunk@4598 8810af33-2d31-482b-a856-94f89814c4df
2017-02-24 15:41:41 +00:00
jensp 4a86f09147 Bugfix for Foundry: Sorting for MPA sections was alphabetical (10 after 1) instead of numerical.
git-svn-id: https://svn.libreccm.org/ccm/trunk@4576 8810af33-2d31-482b-a856-94f89814c4df
2017-02-16 11:38:41 +00:00
jensp 10fcf64559 Checks for null in various classes to avoid NPEs
git-svn-id: https://svn.libreccm.org/ccm/trunk@4544 8810af33-2d31-482b-a856-94f89814c4df
2017-01-30 20:34:53 +00:00
jensp 4ed88ab09c Foundry: Bugfix for language selector (s. #2856).
git-svn-id: https://svn.libreccm.org/ccm/trunk@4531 8810af33-2d31-482b-a856-94f89814c4df
2017-01-23 12:14:48 +00:00
tosmers d86355a920 [UPDATE]
- adds annotation @JsonIgnoreProperties to every 'Portable' object class
- adds annotation @JsonIgnore to getters in LocalizedString.java and Portable.java

git-svn-id: https://svn.libreccm.org/ccm/trunk@4525 8810af33-2d31-482b-a856-94f89814c4df
2017-01-19 20:01:22 +00:00
jensp d461482de2 Figure caption is now omitted the caption of the image is a single dot ('.').
git-svn-id: https://svn.libreccm.org/ccm/trunk@4499 8810af33-2d31-482b-a856-94f89814c4df
2016-12-22 11:12:14 +00:00
tosmers 52e45ed151 [UPDATE]
- adds json annotation '@JsonIdentityInfo' to many-to-many relationships of exportable classes

git-svn-id: https://svn.libreccm.org/ccm/trunk@4498 8810af33-2d31-482b-a856-94f89814c4df
2016-12-20 22:52:01 +00:00
tosmers 916b622a36 [UPDATE]
- switches json's back-managed references on every attribute in each exportable class

git-svn-id: https://svn.libreccm.org/ccm/trunk@4497 8810af33-2d31-482b-a856-94f89814c4df
2016-12-20 19:37:21 +00:00
jensp 339aa9f8d1 Language selector sorted locales
git-svn-id: https://svn.libreccm.org/ccm/trunk@4484 8810af33-2d31-482b-a856-94f89814c4df
2016-12-15 20:53:41 +00:00
jensp 31f1ea2aca Fixed typo
git-svn-id: https://svn.libreccm.org/ccm/trunk@4482 8810af33-2d31-482b-a856-94f89814c4df
2016-12-15 20:17:37 +00:00
jensp 15d6aa4bca Added supported languages (from KernelConfig) to SiteBanner XML output. LanguageSelector in Foundry now uses these values.
git-svn-id: https://svn.libreccm.org/ccm/trunk@4479 8810af33-2d31-482b-a856-94f89814c4df
2016-12-15 11:06:25 +00:00
jensp 0004054b52 It is now possible to enable language independent items for specific objects lists
git-svn-id: https://svn.libreccm.org/ccm/trunk@4478 8810af33-2d31-482b-a856-94f89814c4df
2016-12-15 10:36:41 +00:00
jensp bdc3b33151 Foundry language selector now uses the available languages from the ContentPanel/GreetingItem if available.
git-svn-id: https://svn.libreccm.org/ccm/trunk@4475 8810af33-2d31-482b-a856-94f89814c4df
2016-12-14 13:30:25 +00:00