Граф коммитов

218 Коммитов

Автор SHA1 Сообщение Дата
Dirk Uys a6e97ea5ab Rename introduce-yourself to projects 2014-10-02 14:37:06 -05:00
Dirk Uys 235f5ab9c4 remove community project at the end 2014-10-02 14:34:45 -05:00
Dirk Uys 647b8e3e13 Update start 2014-10-02 14:33:51 -05:00
Dirk Uys 32686bcb20 Update first module for community 2014-10-02 14:33:30 -05:00
Dirk Uys 1648438493 Move fork instructions into /start/ 2014-10-01 19:02:43 -05:00
Dirk Uys 5ee77c2baa Merge pull request #34 from ercchy/gh-pages
CSS and layout update
2014-10-01 11:48:41 -05:00
ercchy 9b30d3ce33 adding missing files 2014-09-30 19:09:00 +02:00
ercchy 0a05f9091d working on landing page 2014-09-30 19:06:53 +02:00
ercchy 22faa84e51 working on landing page 2014-09-30 17:40:51 +02:00
ercchy 2b9f9be0c1 working on landing page 2014-09-30 17:39:25 +02:00
ercchy 2f9156c5ec adding p2pu tab 2014-09-30 17:39:10 +02:00
ercchy c866b8410d changing next and previous 2014-09-30 17:38:08 +02:00
ercchy 04c8a2f2d5 fixing sidebar 2014-09-30 17:37:37 +02:00
ercchy ea484f7c85 fixing sidebar 2014-09-30 17:37:20 +02:00
ercchy 20ebfb604c Merge branch 'gh-pages' of https://github.com/p2pu/jekyll-course-experiment into gh-pages 2014-09-29 18:20:39 +02:00
ercchy 45ac787429 fixing sidebar and active check 2014-09-29 18:17:05 +02:00
Dirk Uys 4bdc278a8e Rename tools to reference 2014-09-25 15:11:12 -05:00
ercchy b602717f7c fixing the order of the items on the sidebar 2014-09-23 21:02:27 +02:00
ercchy f056638c44 Squashed commit of the following:
commit 2b2146a30ff8725d2da95b385bcb337a21c635e0
Author: ercchy <erika@serox.si>
Date:   Tue Sep 23 20:57:58 2014 +0200

    adding the side bar

commit 173db5b0fd0938f2f3dce247de1e6055e9d5d1eb
Author: ercchy <erika@serox.si>
Date:   Tue Sep 23 20:46:20 2014 +0200

    adding the side bar
2014-09-23 20:58:41 +02:00
ercchy dd33a8b3dd adding p2pustrap 2014-09-22 16:32:42 +02:00
ercchy d63ebfc229 working on navigation layout 2014-09-22 16:32:04 +02:00
ercchy 372ccd2e6f adding .idea to gitignore 2014-09-22 13:11:20 +02:00
Dirk Uys 9d23f380d5 Add elliotharmon to signups 2014-08-18 11:05:45 -05:00
Dirk Uys 2619bdbf82 Merge pull request #32 from TheHaverchuck88/gh-pages
Instructions for merging upstream changes through GitHub
2014-08-14 15:32:19 -05:00
Tim cd18b4d3fe Forgot the images...
they're kind of importnat
2014-08-14 16:18:45 -04:00
Tim d0b40bfba3 Fixed some formatting
and a typo
2014-08-14 16:15:08 -04:00
Tim 514971e2d8 added instructions for merging upstream changes via github 2014-08-14 16:08:53 -04:00
Tim 029bb7e8c3 Merge pull request #1 from p2pu/gh-pages
Merging updates from main project
2014-08-14 15:44:02 -04:00
Dirk Uys 7f3ac0d2fd Merge pull request #31 from elsatch/gh-pages
Fixed typo and additional troubleshooting info
2014-08-12 13:14:38 -05:00
César García f4cbf853ec Added some basic troubleshooting information
First time I forked I got some errors, so I've added some troubleshooting information to help future peers.
2014-08-12 17:05:20 +02:00
César García 27e1650dbe Updated course.yml to fix a missing whitespace
Thanks Dirk for the input!
2014-08-12 16:15:05 +02:00
César García 36ae3a2133 Update 2000-01-01-your-own-course.markdown
troubleshooting jekyll
2014-08-12 01:18:50 +02:00
Dirk Uys 13f9caeb96 Update course.yml 2014-08-11 14:00:05 -05:00
Dirk Uys b780a41787 Merge pull request #30 from elsatch/gh-pages
Beam me up for the course!
2014-08-11 13:59:47 -05:00
César García 4f4f2e6cda Update course.yml
I've just included my personal data on the course.yml file, including my cybernetic photo :)
2014-08-11 20:15:24 +02:00
Dirk Uys 15dfb0da42 Move content from learning module to content module 2014-08-08 13:02:35 -05:00
Dirk Uys 70cd55c23a Update learning concepts module 2014-08-08 12:59:56 -05:00
Dirk Uys 8a6e328482 Update text for learning project 2014-08-08 12:54:28 -05:00
Dirk Uys 16772b0c43 Merge branch 'gh-pages' of github.com:p2pu/jekyll-course-experiment into gh-pages 2014-08-08 12:48:22 -05:00
Dirk Uys 819c1078de Update bit about Google hangouts 2014-08-08 12:46:55 -05:00
Dirk Uys b4f4f404da Merge pull request #29 from jbarcelo/gh-pages
added jaume
2014-08-06 21:16:50 -03:00
Jaume Barcelo 08a01455c7 added jaume 2014-08-06 20:43:32 +02:00
Dirk Uys ec0216a7eb Update tools section of community module 2014-08-05 17:01:13 -03:00
Dirk Uys 8853ac46fb Add projects for content and feedback modules 2014-08-05 17:00:46 -03:00
Dirk Uys 778bd4cc03 Update project for learning module 2014-08-05 17:00:03 -03:00
Dirk Uys dad366a4b8 Merge projects for community 2014-08-05 16:58:40 -03:00
Dirk Uys ba96fd4f1a Fix typo 2014-08-05 13:46:30 -03:00
Dirk Uys 63e8d3aac1 Resolve conflict 2014-07-31 11:15:09 -03:00
Dirk Uys 8291b48b62 Fix indentation 2014-07-31 11:14:03 -03:00
Dirk Uys b243cd86c5 Merge branch 'LauraHilliger-gh-pages' into gh-pages 2014-07-31 11:13:12 -03:00