aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into add_minimalXAlexis Metaireau2017-04-08207-82/+7865
|\
| * Merge pull request #479 from robulouski/masterAlexis Metaireau2017-04-081-0/+0
| |\
| | * Update voidy-bootstrap to version 2.1Rob Iwancz2017-01-181-0/+0
| * | Merge pull request #486 from mr-ubik/patch-1Alexis Metaireau2017-04-081-1/+3
| |\ \
| | * | Update to JINJA_ENVIRONMENTMichele "Ubik" De Simoni2017-02-071-1/+3
| * | | Merge pull request #494 from Bricabraque/bricabracthemeAlexis Metaireau2017-04-082-7/+16
| |\ \ \
| | * \ \ Merge branch 'master' into bricabracthemeAlexis Metaireau2017-04-08184-80/+7646
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #495 from easydevmixin/catalan-translationAlexis Metaireau2017-04-083-0/+149
| |\ \ \ \
| | * | | | Pelican Bootstrap3 Catalan translationRamon Maria Gallart2017-02-233-0/+149
| * | | | | Merge pull request #498 from lioman/patch-1Alexis Metaireau2017-04-081-1/+1
| |\ \ \ \ \
| | * | | | | fix typo in READMELioman2017-03-151-1/+1
| * | | | | | Merge pull request #503 from aroaminggeek/masterAlexis Metaireau2017-04-0843-0/+7169
| |\ \ \ \ \ \
| | * | | | | | pelican-striped-html5up addedFish2017-03-2543-0/+7169
| * | | | | | | Merge pull request #497 from adamatan/masterAlexis Metaireau2017-04-0846-51/+51
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Replace 'PAGES' with 'pages' across all themesAdam Matan2017-03-0746-51/+51
| | |/ / / / /
| * | | | | | Merge pull request #501 from kdeldycke/plumage-09-updateJustin Mayer2017-03-221-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Update Plumage to latest 0.9 release.Kevin Deldycke2017-03-221-0/+0
| |/ / / / /
| * | | | | Merge pull request #496 from kosmgco/masterJustin Mayer2017-02-2891-29/+277
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | updatekosmgco2017-02-2791-29/+277
| | | |_|/ | | |/| |
| | | * | Bricabrac: Replace outdated PAGES context with 'pages'Bricabraque2017-02-232-8/+17
| | |/ / | |/| |
| * | | Merge pull request #492 from Bricabraque/patch-1Justin Mayer2017-02-211-3/+3
| |\ \ \
| | * | | Update readme.mdBricabrac2017-02-211-3/+3
| |/ / /
| * | | Merge pull request #491 from Bricabraque/masterJustin Mayer2017-02-2117-0/+203
| |\ \ \
| | * | | Add bricabrac themeBricabraque2017-02-2117-0/+203
| |/ / /
| * | | Merge pull request #489 from dokelung/masterJustin Mayer2017-02-142-0/+3
| |\ \ \
| | * | | add jojo theme to repositoryKo-Lung Yuan2017-02-142-0/+3
| | | |/ | | |/|
| * | | Merge pull request #480 from textbook/masterJustin Mayer2017-02-141-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | Include custom CSS theming in Bulrush.Jonathan Sharpe2017-02-131-0/+0
| | * | Update Bulrush for Jinja 2.9 compatibility.Jonathan Sharpe2017-01-191-0/+0
| | |/
| * | Merge pull request #485 from patrickpierson/fixes-pages-context-tuxlite-tbsJustin Mayer2017-02-061-1/+1
| |\ \
| | * | fixes pages context change for tuxlite_tbs themePatrick Pierson2017-02-041-1/+1
| |/ /
| * | Merge pull request #484 from kplaube/masterJustin Mayer2017-02-011-0/+0
| |\ \ | | |/ | |/|
| | * Update yapeme to 0.1.0Klaus Laube2017-02-011-0/+0
| |/
| * Merge pull request #473 from art1fa/add_minimalXJustin Mayer2017-01-031-0/+3
| |\
| | * Add minimalX theme to repositoryart1fa2017-01-031-0/+3
| |/
* / Add minimalX theme to repositoryart1fa2017-01-092-0/+3
|/
* Merge pull request #468 from laughk/masterJustin Mayer2016-12-311-0/+0
|\
| * Update pelican-hss to v1.0.2Kei Iwasaki2016-12-291-0/+0
| * Update pelican-hss to v1.0.1Kei Iwasaki2016-12-271-0/+0
* | Merge pull request #469 from chrismullins/update-bootstrap3-fontawesomeJustin Mayer2016-12-3110-576/+3225
|\ \
| * | Update FontAwesome to 4.7.0.Christopher Mullins2016-12-2710-576/+3225
| |/
* | Restore "coding-now" theme; remove spurious submoduleJustin Mayer2016-12-3171-0/+2387
* | Merge pull request #465 from jranke/issue_460_i18nJustin Mayer2016-12-302-833/+9
|\ \ | |/ |/|
| * Update documentation to clarify dependenciesJohannes Ranke2016-12-222-833/+9
|/
* Merge pull request #462 from textbook/masterJustin Mayer2016-12-151-0/+0
|\
| * Update Bulrush for Pelican 3.7.Jonathan Sharpe2016-12-141-0/+0
|/
* Merge pull request #441 from jranke/i18nJustin Mayer2016-12-1328-49/+1210
|\
| * Make pelican-bootstrap3 multilingualJohannes Ranke2016-12-1328-49/+1210
|/
* Merge pull request #459 from rwanyoike/update-alchemy-2.0Justin Mayer2016-12-131-0/+0
|\
| * pelican-alchemy: update to track v2.0 tagRaymond Wanyoike2016-12-131-0/+0