This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git.
from 2c4da11 Merge pull request #51 from mbien/master
add 40c2297 Small improvements to README
add 043a0cb "cherrypick" updated LICENSE and NOTICE.
add 605797d Prepare for rc 1
add 23739e2 Merge branch 'master' into roller-6.0.x
add c0b5636 Dockerfile in roller-6.0.x should build against roller-6.0.x.
add 26fcd8b Merge branch 'master' into roller-6.0.x
add 038acff Improve alert messages (ROL-2154) 1. Add close button 2.
Remove bulleted text 3. Autoclose messages after 10 seconds
add 10a8432 Merge pull request #41 from
adityasharma7/ROL-2150-roller-6.0.x
add 99e2bda Improved: Editor should confirm user before leaving the page
(ROL-2136) Added custom code to add confimation box for text area which adds an
event handler to beforeunload event if the text area is changed.
add b170caf Improved: used jQuery alias for consistency (ROL-2136)
add fb9d141 Merge pull request #44 from adityasharma7/ROL-2136-6.0.x
add 3457d03 Temporarily add Struts staging repo to POM so I can test new
Struts 2.5.21 pre-release.
add 6ecfd22 Temporarily switch to test version of Struts 2.5.22 for
testing.
add 5956f26 Improved: Replaced pom.basedir deprecated property with
project.basedir.
add 50a3717 Merge pull request #48 from isdixit/roller-6.0.x
add a9157ed Improved: Added '@Override' should be used on overriding and
implementing methods. Affected files:
app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MemberResign.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
app/src/main/java/org/apache/roller/weblogger/ui/st [...]
add d56aa8c Improved: Added '@Override' should be used on overriding and
implementing methods. Affected files:
app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookma [...]
add b056035 Improved: Added '@Override' should be used on overriding and
implementing methods. Affected files:
app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java
app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogMediaResourceRequest.java
app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewRequest.java
app/src/main/ [...]
add a240a4a Improved: Added '@Override' should be used on overriding and
implementing methods. Affected files:
app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/MediaFilesPager.java
app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java
app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/SearchResultsFeedPager.java
app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/UsersPager.java
app/src/main/java/org/a [...]
add 3029d2a Improved: Added '@Override' should be used on overriding and
implementing methods. Affected files:
app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
app/src/main/java/org/apache/roller/weblogger/ui/core/RollerSession.java
app/src/main/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java
app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CharEncodingFilter.java
app/src/main/java/org/apache/roller/weblogger/ui/core/filters [...]
add 5504b47 Improved: Added '@Override' should be used on overriding and
implementing methods. Affected files:
app/src/main/java/org/apache/roller/RollerException.java
app/src/main/java/org/apache/roller/weblogger/business/PreviewURLStrategy.java
app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerImpl.java
app/src/main/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java
app/src/main/java/org/apache/roller/weblogger/business/runnable/ContinuousWorke
[...]
add a8e34f6 Merge pull request #50 from isdixit/roller-6.0.x
add 5e04580 Merge branch 'roller-6.0.x' of
https://github.com/apache/roller into roller-6.0.x
add 4c0c78a Merge branch 'master' into roller-6.0.x
add c108ab0 Merge branch 'master' into roller-6.0.x
add 4716af3 Struts 2.5.22 is released.
new 13ee95c Merge from 6.0.0 and move master version up to 6.0.1-SNAPSHOT.
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:
Dockerfile | 2 +-
LICENSE.txt | 3 ++-
NOTICE.txt | 2 +-
app/pom.xml | 6 ++----
assembly-release/pom.xml | 2 +-
assembly-release/sign-release.sh | 4 ++--
it-selenium/pom.xml | 2 +-
it-selenium/src/test/resources/roller-jettyrun.properties | 2 +-
pom.xml | 4 ++--
9 files changed, 13 insertions(+), 14 deletions(-)
