Commit Graph

929 Commits

Author SHA1 Message Date
Scott Walkinshaw
54c08d6d95 Merge pull request #869 from 01walid/master
Add Arabic translation
2013-09-04 05:12:04 -07:00
Walid ZIOUCHE
c5656fb8c4 Add Arabic translation 2013-09-04 10:57:30 +01:00
Ben Word
525ac75cd4 Merge pull request #856 from weslly/grunt-watch-livereload
Added browser live reloading to Grunt
2013-09-02 09:25:23 -07:00
Ben Word
eefcec83f8 Merge pull request #864 from schrapel/master
Hide Google Analytics to admins to prevent obscured data.
2013-08-31 16:28:56 -07:00
Foxaii
433a0c229b Merge pull request #865 from roots/docs
Add fonts to Nginx rewrites
2013-08-30 06:07:51 -07:00
Foxaii
fd351fd7c4 Add fonts to Nginx rewrites 2013-08-30 14:04:33 +01:00
Toby
409939bf82 Hide Google Analytics to admins to prevent obscured data. 2013-08-30 10:34:33 +01:00
Scott Walkinshaw
bdde0e5ae1 Merge pull request #861 from novrian/develop
Update translation in Bahasa Indonesia
2013-08-28 15:56:32 -07:00
Novrian Y.F
40494717eb Merge branch 'update-id_ID' into develop 2013-08-29 06:48:46 +08:00
Novrian Y.F
1d1231f4d4 Update translation in Bahasa Indonesia 2013-08-29 06:47:52 +08:00
Ben Word
0d6a8dbdfd Update $content_width 2013-08-25 20:06:17 -05:00
Ben Word
536080600a Update npm install instructions 2013-08-25 19:08:42 -05:00
Weslly Honorato
f2d54129ff Add .php files to livereload 2013-08-25 20:49:12 -03:00
Scott Walkinshaw
5fa178032f Merge pull request #859 from weslly/patch-1
Updated app.less version
2013-08-25 14:01:31 -07:00
Weslly Honorato
34ab26d439 Updated app.less version 2013-08-25 17:59:39 -03:00
Scott Walkinshaw
b7118abb31 Merge pull request #858 from leoj3n/app-less-formatting
Fix formatting in app.less
2013-08-25 13:53:51 -07:00
Joel Kuzmarski
d689fd5647 Fix formatting in app.less 2013-08-25 13:58:12 -05:00
Scott Walkinshaw
2530180948 Merge pull request #855 from weslly/fix-jshint
Fixed error with jshint's ES5 option
2013-08-25 09:47:17 -07:00
Weslly Honorato
30ace3c647 Added browser live reloading to Grunt 2013-08-24 17:23:14 -03:00
Weslly Honorato
c41d4cea66 Fixed error with jshint's ES5 option 2013-08-24 17:05:11 -03:00
Ben Word
41085d2e55 Merge pull request #852 from roots/6.5.0
Roots 6.5.0
2013-08-22 21:48:04 -07:00
Ben Word
d20aa0fe50 Roots 6.5.0 2013-08-22 22:25:58 -05:00
Ben Word
59237e584c Merge pull request #851 from retlehs/grunt
Merge grunt into master
2013-08-22 17:19:28 -07:00
Ben Word
4f4ffa1171 Merge pull request #850 from weslly/grunt
Update grunt dependencies and node.js version
2013-08-22 17:14:04 -07:00
Weslly Honorato
d9e22fa5a2 Update node version 2013-08-22 17:16:42 -03:00
Weslly Honorato
1c1269ed8b Update grunt dependencies 2013-08-22 17:14:00 -03:00
Ben Word
0f64a4f74e Use Bootstrap variables for media queries 2013-08-21 10:18:37 -05:00
Ben Word
0b9f64c675 Update to Bootstrap 3.0.0 2013-08-19 18:46:52 -05:00
Scott Walkinshaw
96be48c074 Merge pull request #845 from Foxaii/sidebar-args
Sidebar support for args array
2013-08-19 16:28:51 -07:00
Ben Word
71dd266db8 Merge pull request #847 from Foxaii/v3.0.0
Update to Bootstrap 3.0.0
2013-08-19 16:19:09 -07:00
Foxaii
f2f2a7261f Update CHANGELOG.md 2013-08-19 23:46:34 +01:00
Foxaii
c63fa4f1e5 Navbar & Column Classes 2013-08-19 23:32:50 +01:00
Foxaii
97c6eb2544 BS3 Final 2013-08-19 22:54:05 +01:00
Foxaii
e5ca12d41c Sidebar support for args array 2013-08-18 23:47:23 +01:00
Scott Walkinshaw
a56551a9e0 Merge pull request #844 from kukac7/master
hungarian lang update
2013-08-16 09:00:57 -07:00
béla
20b8a02d46 hungarian lang update 2013-08-16 17:49:45 +02:00
Scott Walkinshaw
875da192dd Merge pull request #843 from davoudrafati/patch-1
Update usage.md
2013-08-14 05:33:34 -07:00
Davoud Rafati
295cd80463 Update usage.md 2013-08-14 11:35:31 +04:30
Ben Word
fb8bc0973a Update to latest Bootstrap 3 (RC2) 2013-08-13 22:55:47 -05:00
Ben Word
865558534b Update to latest Bootstrap 3 (RC2) 2013-08-13 22:50:59 -05:00
Ben Word
08d2368cd1 Import Bootstrap from app.less 2013-08-13 22:30:55 -05:00
Ben Word
bdbbda9f6b Merge branch 'master' into grunt 2013-08-13 22:24:24 -05:00
Scott Walkinshaw
be01f33d0b Merge pull request #839 from weslly/master
Updated pt_BR translation
2013-08-12 10:56:02 -07:00
Weslly Honorato
243fa3e107 Updated pt_BR translation 2013-08-12 14:02:49 -03:00
Ben Word
336706a1b8 Merge pull request #838 from Foxaii/nav-depth
Allow nav depth override
2013-08-11 19:54:35 -07:00
Foxaii
80e77837dd Allow nav depth override 2013-08-11 21:59:19 +01:00
Scott Walkinshaw
b449d6ffab Merge pull request #836 from coolalpaca/grunt
Closes #785 - Added grunt-imageoptim task
2013-08-11 10:08:19 -07:00
Scott Walkinshaw
a8d1a09612 Merge pull request #827 from montchr/rewrites-assets
reduce specificity in activation assets rewrites
2013-08-11 10:07:44 -07:00
Scott Walkinshaw
8d97cf862e Merge pull request #837 from zareh777/master
persian language
2013-08-11 10:05:39 -07:00
zareh777
ee41b74766 persian language
persian language
2013-08-11 14:17:08 +04:30