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
1,149 Commits 83 Branches 44 Tags 172 MiB
9e8cb7013f
Commit Graph

1149 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Brown
9e8cb7013f Merge pull request #153 from indentlabs/add-user-plan-type 
Add plan type on user model
 2016-11-02 10:58:40 +01:00
Andrew Brown
f4eb1ed4b5 Add plan type on user model 2016-11-02 10:52:40 +01:00
Andrew Brown
5c75658778 drop languages table on the ol' roku 2016-11-01 23:06:42 +01:00
Andrew Brown
3482464e0b Drop magics table 2016-11-01 23:03:38 +01:00
Andrew Brown
f473d627ba Merge pull request #133 from indentlabs/content-expansion 
Content expansion release
 2016-11-01 22:34:46 +01:00
Andrew Brown
8d06ea0e77 Revert "Add release notice" 
This reverts commit 1ae5519a00.
 2016-11-01 22:27:27 +01:00
Andrew Brown
5f7539e4d5 Merge branch 'master' into content-expansion 2016-11-01 22:27:22 +01:00
Andrew Brown
544da91a78 Expose spoken languages on Character form 2016-11-01 22:14:20 +01:00
Andrew Brown
382a786571 Merge pull request #149 from indentlabs/downtime-notice 
Add release notice
 2016-11-01 22:10:07 +01:00
Andrew Brown
1ae5519a00 Add release notice 2016-11-01 22:02:07 +01:00
Andrew Brown
a896c3c5ae Migrate content types to the new attribute system 2016-11-01 21:51:57 +01:00
Andrew Brown
d107512438 Merge branch 'custom-attributes' into content-expansion 
Conflicts:
	app/models/content_types/character.rb
	app/models/user.rb
	app/views/content/_form.html.erb
	app/views/content/form/_text_input.html.erb
	app/views/content/index.html.erb
	app/views/content/list/_list.html.erb
	app/views/content/show.html.erb
	app/views/items/edit.html.erb
	app/views/items/new.html.erb
	app/views/locations/edit.html.erb
	app/views/locations/new.html.erb
	app/views/universes/edit.html.erb
	app/views/universes/new.html.erb
	config/locales/en.yml
	config/routes.rb
	db/schema.rb
 2016-11-01 21:02:12 +01:00
Andrew Brown
698a92068f Merge branch 'markdown' into content-expansion 
Conflicts:
	app/assets/stylesheets/forms.css
	app/assets/stylesheets/landing.scss
	app/views/content/show.html.erb
 2016-11-01 12:22:22 +01:00
Andrew Brown
f052073373 PR feedback 2016-11-01 12:13:15 +01:00
Matthew Werner
eb243b3281 remove unnecessary associations 2016-10-31 16:59:18 -07:00
Matthew Werner
72c66a60cb Attribute Field Dropdowns 2016-10-31 16:32:41 -07:00
Andrew Brown
2f1cf8a9bf Mobile UI polish 2016-10-31 23:40:08 +01:00
Andrew Brown
52585c1602 Reorder landing page content type cards 2016-10-31 21:47:51 +01:00
Andrew Brown
311a0d7ec9 Add signin/up links to mobile navbar 2016-10-31 21:38:53 +01:00
Andrew Brown
8fe3e186c6 Add updated pricing plans to landing page 2016-10-31 21:35:42 +01:00
Andrew Brown
c89baed9f8 Update landing page with new content types 2016-10-31 20:12:54 +01:00
Andrew Brown
08846a0607 Add quick-add form to all content types to create name-only from index page 2016-10-30 21:01:54 +01:00
Andrew Brown
430fc222e1 Content type page descriptions 2016-10-30 15:34:41 +01:00
Andrew Brown
0394ecbe63 mock up branching timeline look 2016-10-30 14:06:10 +01:00
Andrew Brown
4fbbbce411 Fix privacy fields on new content types 2016-10-30 02:33:59 +02:00
Andrew Brown
cc701a0eff Restyle profiles to show all content types 2016-10-30 02:33:50 +02:00
Andrew Brown
2005d71d18 Update card headers for magics/languages/religions 2016-10-30 00:35:44 +02:00
Andrew Brown
204005b55f Add serendipitous prompts for new content types 2016-10-27 12:45:08 +02:00
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