8
0
Fork 0
Commit graph

367 Commits

Autor SHA1 Nachricht Datum
Stéphane Goetz e343c03d5e Merge all daux themes together and introduce variants 2015-08-09 23:06:50 +02:00
Stéphane Goetz 9dca1e09c0 remove bootstrap-js and require-jquery as theme options 2015-08-09 22:19:06 +02:00
Stéphane Goetz 3db09add7e Fix generation 2015-08-09 22:18:23 +02:00
Stéphane Goetz cee589fbad Merge branch 'dev_template_refactor' of https://github.com/holodyn/daux.io into holodyn-dev_template_refactor
# By David Hunt
# Via David Hunt
* 'dev_template_refactor' of https://github.com/holodyn/daux.io:
  Updated libs to use /templates and /themes/{theme}/templates Renamed /themes/core to /themes/daux Updated /themes/{theme}/less/theme.less to allow for bootstrap overrides Added /themes/daux/less/theme.less to allow daux to function as theme - used daux-navy colors Moved fonts from themes variants into /themes/daux/fonts
  Refactored /templates and /resources into a single /themes folder.

# Conflicts:
#	libs/Daux.php
2015-08-09 21:29:23 +02:00
David Hunt f9d87c5c71 Updated libs to use /templates and /themes/{theme}/templates
Renamed /themes/core to /themes/daux
Updated /themes/{theme}/less/theme.less to allow for bootstrap overrides
Added /themes/daux/less/theme.less to allow daux to function as theme - used daux-navy colors
Moved fonts from themes variants into /themes/daux/fonts
2015-08-06 16:47:38 -04:00
Stéphane Goetz 01df221476 Fixed compilation of created pages 2015-08-06 22:05:17 +02:00
Stéphane Goetz 2f5abb8488 Make sure the entries that just have a number work correctly 2015-08-04 22:40:24 +02:00
Stéphane Goetz b1eaa506b2 Code Style 2015-08-04 22:29:26 +02:00
Stéphane Goetz 27e0e8780c Merge pull request #299 from holodyn/dev_inherit_index
Added inherit_index feature
2015-08-02 14:58:59 +02:00
David Hunt fca2b4dc6a Refactored /templates and /resources into a single /themes folder. 2015-07-31 11:54:02 -04:00
Stéphane Goetz d2b45a845f Pass the original node on generation 2015-07-31 12:53:22 +02:00
David Hunt 551e03dc93 Merge remote branch 'upstream/development' into development 2015-07-30 17:44:11 -04:00
Stéphane Goetz d5458c5a0f Fix template finding 2015-07-30 15:41:38 +02:00
Stéphane Goetz 651f860222 Improve the builder to support file extension, for contentTypes 2015-07-29 22:39:19 +02:00
Stéphane Goetz 489fc6a2d4 LiveGenerator interface should extend Generator 2015-07-29 22:31:59 +02:00
Stéphane Goetz e543a107b1 Extract ContentType from format 2015-07-29 22:31:41 +02:00
Stéphane Goetz 386f323dd0 Hide directories that have no content 2015-07-29 08:30:41 +02:00
Stéphane Goetz 114a0f29b7 Be able to set the source directory on command line 2015-07-28 17:26:35 +02:00
Stéphane Goetz b5ce4f1d79 Added a content type system to be able to extend the conversion mechanism 2015-07-28 17:25:03 +02:00
David Hunt 1e1f261ea9 Patch duplicate call to seekFirstPage during recursive search. 2015-07-27 18:42:33 -04:00
Stéphane Goetz 72ebc50e6c Reorganise console classes 2015-07-23 17:44:24 +02:00
Stéphane Goetz 4fec115627 Bugfix in confluence upload. The bug in image reuploads is fixed in confluence 5.8 2015-07-23 17:43:22 +02:00
David Hunt 7a01df7ea9 Added the inherit_index feature for routing requests to directories without a valid index defined. 2015-07-21 14:34:21 -04:00
Stéphane Goetz 12739c2044 Small fixes in url generations 2015-07-21 09:51:55 +02:00
Stéphane Goetz 061ea5ea55 Code Style and refactorings 2015-07-20 20:51:49 +02:00
Stéphane Goetz f903b0060c Fix index pages detection in live mode 2015-07-20 20:51:48 +02:00
Stéphane Goetz d921c412b5 Add format and processor as configuration options for live mode 2015-07-20 20:51:48 +02:00
Stéphane Goetz c00dfac001 Change configuration format 2015-07-20 20:51:48 +02:00
Stéphane Goetz f757e88040 Fixed base url problems in live mode 2015-07-20 20:51:48 +02:00
Stéphane Goetz 1f167db1f6 Fixed error page 2015-07-20 20:51:48 +02:00
Stéphane Goetz 932fab5a84 Transform the server to be able to use the Generator 2015-07-20 20:51:48 +02:00
Stéphane Goetz d531de86cf Cleaned getFirstPage a bit 2015-07-20 20:51:48 +02:00
Stéphane Goetz 87fbb6f15d Initialize the markdown parser only once. 2015-07-20 20:51:48 +02:00
Stéphane Goetz e3a3438ccd Improve processors
Now you can add generators and extend the markdown parser
2015-07-20 20:51:48 +02:00
Stéphane Goetz bb3a3408fd Bugfix in the path rebase from the HTML Generator 2015-07-20 20:51:42 +02:00
Stéphane Goetz e70461b641 Fix and simplify homepage detection in HTML generator 2015-07-20 20:51:41 +02:00
Stéphane Goetz a13469047a Move getIndexPage and getFirstPage to Directory 2015-07-20 20:51:41 +02:00
Stéphane Goetz e87c86d9aa Added documentation 2015-07-20 20:51:41 +02:00
Stéphane Goetz 7dc7c045d4 Bugfixes 2015-07-20 20:51:32 +02:00
Stéphane Goetz aa5602a0fb Refactor the tree system
Each element of the tree now only has one parent, not a parent array.

