]>
jfr.im git - irc/freenode/web-7.0.git/log
Ed Kellett [Tue, 23 Feb 2016 21:15:06 +0000 (21:15 +0000)]
chmod deploy.key, harder deploy.sh
Ed Kellett [Tue, 23 Feb 2016 21:10:05 +0000 (21:10 +0000)]
Merge branch 'travis-deploy'
Ed Kellett [Tue, 23 Feb 2016 21:09:31 +0000 (21:09 +0000)]
executable ssh.sh
Ed Kellett [Tue, 23 Feb 2016 21:05:39 +0000 (21:05 +0000)]
Merge branch 'travis-deploy'
Ed Kellett [Tue, 23 Feb 2016 21:01:48 +0000 (21:01 +0000)]
deploy: set username
Ed Kellett [Tue, 23 Feb 2016 20:51:21 +0000 (20:51 +0000)]
really fix travis deployment
svbeon [Tue, 23 Feb 2016 20:51:07 +0000 (21:51 +0100)]
Merge pull request #10 from freenode/template-analytics
Adding analytics
Svante Bengtson [Tue, 23 Feb 2016 20:35:57 +0000 (21:35 +0100)]
Adding analytics
Ed Kellett [Tue, 23 Feb 2016 20:33:50 +0000 (20:33 +0000)]
fix travis.yml
Ed Kellett [Tue, 23 Feb 2016 20:23:40 +0000 (20:23 +0000)]
add travis deployment
Ed Kellett [Tue, 23 Feb 2016 18:03:36 +0000 (18:03 +0000)]
pull the footer out of base.html
svbeon [Tue, 23 Feb 2016 19:02:38 +0000 (20:02 +0100)]
typo
svbeon [Tue, 23 Feb 2016 18:56:53 +0000 (19:56 +0100)]
Update README.md
svbeon [Tue, 23 Feb 2016 18:54:38 +0000 (19:54 +0100)]
Update .travis.yml
m712 [Tue, 23 Feb 2016 18:50:39 +0000 (20:50 +0200)]
Merge branch 'master' of https://github.com/freenode/web-7.0
a
m712 [Tue, 23 Feb 2016 18:49:51 +0000 (20:49 +0200)]
renamed mock1.css to source.css
svbeon [Tue, 23 Feb 2016 18:40:08 +0000 (19:40 +0100)]
Update CONTRIBUTE.md
svbeon [Tue, 23 Feb 2016 18:38:09 +0000 (19:38 +0100)]
Update README.md
John Dallahan [Tue, 23 Feb 2016 18:35:02 +0000 (20:35 +0200)]
Merge pull request #9 from freenode/design-boxes
Design boxes
svbeon [Tue, 23 Feb 2016 18:33:26 +0000 (19:33 +0100)]
Update README.md
Svante Bengtson [Tue, 23 Feb 2016 18:31:17 +0000 (19:31 +0100)]
Merge branch 'master' into design-boxes
Svante Bengtson [Tue, 23 Feb 2016 18:29:52 +0000 (19:29 +0100)]
update prefixes
Svante Bengtson [Tue, 23 Feb 2016 18:28:16 +0000 (19:28 +0100)]
Merge branch 'design' of github.com:freenode/web-7.0 into design
m712 [Tue, 23 Feb 2016 18:27:45 +0000 (20:27 +0200)]
new box style & mobile improvements
Svante Bengtson [Tue, 23 Feb 2016 18:27:41 +0000 (19:27 +0100)]
Merge branch 'master' into design
Svante Bengtson [Tue, 23 Feb 2016 18:26:37 +0000 (19:26 +0100)]
Started adding contribution rules
Svante Bengtson [Tue, 23 Feb 2016 18:01:06 +0000 (19:01 +0100)]
merge master
Svante Bengtson [Tue, 23 Feb 2016 17:55:28 +0000 (18:55 +0100)]
merge
Svante Bengtson [Tue, 23 Feb 2016 17:48:04 +0000 (18:48 +0100)]
moving
Ed Kellett [Tue, 23 Feb 2016 17:46:09 +0000 (17:46 +0000)]
Merge branch 'templates'
Conflicts:
index_mock1.html
static/css/mock1.css
static/css/style.css
Svante Bengtson [Tue, 23 Feb 2016 17:45:39 +0000 (18:45 +0100)]
moving clarity
Svante Bengtson [Tue, 23 Feb 2016 17:44:46 +0000 (18:44 +0100)]
merge
Ed Kellett [Tue, 23 Feb 2016 17:10:31 +0000 (17:10 +0000)]
one more relative url!
Ed Kellett [Tue, 23 Feb 2016 16:56:28 +0000 (16:56 +0000)]
templates/base: more relative urls
Ed Kellett [Tue, 23 Feb 2016 16:56:11 +0000 (16:56 +0000)]
templates/index: better article display
Christel Dahlskjaer [Tue, 23 Feb 2016 16:34:52 +0000 (16:34 +0000)]
Create .travis.yml
Ed Kellett [Tue, 23 Feb 2016 16:18:13 +0000 (16:18 +0000)]
relative urls
Ed Kellett [Tue, 23 Feb 2016 16:16:48 +0000 (16:16 +0000)]
Fix article template
Ed Kellett [Tue, 23 Feb 2016 15:55:47 +0000 (15:55 +0000)]
remove space around metadata separator
Svante Bengtson [Tue, 23 Feb 2016 16:10:51 +0000 (17:10 +0100)]
new color
Svante Bengtson [Tue, 23 Feb 2016 16:08:11 +0000 (17:08 +0100)]
updated template
Svante Bengtson [Tue, 23 Feb 2016 15:56:08 +0000 (16:56 +0100)]
templates
Svante Bengtson [Tue, 23 Feb 2016 15:40:06 +0000 (16:40 +0100)]
article template
Svante Bengtson [Tue, 23 Feb 2016 15:36:59 +0000 (16:36 +0100)]
using sq logo
Svante Bengtson [Tue, 23 Feb 2016 15:31:41 +0000 (16:31 +0100)]
oops
Svante Bengtson [Tue, 23 Feb 2016 15:30:52 +0000 (16:30 +0100)]
square icons
Svante Bengtson [Tue, 23 Feb 2016 15:28:14 +0000 (16:28 +0100)]
merge
Ed Kellett [Tue, 23 Feb 2016 14:47:46 +0000 (14:47 +0000)]
add cms7 config.yml
Ed Kellett [Tue, 23 Feb 2016 14:40:26 +0000 (14:40 +0000)]
Template changes to make templating actually work
Svante Bengtson [Tue, 23 Feb 2016 14:39:20 +0000 (15:39 +0100)]
updates
Svante Bengtson [Tue, 23 Feb 2016 13:59:38 +0000 (14:59 +0100)]
tidying
Svante Bengtson [Tue, 23 Feb 2016 13:44:19 +0000 (14:44 +0100)]
update css
m712 [Tue, 23 Feb 2016 13:23:53 +0000 (15:23 +0200)]
Small tweaks
m712 [Tue, 23 Feb 2016 12:47:25 +0000 (14:47 +0200)]
Created separate branch, made it look (subjectively) better & added some small transitions
Svante Bengtson [Tue, 23 Feb 2016 12:12:46 +0000 (13:12 +0100)]
Merge branch 'templates' of https://github.com/freenode/web-7.0.git into templates
Svante Bengtson [Tue, 23 Feb 2016 12:08:38 +0000 (13:08 +0100)]
Updated readme
Svante B [Tue, 23 Feb 2016 12:01:52 +0000 (12:01 +0000)]
updated style
Svante Bengtson [Tue, 23 Feb 2016 11:59:16 +0000 (12:59 +0100)]
Merge branch 'templates' of https://github.com/freenode/web-7.0.git into templates
Svante Bengtson [Tue, 23 Feb 2016 11:59:09 +0000 (12:59 +0100)]
Update
Svante Bengtson [Tue, 23 Feb 2016 11:52:17 +0000 (12:52 +0100)]
Updated style
Svante B [Tue, 23 Feb 2016 11:42:07 +0000 (11:42 +0000)]
updated style
Svante Bengtson [Tue, 23 Feb 2016 11:41:27 +0000 (12:41 +0100)]
Merge branch 'master' of https://github.com/freenode/web-7.0.git
Svante Bengtson [Tue, 23 Feb 2016 11:39:23 +0000 (12:39 +0100)]
Resolving merge issues
m712 [Tue, 23 Feb 2016 11:36:44 +0000 (13:36 +0200)]
Re-removed borders
m712 [Tue, 23 Feb 2016 11:35:23 +0000 (13:35 +0200)]
Minor fixes
m712 [Tue, 23 Feb 2016 11:33:46 +0000 (13:33 +0200)]
Merge branch 'master' of https://github.com/freenode/web-7.0
merge
Svante Bengtson [Tue, 23 Feb 2016 11:33:39 +0000 (12:33 +0100)]
Merge branch 'master' of https://github.com/freenode/web-7.0.git
Svante Bengtson [Tue, 23 Feb 2016 11:33:31 +0000 (12:33 +0100)]
Remove divider
m712 [Tue, 23 Feb 2016 11:33:23 +0000 (13:33 +0200)]
Minor fixes
Svante B [Tue, 23 Feb 2016 11:26:38 +0000 (11:26 +0000)]
updated style
Svante Bengtson [Tue, 23 Feb 2016 10:50:16 +0000 (11:50 +0100)]
Margins
Svante Bengtson [Tue, 23 Feb 2016 10:42:25 +0000 (11:42 +0100)]
Merge branch 'master' of https://github.com/freenode/web-7.0.git
Svante Bengtson [Tue, 23 Feb 2016 10:42:12 +0000 (11:42 +0100)]
Fixes
John Dallahan [Tue, 23 Feb 2016 10:34:34 +0000 (12:34 +0200)]
fix readme again
John Dallahan [Tue, 23 Feb 2016 10:33:34 +0000 (12:33 +0200)]
Fixed markdown
leaving broken things be is my pet peeve
Svante Bengtson [Tue, 23 Feb 2016 10:25:31 +0000 (11:25 +0100)]
Fixes
m712 [Tue, 23 Feb 2016 10:24:46 +0000 (12:24 +0200)]
Fixed copyright bar
Svante B [Tue, 23 Feb 2016 09:42:42 +0000 (09:42 +0000)]
updated style
Svante B [Tue, 23 Feb 2016 09:42:38 +0000 (09:42 +0000)]
updated style
Svante Bengtson [Tue, 23 Feb 2016 09:42:20 +0000 (10:42 +0100)]
Updates
Svante Bengtson [Tue, 23 Feb 2016 09:41:35 +0000 (10:41 +0100)]
Fixes
Svante Bengtson [Tue, 23 Feb 2016 09:23:49 +0000 (10:23 +0100)]
Static prefix
Svante B [Tue, 23 Feb 2016 09:20:17 +0000 (09:20 +0000)]
updated style
Svante Bengtson [Tue, 23 Feb 2016 09:19:33 +0000 (10:19 +0100)]
Merge
Svante B [Tue, 23 Feb 2016 09:14:02 +0000 (09:14 +0000)]
updated style
svbeon [Tue, 23 Feb 2016 09:08:56 +0000 (10:08 +0100)]
Merge pull request #7 from mission712/master
Viewport usage
m712 [Tue, 23 Feb 2016 09:02:36 +0000 (11:02 +0200)]
Viewport usage
Svante B [Tue, 23 Feb 2016 02:43:32 +0000 (02:43 +0000)]
updated style
Svante Bengtson [Tue, 23 Feb 2016 02:27:19 +0000 (03:27 +0100)]
Same row
svbeon [Tue, 23 Feb 2016 02:05:20 +0000 (03:05 +0100)]
Update README.md
Svante Bengtson [Tue, 23 Feb 2016 02:00:34 +0000 (03:00 +0100)]
Removing as no longer needed
Svante Bengtson [Tue, 23 Feb 2016 02:00:16 +0000 (03:00 +0100)]
Added two first oosts
Svante B [Tue, 23 Feb 2016 01:48:37 +0000 (01:48 +0000)]
tudying
Svante Bengtson [Tue, 23 Feb 2016 01:40:57 +0000 (02:40 +0100)]
Rearranging
Svante Bengtson [Tue, 23 Feb 2016 01:30:44 +0000 (02:30 +0100)]
Rename
Svante Bengtson [Tue, 23 Feb 2016 01:28:29 +0000 (02:28 +0100)]
Added articles list
Svante Bengtson [Tue, 23 Feb 2016 01:19:21 +0000 (02:19 +0100)]
Base template added
Svante B [Tue, 23 Feb 2016 01:09:29 +0000 (01:09 +0000)]
prep merge
Svante B [Tue, 23 Feb 2016 01:04:26 +0000 (01:04 +0000)]
Merge branch 'master' into mockup
Conflicts:
css/mock1.css
index_mock1.html
Svante B [Tue, 23 Feb 2016 00:57:27 +0000 (00:57 +0000)]
updated style