Fix a couple of merge problems.
2 files changed
tree: 6f571df8cb51c73e8d6f193a844eda9ba63b2e95
  1. app/
  2. assembly-release/
  3. docker/
  4. docs/
  5. it-selenium/
  6. .gitignore
  7. doap_roller.rdf
  8. docker-compose.yml
  9. Dockerfile
  10. LICENSE.txt
  11. NOTICE.txt
  12. pom.xml
  13. README.md
README.md

Rollarcus: bootstrap-ui branch

This branch bootstrap-ui re-writes the Roller editor/admin user-interface (UI) using Bootstrap.

Status

Work is complete and ready for review and merge to master.

Screen-shots

You can find some screenshots of the work so far on Flickr: Roller UI with Bootstrap

A Branch of Apache Roller

Apache Roller is a Java-based, full-featured, multi-user and group-blog server suitable for blog sites large and small. Roller is typically run with Apache Tomcat and MySQL. Roller is made up of the following Maven projects:

  • roller-project: Top level project
  • app: Roller Weblogger webapp, JSP pages, Velocity templates
  • assembly-release: Used to create official distributions of Roller
  • docs: Roller documentation in ODT format
  • it-selenium: Integrated browser tests for Roller using Selenium

Documentation

The Roller Install, User and Template Guides are available in ODT format (for OpenOffice or LibraOffice):

For more information

Hit the Roller Confluence wiki:

Quick start

Assuming you've got a UNIX shell, Java, Maven and Git:

Get the code:

$ git clone https://github.com/apache/roller.git

Build and test the code:

$ cd roller
$ mvn clean install

Run Roller in Jetty with Derby database:

$ cd app
$ mvn jetty:run

Browse to http://localhost:8080/roller