- Creating an elements doesn't necessarily rely on an existing file
- Moving elements unregisters elements from the previous parent
- Moved some helpers to the builder instead of Entry
2015-07-20 20:51:32 +02:00
Stéphane Goetz 3235c49acd Refactor to not use ->value in the tree 2015-07-20 20:51:32 +02:00
Stéphane Goetz 9cdc9815ea Add a few checks 2015-07-20 20:51:32 +02:00
Stéphane Goetz 71d1041cb8 Refactor getFirstPage 2015-07-20 20:51:32 +02:00
Stéphane Goetz ce109d0429 Cosmetic changes 2015-07-20 20:51:32 +02:00
Stéphane Goetz a35af5fd19 Remove the file editor 2015-07-20 20:51:32 +02:00
Stéphane Goetz 4f8d817365 Code Style and documentation 2015-07-20 20:51:13 +02:00
Stéphane Goetz e7afd9aa28 Add a more advanced processor system 2015-07-20 20:51:12 +02:00
Stéphane Goetz 8dd3c1d6f8 Add missing helpers 2015-07-20 20:51:12 +02:00
Stéphane Goetz a5afc23cda Bugfix on confluence API 2015-07-20 20:51:12 +02:00
Stéphane Goetz f64758aeec Improve Tree API 2015-07-20 20:51:12 +02:00
Stéphane Goetz a044b4b0ca Improve tree api 2015-07-20 20:51:12 +02:00
Stéphane Goetz 290f52d181 Finish the processor system 2015-07-20 20:51:12 +02:00
Stéphane Goetz 1f4f18dccf Bugfixes in confluence 2015-07-20 20:50:49 +02:00
Stéphane Goetz 4f33394c77 Compile archive to phar 2015-07-20 20:50:49 +02:00
Stéphane Goetz cd65072a20 Use symfony console, nicer output 2015-07-20 20:50:42 +02:00
Stéphane Goetz e3c9ce98b8 Use the right entry page 2015-07-20 20:49:19 +02:00
Stéphane Goetz b5dd82fe2a Added debug to confluence publishing 2015-07-20 20:49:19 +02:00
Stéphane Goetz 5791fccea8 Added internal documentation links 2015-07-20 20:49:19 +02:00
Stéphane Goetz 60b50919b4 Remove "default.json" concentrate all configurations in "global.json"
Set configurations in an Object instead of an array
2015-07-20 20:49:19 +02:00
Stéphane Goetz 100568bfbb Preload more data in getList 2015-07-20 20:49:19 +02:00
Stéphane Goetz 8901634790 Fix bugs and optimized upload time 2015-07-20 20:49:19 +02:00
Stéphane Goetz 63d6b17ec4 Bugfixes related to themes and Commonmark migration 2015-07-20 20:49:19 +02:00
Stéphane Goetz 1fe3e62df3 Improve confluence export
Migrate from Parsedown to Commonmark
2015-07-20 20:49:19 +02:00
Stéphane Goetz fa798ff1e4 Bugfixes 2015-07-20 20:49:19 +02:00
Stéphane Goetz 1445bf7c0f Added confluence export type, starts to work 2015-07-20 20:49:18 +02:00
Stéphane Goetz 90dbdb4f0b Create a notion of Export format, prepare for multiple generation systems 2015-07-20 20:49:15 +02:00
Stéphane Goetz d01374dddb Fix first page calculation 2015-07-20 20:49:14 +02:00
Stéphane Goetz 3e374c7585 Fix server, now returns files that are in the `docs` folder 2015-07-20 20:49:14 +02:00
Stéphane Goetz 36c663ac41 Various cleanups 2015-07-20 20:49:14 +02:00
Stéphane Goetz 976db8925d Fix header homepage in generated mode 2015-07-20 20:49:14 +02:00
Stéphane Goetz b6c8b567fc Fix homepage getter 2015-07-20 20:49:14 +02:00
Stéphane Goetz f3d472363d Cleanup 2015-07-20 20:49:14 +02:00
Stéphane Goetz d817875755 Simplify template 2015-07-20 20:49:14 +02:00
Stéphane Goetz 6edd4ce477 Fix static reference to theme in generated documentation 2015-07-20 20:49:09 +02:00
Stéphane Goetz 52b679b33f New templating system 2015-07-20 20:49:09 +02:00
Stéphane Goetz de1214cbab Convert to PSR2 2015-07-20 20:49:09 +02:00
Stéphane Goetz ecd5efe758 Extract tree builder
Add related files directly in the documentation
2015-07-20 20:49:09 +02:00
Stéphane Goetz 2c228273fb Simplify `configure_theme` and `get_theme` 2015-07-20 20:49:09 +02:00
Stéphane Goetz c79c692042 Separate generator and server 2015-07-20 20:49:09 +02:00
Stéphane Goetz 90027b2a0e Convention over configuration for themes 2015-07-20 20:49:09 +02:00
Stéphane Goetz 7cdc97b58a Use PSR-4 and limit to PHP 5.4 as a minimum 2015-07-20 20:49:03 +02:00
Brandon O'Casey 6fc52ae10e Fixed a bug where index was always used rather than the actual first_page 2014-12-11 11:26:33 -05:00
Gautham Warrier c34ff07ed0 Allow Docs directory to be specified via absolute or relative path. Fix insignificant bug in Static Gen 2014-11-20 14:50:23 +05:30
Gautham Warrier 7f1992b749 Fix URL resolving errors. Also fix Grunt task for local server 2014-11-06 22:05:09 +05:30
Gautham Warrier 83979d1024 Revert "#229 Adds a button on each page, which links to file into the repository" 2014-10-29 13:29:38 +05:30
Nicolas Lœuillet c428b438a0 Adds a button on each page, which links to file into the repository 2014-10-28 14:18:56 +01:00
Sofia Ferreira 39e1b96d18 Fixes for files within dir 2014-10-24 10:06:34 +02:00
Sofia Ferreira 7981f523a4 Naive fix for serving static files and copying the templates when using the generator.php. 2014-10-21 20:54:20 +02:00
Gautham Warrier 9ef2f5aee4 Themes integrated as part of Template 2014-10-12 12:55:33 +05:30
Gautham Warrier 428e4b2ef8 Missing Pages to return Response Code 404 instead of 500. Add Fallback for proper Response Code in certain Webservers 2014-10-11 22:52:57 +05:30
laughn-man 39aaad2255 Resolve theme issues with https behind reverse proxy
Resolving 2 issues by changing the protocol to //.
When terminating https at the ACE level the HTTPS field is false
resulting in http requests for css on an https site.

