Commit Graph

401 Commits

Author SHA1 Message Date
Stéphane Goetz
e343c03d5e Merge all daux themes together and introduce variants 2015-08-09 23:06:50 +02:00
Stéphane Goetz
8912b09a78 Update.phar 2015-08-09 22:19:26 +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
45328d5f4e Compile latest daux.phar 2015-07-23 17:45:16 +02: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
Stéphane Goetz
aeeac7788d Added chinese and russian Hello world
Everything works well, in live and static mode.

Closes #286
2015-07-21 22:52:59 +02:00
Stéphane Goetz
08f3b3a52f Compile latest .phar 2015-07-21 22:45:59 +02:00
Stéphane Goetz
642699ec7e Design fixes, fixes #288 and fixes #119 2015-07-21 22:40:13 +02:00
Stéphane Goetz
046a419c31 Passed configuration to gulp, due to grunt limitations 2015-07-21 22:37:29 +02:00
Stéphane Goetz
0298b7bf91 Clean up custom.js, rename to daux.js 2015-07-21 22:36:46 +02:00
Stéphane Goetz
848e68ea55 Update jQuery and remove bootstrap.min.js 2015-07-21 22:35:48 +02:00
Stéphane Goetz
e32155fc18 Update Glyphicons 2015-07-21 22:26:04 +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
d79e935243 Update Twitter bootstrap - did not compile yet 2015-07-21 18:45:40 +02:00
Stéphane Goetz
c6d6634857 Merge pull request #273 from onigoetz/master
Big reorganisation
2015-07-21 10:30:01 +02:00
Stéphane Goetz
2b75edc153 Latest compiled daux.phar 2015-07-21 10:33:53 +02:00
Stéphane Goetz
12739c2044 Small fixes in url generations 2015-07-21 09:51:55 +02:00
Stéphane Goetz
16f15ae2b2 Add developer documentation 2015-07-21 09:49:49 +02:00
Stéphane Goetz
09252409b2 Update grunt configuration for the embedded web server 2015-07-20 22:35:37 +02:00
Stéphane Goetz
c7b034ff81 Removed rebase surprise ... 2015-07-20 20:56:17 +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
3671214839 Update documentation 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
7d63acbf61 Update htaccess 2015-07-20 20:51:48 +02:00
Stéphane Goetz
a7962839d0 Be able to serve the website simply with the phar archive 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