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,199 Commits 83 Branches 44 Tags 172 MiB
1ec58d3b7b
Commit Graph

209 Commits

Author SHA1 Message Date
Andrew Brown
8ae77f4b67 Implement authority for user permissions 2017-01-14 00:06:33 +01:00
Andrew Brown
29e374f3be Show character aliases in form 2016-11-02 21:54:58 +01:00
Andrew Brown
9451c60d6f Add group memberships and locations 2016-11-02 21:35:41 +01:00
Andrew Brown
07c372eb01 Fix CSV exports 2016-11-02 14:10:16 +01:00
Andrew Brown
544da91a78 Expose spoken languages on Character form 2016-11-01 22:14:20 +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
c89baed9f8 Update landing page with new content types 2016-10-31 20:12:54 +01:00
Andrew Brown
430fc222e1 Content type page descriptions 2016-10-30 15:34:41 +01: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
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
8700585c5e Capitalize character attributes 2016-10-24 15:10:47 +02:00
Andrew Brown
f2895837f8 Round out race planning 2016-10-21 23:02:26 +02:00
Andrew Brown
157dc9b5a0 Translations and serendipitous questions for creatures 2016-10-21 14:20:23 +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
275ab75355 Add religion as a content type 2016-10-15 00:46:46 +02:00
Andrew Brown
3440db3b5e Add race as content type 2016-10-15 00:15:36 +02:00
Andrew Brown
4440c7b2df Add creatures content type 2016-10-14 23:26:32 +02:00
Robert Richter
0c2612ad82
Merge branch 'master' into use-puma 2016-10-12 16:44:00 -05:00
Matthew Werner
b983fb36ad more small adjustments 2016-10-10 23:21:43 -07:00
Matthew Werner
eca50c3276 make attribute categories accessible 2016-10-10 16:20:47 -07:00
Matthew Werner
5a3cfcb6d1 Convert attribute_categories to system categories 2016-10-10 14:47:51 -07:00
Andrew Brown
790b12c15b Add xml exporting 2016-10-10 13:07:19 +02:00
Andrew Brown
6eda3a9fa3 Add requested fields to locations 2016-10-05 14:09:21 +02:00
Andrew Brown
ee9841c387 Add 'nature' tab to characters 2016-10-05 14:00:03 +02:00
Andrew Brown
ff83359f1b Add rules field to universe 2016-10-05 13:25:29 +02:00
Andrew Brown
00563e536f Merge branch 'master' into exporting 2016-10-04 14:27:38 +02:00
Andrew Brown
1c937fea5b Add content exporting to TXT, CSV, and JSON 2016-10-04 14:25:28 +02:00
Andrew Brown
7f19b7635f Merge branch 'master' into use-puma 2016-10-04 12:50:25 +02:00
Robert Richter
5b63f4b4a1
Merge branch 'master' into use-puma 2016-10-03 17:28:09 -05:00
Robert Richter
0f84be78d7
Add Puma and config some threading 2016-10-03 17:27:28 -05:00
Andrew Brown
a5e9fd7601 Merge branch 'master' into serendipitous-improvements 2016-10-04 00:21:20 +02:00
Andrew Brown
6f381c889d Merge branch 'master' into achetype 
Conflicts:
	db/schema.rb
 2016-10-04 00:16:56 +02:00
Andrew Brown
cbe37b40c4 Merge branch 'master' into serendipitous-improvements 2016-10-03 22:02:02 +02:00
Andrew Brown
f277853df2 Couple other typos 2016-10-03 21:41:33 +02:00
Ashley Sullins
eb281b6165 Add archetype to character information 2016-10-02 22:24:52 -05:00
Robert Richter
40481975f4
Merge branch 'master' into feature/migrate-tests 2016-10-01 14:38:51 -05:00
Robert Richter
1ce16228a7
Extract content tests into an example 2016-10-01 12:21:19 -05:00
Andrew Brown
e4b6bbbc8d Fix crops typo 2016-10-01 18:45:36 +02:00