Requesting the Roboto Slab font always goes over http. This is a problem
for browsers when the site is hosted over https.
2014-10-07 14:45:24 -04:00
Gautham Warrier 0e8547c784 Revert to old Clean_Urls flag in config.json 2014-09-20 01:57:14 +05:30
Gautham Warrier da7c7ed14c Add ability to push doc to bottom of index 2014-08-22 11:43:57 +05:30
Gautham Warrier f6b236994e Invert landing page trigger from 'index' to '_index' 2014-08-12 10:11:38 +05:30
Gautham Warrier 57ffe74776 Add support for passing custom Config file & Output Directory via CLI 2014-08-12 02:07:30 +05:30
Gautham Warrier 410fea03c1 Ensure that pathinfo() does not skip Chinese filenames 2014-08-12 02:05:51 +05:30
Gautham Warrier 2d622e40c0 Fix for accepting non-English charsets by removing unnecessary UTF encodings 2014-08-11 23:34:00 +05:30
Gautham Warrier 0296104118 Add 'index.html' suffix to url for Landing Pages in Static Generation 2014-08-11 11:28:05 +05:30
Gautham Warrier 04a68f3cdd Code rewrite to OOPs base
Update Bootstrap to v3.2 and skim built-in themes to bare essentials
2014-07-31 08:08:22 +05:30
Arthur Halet d59bbb3831 +Add compatibility with file with accent 2014-07-08 18:33:30 +02:00
Luke Carlson 316c88c90e made the fix PHP 5.3 friendly 2014-07-03 11:00:45 -04:00
Denis Kisselev 840842bbd3 Revert "Corrected query string fix" 2014-07-02 10:43:57 -07:00
Luke Carlson 7cb90f8569 corrected query string fix 2014-07-01 11:28:00 -04:00
Luke Carlson 990d86a4a9 allowed query strings when clean urls are enabled 2014-06-30 13:52:19 -04:00
Luke Carlson e14b33a8f4 fixed issue where numbers are incorrectly stripped from urls 2014-06-27 15:52:26 -04:00
Luke Carlson 0bae274e3a realized this feature has already been implemented 2014-06-11 13:21:07 -04:00
Luke Carlson 5ac0fd4b75 removed option used for debugging 2014-06-11 12:53:50 -04:00
Luke Carlson e777af7593 edited generate_page to allow for landing pages per folder 2014-06-11 11:59:28 -04:00
Luke Carlson e3cd46c043 edited generate_live to allow for landing pages per folder 2014-06-11 11:58:56 -04:00
Luke Carlson 488704e307 created option for breadcrumb style titles 2014-05-30 18:02:19 -04:00
Gautham Warrier ca67542466 Replace Parsedown manual loading with Composer's Autoloader 2014-05-18 15:29:54 +05:30
Denis Kisselev 839fe2abb6 Deleting residual Markdown Extra library (in favour of Parsedown which is more actively maintained) 2014-05-17 11:20:28 -07:00
Denis Kisselev 8681ec1a80 Merge pull request #144 from BrandonOCasey/master
Added error handling for JSON decode returning NULL
2014-05-17 11:05:20 -07:00
Denis Kisselev 8689e89c39 Merge pull request #160 from TheSisb/master
Switching from php-markdown to Parsedown as the Markdown parser
2014-05-17 11:01:17 -07:00
Shadi Isber 89141b5edb Switching to parsedown and composer edits 2014-04-22 13:19:03 -07:00
Khaled Hammouda 5afd394ac9 Tabs to spaces 2014-04-09 17:23:23 -04:00
Khaled Hammouda 2bcd8cb688 Support for landing page per folder (index.md) #38 2014-04-09 17:15:50 -04:00
Brandon Casey(Work) 85eb99df03 Added Error Handling for invalid JSOn 2014-03-28 16:49:36 -04:00
Denis Kisselev 3cfefb9331 Revert "Generate Index Page from first Doc when missing index.md"
This reverts commit 194e77196c.
2014-03-13 11:33:42 -07:00
Gautham Warrier 194e77196c Generate Index Page from first Doc when missing index.md 2014-03-13 14:42:13 +05:30
Gautham Warrier 33b8144304 Add support for passing config.json and Output directory as parameters in CLI
Remove unnecessary line from libs/functions.php

