This is an automated email from the ASF dual-hosted git repository.

mraible pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git


    from 8ce8b8048 Merge pull request #216 from mraible/feature/oidc-login
     add 26ed950ef Convert the admin and editor UI from Bootstrap 3 to 
Bootstrap 5.3
     add 53706a26b Merge branch 'feature/oidc-login' into feature/bootstrap-5
     add 0a5c0df53 Load Summernote's Bootstrap 5 build
     add bad3b6ed4 Merge branch 'feature/oidc-login' into feature/bootstrap-5
     add 272f9e7b4 Merge branch 'feature/oidc-login' into feature/bootstrap-5
     add 021872f17 Drop jQuery and jQuery Mobile from the Basic Mobile theme
     add 48233efcf Merge branch 'feature/oidc-login' into feature/bootstrap-5
     add 7092e9150 Fix the Basic Mobile stylesheet, entry teasers, and weblog 
script errors
     add c5b73626f Open dialogs with Bootstrap 5's modal('show')
     add 0b6e9d1fa Render label-less entry and blogroll fields with the simple 
theme
     add 36915828c Merge branch 'feature/oidc-login' into feature/bootstrap-5
     add eacec2f81 Style the User Edit save and cancel buttons for Bootstrap 5
     add 8245a7d75 Merge branch 'feature/oidc-login' into feature/bootstrap-5
     add 1542418be Merge feature/oidc-login into feature/bootstrap-5
     new 3388f4c83 Merge pull request #218 from mraible/feature/bootstrap-5

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 app/pom.xml                                        |  12 +-
 .../main/resources/ApplicationResources.properties |   4 +
 .../template/bootstrap/tooltip.ftl}                |  31 +--
 .../main/webapp/WEB-INF/jsps/admin/CacheInfo.jsp   |   2 +-
 .../webapp/WEB-INF/jsps/admin/GlobalConfig.jsp     |  10 +-
 .../main/webapp/WEB-INF/jsps/admin/PingTargets.jsp |  16 +-
 .../webapp/WEB-INF/jsps/admin/PlanetConfig.jsp     |   2 +-
 .../WEB-INF/jsps/admin/PlanetGroupSidebar.jsp      |   2 +-
 .../webapp/WEB-INF/jsps/admin/PlanetGroupSubs.jsp  |  18 +-
 .../WEB-INF/jsps/admin/PlanetGroupSubsSidebar.jsp  |   4 +-
 .../webapp/WEB-INF/jsps/admin/PlanetGroups.jsp     |   4 +-
 .../main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp   |   2 +-
 .../main/webapp/WEB-INF/jsps/admin/UserEdit.jsp    |   8 +-
 .../webapp/WEB-INF/jsps/core/BootstrapToken.jsp    |  10 +-
 .../webapp/WEB-INF/jsps/core/CreateDatabase.jsp    |   2 +-
 .../main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp |  31 ++-
 app/src/main/webapp/WEB-INF/jsps/core/Login.jsp    |  40 +--
 app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp |  32 +--
 .../webapp/WEB-INF/jsps/core/MainMenuSidebar.jsp   |   6 +-
 app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp  |  24 +-
 app/src/main/webapp/WEB-INF/jsps/core/Register.jsp |  18 +-
 app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp    |  26 +-
 .../webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp   |   8 +-
 .../main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp  |  38 +--
 .../webapp/WEB-INF/jsps/editor/BookmarksImport.jsp |   6 +-
 .../WEB-INF/jsps/editor/BookmarksSidebar.jsp       |   4 +-
 .../main/webapp/WEB-INF/jsps/editor/Categories.jsp |  14 +-
 .../WEB-INF/jsps/editor/CategoriesSidebar.jsp      |   4 +-
 .../main/webapp/WEB-INF/jsps/editor/Comments.jsp   |   2 +-
 .../webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp |  14 +-
 .../main/webapp/WEB-INF/jsps/editor/Entries.jsp    |  24 +-
 .../webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp  |  14 +-
 .../main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp  |  96 +++----
 .../webapp/WEB-INF/jsps/editor/EntryEditor.jsp     |  22 +-
 .../webapp/WEB-INF/jsps/editor/EntrySidebar.jsp    |   8 +-
 .../webapp/WEB-INF/jsps/editor/Maintenance.jsp     |   6 +-
 .../webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp    |  29 ++-
 .../jsps/editor/MediaFileAddExternalInclude.jsp    | 124 ++++-----
 .../WEB-INF/jsps/editor/MediaFileAddSuccess.jsp    |  18 +-
 .../webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp   |  16 +-
 .../WEB-INF/jsps/editor/MediaFileImageChooser.jsp  | 280 ++++++++++-----------
 .../WEB-INF/jsps/editor/MediaFileSidebar.jsp       |   8 +-
 .../webapp/WEB-INF/jsps/editor/MediaFileView.jsp   |  10 +-
 .../webapp/WEB-INF/jsps/editor/MemberResign.jsp    |   4 +-
 .../main/webapp/WEB-INF/jsps/editor/Members.jsp    |   4 +-
 .../webapp/WEB-INF/jsps/editor/MembersInvite.jsp   |   7 +-
 .../webapp/WEB-INF/jsps/editor/MembersSidebar.jsp  |   2 +-
 .../webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp  |  18 +-
 .../webapp/WEB-INF/jsps/editor/TemplateEdit.jsp    |  28 ++-
 .../main/webapp/WEB-INF/jsps/editor/Templates.jsp  |   4 +-
 .../WEB-INF/jsps/editor/TemplatesSidebar.jsp       |   4 +-
 .../main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp  |  47 ++--
 .../webapp/WEB-INF/jsps/editor/WeblogConfig.jsp    |   4 +-
 .../WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp    |   4 +-
 .../WEB-INF/jsps/tiles/bannerInstallation.jsp      |  10 +-
 .../webapp/WEB-INF/jsps/tiles/bannerStatus.jsp     |  66 +++--
 app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp    |  10 +-
 app/src/main/webapp/WEB-INF/jsps/tiles/menu.jsp    |  18 +-
 .../main/webapp/WEB-INF/jsps/tiles/messages.jsp    |  12 +-
 .../WEB-INF/jsps/tiles/tiles-mainmenupage.jsp      |  12 +-
 .../WEB-INF/jsps/tiles/tiles-simple-tabbedpage.jsp |   4 +-
 .../webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp |   4 +-
 .../webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp |  12 +-
 app/src/main/webapp/roller-ui/styles/roller.css    |  43 +++-
 app/src/main/webapp/theme/scripts/roller.js        |  16 +-
 .../main/webapp/themes/basicmobile/_day-mobile.vm  |   6 +-
 .../themes/basicmobile/basic-mobile-custom.css     | 135 +++++++++-
 .../webapp/themes/basicmobile/permalink-mobile.vm  |  17 +-
 .../themes/basicmobile/searchresults-mobile.vm     |  16 +-
 .../webapp/themes/basicmobile/weblog-mobile.vm     |  33 +--
 app/src/main/webapp/themes/basicmobile/weblog.vm   |  17 +-
 .../roller/weblogger/ui/EntryEditorAssetsTest.java |   2 +-
 72 files changed, 873 insertions(+), 735 deletions(-)
 copy app/src/main/{java/org/apache/roller/planet/pojos/Template.java => 
resources/template/bootstrap/tooltip.ftl} (67%)

Reply via email to