mirrors/notebook
3
0
Fork 0
mirror of https://github.com/indentlabs/notebook.git synced 2025-10-26 11:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,221 Commits 83 Branches 44 Tags 172 MiB
dev-api
Commit Graph

4221 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Brown
46b2d3f2ee Update tab icons for all content types 2016-10-27 00:51:37 +02:00
Matthew Werner
149199a281 make content controller create more flexible to avoid overriding in subclass 2016-10-25 16:58:23 -07:00
Matthew Werner
0c84046330 clean up unnecessary changes 2016-10-25 16:48:07 -07:00
Matthew Werner
9299699f4b better category and field creation 2016-10-25 16:37:35 -07:00
Matthew Werner
5b58364c97 merge in upstream 2016-10-25 11:05:22 -07:00
Matthew Werner
01f791d149 merge upstream 2016-10-25 10:43:18 -07:00
Andrew Brown
cb211edb6b Add translations to relation fields partial 2016-10-24 23:05:40 +02:00
Andrew Brown
c70c079f56 Add characters, locations, and items relations to scenes 2016-10-24 22:55:46 +02:00
Andrew Brown
59608693a7 Add data migrations for english languages and human races 2016-10-24 22:43:12 +02:00
Andrew Brown
3a0f23b3e1 Add magic relations, add spoken language relation to characters 2016-10-24 22:30:38 +02:00
Andrew Brown
8700585c5e Capitalize character attributes 2016-10-24 15:10:47 +02:00
Andrew Brown
657be159c7 Minor dashboard/sidebar styling 2016-10-24 15:10:31 +02:00
Andrew Brown
8b0ce69d56 Add relations to groups 2016-10-24 14:52:30 +02:00
Andrew Brown
44d13f7086 Fix up religion links 2016-10-24 14:06:28 +02:00
Andrew Brown
33f11a8c0b Add links to religions 2016-10-22 01:21:44 +02:00
Andrew Brown
411eff77bb Create and associate races for each character with a race value 2016-10-22 00:26:00 +02:00
Andrew Brown
774d1043f6 Fix sidebar on logged-out pages 2016-10-21 23:38:47 +02:00
Andrew Brown
c3830ed4c8 Remove old password_digest field from users 2016-10-21 23:38:36 +02:00
Andrew Brown
f2895837f8 Round out race planning 2016-10-21 23:02:26 +02:00
Andrew Brown
421a7d717b Match content submit buttons to content type colors 2016-10-21 15:51:48 +02:00
Andrew Brown
c2476e2886 Add all new content types to fab 2016-10-21 15:25:55 +02:00
Andrew Brown
a72a70c893 Fix religion form 2016-10-21 15:25:47 +02:00
Andrew Brown
157dc9b5a0 Translations and serendipitous questions for creatures 2016-10-21 14:20:23 +02:00
Andrew Brown
8dd30d181e Link creatures to Location habitats 2016-10-21 13:53:55 +02:00
Andrew Brown
8e33e227b2 add new content to dashboard 2016-10-19 00:30:57 +02:00
Andrew Brown
69f6a7cbf0 Graphical headers on content index pages 2016-10-19 00:20:46 +02:00
Andrew Brown
77ab817ddf Add groups as content type 2016-10-17 23:54:23 +02:00
Andrew Brown
8d3e7ecbad Add scenes as a content type 2016-10-17 00:18:15 +02:00
Andrew Brown
618c791377 Add languages as content type 2016-10-16 23:58:54 +02:00
Andrew Brown
7add2f055a Add magic as a content type 2016-10-16 23:29:36 +02:00
Andrew Brown
848f796a5c Merge branch 'master' into content-expansion 
Conflicts:
	app/assets/stylesheets/navbar.css
 2016-10-16 23:15:48 +02:00
Andrew Brown
382d079d38 Merge pull request #140 from andrewcarreiro/readme-url-fix 
fixed notebook.ai url in readme
 2016-10-16 22:54:47 +02:00
Andrew Carreiro
3890efde05 fixed notebook.ai url in readme 2016-10-16 16:38:06 -04:00
Andrew Brown
b8e3ed530d Merge pull request #127 from andrewcarreiro/issue-121 
Adding a few keyboard commands as well as a simple dialog to give help
 2016-10-16 21:22:56 +02:00
Andrew Brown
c5c9298e1c Merge branch 'master' into issue-121 2016-10-16 21:19:39 +02:00
Andrew Brown
80a942874f Merge pull request #130 from andrewcarreiro/docker 
Docker configuration for local development
 2016-10-16 21:16:34 +02:00
Andrew Brown
86a5a5b16c Merge branch 'master' into docker 2016-10-16 21:11:11 +02:00
Andrew Brown
f10f9d7547 Merge pull request #104 from indentlabs/use-puma 
Use puma
 2016-10-16 21:05:24 +02:00
Andrew Brown
b60d61954e Merge branch 'master' into use-puma 2016-10-16 21:02:52 +02:00
Andrew Brown
1231008003 Merge pull request #135 from mpigsley/mobile-style-tweaks 
Various Style Tweaks
 2016-10-16 20:18:06 +02:00
Andrew Brown
a2b85d33f4 Merge branch 'master' into mobile-style-tweaks 2016-10-16 20:12:45 +02:00
Andrew Brown
770e77e25e Merge pull request #137 from mpigsley/about-page-image-fix 
Fix Stretched Image on About Page
 2016-10-16 19:52:54 +02:00
Mitchel Pigsley
f4e9b733aa Add new line to end of landing.scss 2016-10-15 21:16:35 -05:00
Mitchel Pigsley
4f77f612e2 Add new lines to forms.css and realation_input 2016-10-15 21:13:41 -05:00
Mitchel Pigsley
0951f846bb Consolidate hero image styles and apply them on index and about pages 2016-10-15 15:27:24 -05:00
Mitchel Pigsley
d0cb953047 Reposition Caret 2016-10-15 13:44:59 -05:00
Mitchel Pigsley
80fa7c4d94 Wrap relation input correctly by sizing to normal input height 2016-10-15 10:10:29 -05:00
Andrew Brown
275ab75355 Add religion as a content type 2016-10-15 00:46:46 +02:00
Andrew Brown
ddc3f378d5 Content type model organization 2016-10-15 00:33:26 +02:00
Andrew Brown
3440db3b5e Add race as content type 2016-10-15 00:15:36 +02:00