Add './static' to gitignore

Add Default Timezone to prevent Date() Warnings
2014-03-08 13:37:34 +05:30
Denis Kisselev c71a6e3c04 Daddyfix's modified time fix. 2014-03-06 08:57:05 -08:00
Gautham Warrier 49c23d4a6b Add additional checks for invalid request. 2014-03-04 17:28:20 +05:30
Gautham Warrier 61743f2cac Fix incompatibility issue with PHP < 5.4 2014-03-04 17:06:29 +05:30
Gautham Warrier df1c92134f Refactor Code. Everything Works 2014-02-28 12:00:01 +05:30
Gautham Warrier a1352fc78d Fix Redirect Loop when there is no index.md 2014-02-22 08:54:27 +05:30
Gautham Warrier 8cc4670134 Change Stylesheet links to point to minified files. 2014-02-19 11:13:50 +05:30
Gautham Warrier 0d81614afd Remove date() Warnings during Static Generation 2014-02-19 09:11:13 +05:30
LeoColomb b417419319 Fixes path required 2014-02-16 14:12:14 +01:00
LeoColomb 0dab9b4fee Fixes no reponse 2014-02-16 12:56:26 +01:00
Gautham Warrier 6239de16be Add Support for Hiding Code Blocks at UI level. Set Overflow of Left-Column to Hidden to remove unnecessary Scrollbar. 2014-02-14 05:00:23 +05:30
Gautham Warrier f7c0586a24 Remove unnecessary assets from being copied during Static Page Generation 2014-02-12 22:04:28 +05:30
Denis Kisselev 123b7a66b4 Merging and resolving PR 111, Adding template support and static page generation 2014-02-12 02:42:33 -08:00
Jakub Mikulas 85b1ff1e4e Editor disabled by default / updated Readme / Updated docs 2014-01-31 23:05:43 +01:00
Jakub Mikulas f9785fbb3f Code formatting / CSS patch 2014-01-20 13:32:46 +01:00
Jakub Mikulas 5533c2e838 Default for docs_path + heading 2014-01-20 13:26:34 +01:00
Jakub Mikulas eefdce41bf Inline editing of markdown files 2014-01-19 23:24:23 +01:00
Ah-Lun Tang 04274d6872 Remove extra <br> after list. 2013-12-10 17:34:10 +01:00
Cameron Regan 4b1fdf138e Commit Piwik Tracking ID 2013-10-22 16:50:46 -04:00
Denis Kisselev 78b510a766 Manual merge of PR 69 2013-10-03 14:16:42 -07:00
Denis Kisselev 1bfcbaf5c5 Merge pull request #89 from kuksikus/master
Support for cyrillic URLs
2013-10-03 12:29:28 -07:00
Denis Kisselev 19c53b4acf Merge pull request #76 from telchina/fix_chinese_doc_name_issue
fixed the Chinese document name issue
2013-10-03 12:28:17 -07:00
R.M c5f112323a Support for cyrillic URLs 2013-10-03 19:30:27 +04:00
Justin Walsh 3cb24635a0 Merge pull request #83 from kisselev/404-typo
404 typo
2013-09-24 13:02:27 -07:00
Denis Kisselev 44b719a069 Fix 404 typo
Fixes #79
2013-09-24 12:58:30 -07:00
telchina 65137c02b2 fixed issue of chinese document name 2013-09-10 11:15:46 +08:00
Justin Walsh 287ce9dd66 Merge pull request #73 from amio/patch-1
Add an url-encode method to support asian language titles in the url.
2013-09-09 10:50:07 -07:00
Alex Russell 18d7bcf83d Implemented a more encompassing hidden-files ignore rule. Therefore, removed dotted (hidden) files form ignored array. 2013-09-09 18:13:08 +02:00
Amio Jin c734ce5f2c Add an url-encode method to support asian language. 2013-09-09 17:57:11 +08:00
larukedi ca377311e9 * multi-language support. 2013-08-23 22:49:08 +03:00
Justin Walsh 5ff6a25883 Removing title and date 2013-07-30 09:11:07 -05:00
Justin Walsh be399baea3 Merge branch 'issue-41' of github.com:kisselev/daux.io into kisselev-issue-41 2013-07-30 09:04:04 -05:00
kisselev c2059e4df8 Added option to disable date_modified.
Also began moving html/styling out of the functions/php logic.
2013-07-29 11:49:58 -07:00
kisselev f532918681 Removed debug traces 2013-07-26 13:30:51 -07:00
kisselev e207d427d7 Added option to disable clean urls through config file for servers that cannot do url rewriting. 2013-07-26 12:43:11 -07:00
Denis Kisselev 44a0aabd63 Added Date/Time of last modification to header 2013-07-23 13:40:08 -07:00
Justin Walsh cd4ded1120 Merge branch 'master' of github.com:epicwhale/daux.io into epicwhale-master
Conflicts:
	libs/functions.php
