Commit Graph

137 Commits

Author SHA1 Message Date
Denis Kisselev
1261c88d1c Merge pull request #104 from ahluntang/master
Remove extra <br> after list.
2013-12-16 00:49:18 -08:00
Ah-Lun Tang
04274d6872 Remove extra <br> after list. 2013-12-10 17:34:10 +01:00
Denis Kisselev
3d2c055395 Add http://daux.emx2.co.uk/ to Sites That Use Daux 2013-12-09 16:29:41 -08:00
Denis Kisselev
48e593e7a3 Add ICADMIN to Sites that use Dux 2013-12-09 16:26:10 -08:00
Denis Kisselev
6b0fb5b7f0 Merge pull request #98 from r0n22/master
Commit Piwik Tracking ID
2013-10-28 00:14:04 -07:00
r0n22
b2e197dec4 Update config.json back to default 2013-10-22 21:49:07 -04:00
Cameron Regan
4b1fdf138e Commit Piwik Tracking ID 2013-10-22 16:50:46 -04:00
Denis Kisselev
a6f1c31537 Merge pull request #97 from nicolas-brousse/patch-1
Harmonization of indentation and debug "Undefined variable: language"
2013-10-18 19:08:31 -07:00
Nicolas Brousse
abdbfdc817 Harmonization of indentation and debug "Undefined variable: language" 2013-10-18 23:48:47 +02:00
Denis Kisselev
013ac7f67b Merge pull request #96 from qazwsxedc121/master
Add JavaScript fallback for then jQuery can't be loaded online.
2013-10-16 12:00:09 -07:00
guoxc
307155e673 Allow Daux.io to function without Internet Connectivity 2013-10-15 15:16:49 +08:00
Denis Kisselev
d9add9d876 Merge branch 'development' 2013-10-08 13:06:25 -07:00
Denis Kisselev
16f58b382e Merge pull request #94 from emmgfx/patch-1
Issue #78 solution
2013-10-08 13:01:17 -07:00
Josep Viciana
56e8edebb8 Issue #78 solution 2013-10-08 16:57:28 +02:00
Denis Kisselev
91ab02f7e3 Merge pull request #92 from GeoffYoung/php_flags
Remove php flags from .htaccess
2013-10-05 15:18:18 -07:00
Geoff Young
4f1797717a Remove php flags from .htaccess 2013-10-04 21:51:04 -04:00
Denis Kisselev
7c9f7de7fe Merge pull request #91 from kisselev/development
Manual merge of PR 69
2013-10-03 14:17:47 -07:00
Denis Kisselev
78b510a766 Manual merge of PR 69 2013-10-03 14:16:42 -07:00
Denis Kisselev
518f1b55a9 Merge pull request #90 from justinwalsh/master
Sync develop with master.
2013-10-03 12:30:35 -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
0a247e6102 Merge pull request #67 from Stanton/master
Allow docs path to be configured in config.json
2013-10-03 12:29:14 -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
Denis Kisselev
d421154b33 Merge pull request #88 from Soullivaneuh/master
Remove / on the homepage brand link, solves #86. Fixes the site title link on homepage.
2013-10-03 12:27:25 -07:00
R.M
c5f112323a Support for cyrillic URLs 2013-10-03 19:30:27 +04:00
Sullivan SENECHAL
876fb3594c Remove / on the homepage brand link 2013-10-02 14:16:43 +02: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
590ba2c4f3 Merge pull request #70 from hell0w0rd/composer-patch
Add composer support
2013-09-09 10:54:27 -07: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
Justin Walsh
9ae83a9f6b Merge pull request #75 from clevercherry/ignore-hidden-files
Implemented a more encompassing hidden-files ignore rule.
2013-09-09 10:47:25 -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
Gusakov Nikita
eda12fa9f4 fix author site to homepage 2013-08-30 01:18:53 +04:00
Gusakov Nikita
6d543ac3fa add composer.json 2013-08-30 01:00:00 +04:00
larukedi
cfb5c6ef0c * updated README.md for multi-language support. 2013-08-23 22:57:50 +03:00
larukedi
ca377311e9 * multi-language support. 2013-08-23 22:49:08 +03:00
Paul Stanton
fd86353ab3 Document the ability to supply a custom docs path 2013-08-22 23:26:07 +02:00
Paul Stanton
6b041596fb Allow docs path to be configured in config.json
This helps when integrating daux.io within a larger project using Bower where we want to keep our docs outside of the daux.io directory and want to keep our filepath changes isolated to the config file rather than modifying index.php.
2013-08-22 11:01:59 +02:00
Justin Walsh
f540c54482 Merge pull request #58 from mcatominey/mobile-menu-fix
Fixed collapse button on mobile menu: included missing bootstrap js
2013-08-05 05:12:44 -07:00
Justin Walsh
c526491eab Merge pull request #60 from zoerooney/master
Added class 'clearfix' to page-header
2013-08-02 08:12:47 -07:00
Zoe Rooney
9771a4376a Added class 'clearfix' to page-header
Closes #59
2013-08-02 08:08:53 -04:00
Peter McAtominey
5d9a07cdb2 Built own responsive menu solution to replace bootstraps 2013-07-31 09:17:05 +02:00
Peter McAtominey
ab709b924d Javascript workaround for mobile nag bar 2013-07-31 00:46:27 +02:00
Peter McAtominey
7d984a2cce Fixed collapse button on mobile menu: included missing bootstrap js 2013-07-30 23:06:41 +02:00
kisselev
4763b8d970 Merge remote-tracking branch 'upstream/master'
Conflicts:
	README.md
2013-07-30 09:16:55 -07: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
Justin Walsh
026b76c59e Copy readme over 2013-07-30 08:56:16 -05:00
Justin Walsh
71b7daadc8 Merge pull request #54 from ashclarke/master
Added typical configuration for IIS servers.
2013-07-30 06:55:35 -07:00