2013-07-22 10:53:28 -05:00
Justin Walsh 1c0bcc90f3 Merge changes 2013-07-22 10:48:18 -05:00
Dayson Pais caa3c95332 - Introduced get_uri function which retrieves the URL parts from the clean url. This works across all server configurations and also helps build relative URLs support
- Improvised methodology to check if homepage
- Introduced the $base_url variable which holds the base URL of the daux. Can be used in index.php to make URLs relative
2013-07-22 15:05:56 +05:30
Progi1984 c13fb00619 Init piwik_analytics with false 2013-07-22 08:13:00 +02:00
Justin Walsh d88302026b Removing short php tags 2013-07-12 22:26:27 -05:00
Justin Walsh 9cba493280 Adding google analytics 2013-06-21 14:36:50 -05:00
Justin Walsh aef9d107d7 Fixed path sorting 2013-06-21 11:12:14 -05:00
Justin Walsh d582eb9919 Fixing homepage changes 2013-06-21 10:49:05 -05:00
Justin Walsh 2ba1f4053f Reworking the config 2013-06-11 17:28:29 -05:00
Justin Walsh c017d16bff Cleaning up, and adding docs 2013-06-04 12:26:14 -05:00
Justin Walsh a05a9bd358 Init Commit 2013-06-03 08:32:55 -05:00