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
5,396 Commits 83 Branches 44 Tags 172 MiB
6e2c96bc2a
Commit Graph

808 Commits

Author SHA1 Message Date
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
f2895837f8 Round out race planning 2016-10-21 23:02:26 +02:00
Andrew Brown
a72a70c893 Fix religion form 2016-10-21 15:25:47 +02:00
Andrew Brown
8dd30d181e Link creatures to Location habitats 2016-10-21 13:53:55 +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
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
Andrew Brown
9e4f991198 Earthquake cleanup 2016-10-14 23:39:32 +02:00
Andrew Brown
1f4198828a Clean up redundant views 2016-10-14 23:34:59 +02:00
Andrew Brown
4440c7b2df Add creatures content type 2016-10-14 23:26:32 +02:00
Matthew Werner
b983fb36ad more small adjustments 2016-10-10 23:21:43 -07:00
Matthew Werner
7b109eb12b clean up 2016-10-10 16:45:03 -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
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
b0b57e2e40 Don't prepopulate author name to 'Anon author' on signup 2016-10-05 12:42:51 +02:00
Andrew Brown
6f381c889d Merge branch 'master' into achetype 
Conflicts:
	db/schema.rb
 2016-10-04 00:16:56 +02:00
Ashley Sullins
eb281b6165 Add archetype to character information 2016-10-02 22:24:52 -05:00
Andrew Brown
7e8c60bbe0 Add 'past owners' relation on items 2016-10-02 01:41:31 +02:00
Andrew Brown
8ab97e7ea6 author page polish 2016-10-01 17:35:59 +02:00
Andrew Brown
07b5b99b5e Merge branch 'master' into issue-18-serendipitous-i18n 2016-09-30 03:44:30 +02:00
Robert Richter
4ee0d5f008
Merge master 2016-09-29 20:06:41 -05:00
Andrew Brown
96be59d85b dashboard, footer, and misc polish 2016-09-29 21:35:43 +02:00
Andrew Brown
ff5314732f Content show/edit pages polish 2016-09-29 15:58:30 +02:00
Andrew Brown
b4c2dc1cb3 Dashboard polish 2016-09-29 14:58:42 +02:00
Andrew Brown
061f0aef37 Add admin stat pages for users, characters, locations, items, and universes 2016-09-28 23:39:32 +02:00
Robert Richter
98bd3c0356
Use Concern version of Serendipitous 2016-09-24 18:40:29 -05:00
Andrew Brown
2978c38102 Replace sharing toggles with an info message for content visitors 2016-09-23 23:33:11 +02:00
Andrew Brown
c0d645c79f Merge branch 'master' into issue-15 2016-09-23 22:58:35 +02:00
Robert Richter
225425cc79
Use parameterized queries 2016-09-22 17:13:03 -05:00
Robert Richter
aa46434f09
Make is_public scopes use new OR logic 2016-09-22 16:47:40 -05:00
Robert Richter
7cae32a3e9
Add privacy to items and locations 2016-09-22 16:06:21 -05:00
Robert Richter
8706cf9109
Change is_public logic 
Previously, Universe privacy was checked first. If it was private, then
any content within it was private. If it was public, only then would
the content's privacy be checked.

Now, both values are checked in an OR comparison. If either the universe
or content privacy is "public," then the content is public.
 2016-09-22 15:30:56 -05:00
Robert Richter
bb9edc1377
Merge branch 'master' into issue-15 2016-09-22 13:15:56 -05:00
Robert Richter
2809c3c60a
Add back is_public scope 2016-09-22 13:03:10 -05:00
Robert Richter
bf3cf4a51e
Add HasPrivacy concern 2016-09-22 13:02:03 -05:00
Robert Richter
59e4ca8164
Allow specifying a size for user image 2016-09-21 21:11:09 -05:00
Robert Richter
6475d52a56
Add a default name to users 2016-09-21 21:08:59 -05:00
Robert Richter
801a5fd55f
Add user avatar to User page metadata 2016-09-21 20:37:44 -05:00
Robert Richter
d34b99f9ea
Make Gravatars identicons by default 2016-09-21 20:35:03 -05:00
Robert Richter
f17891b14d
Add image_url property to User 2016-09-21 20:21:52 -05:00
Robert Richter
0487cc09b2
Extract blacklisted User attributes into a method 2016-09-21 11:44:08 -05:00
Robert Richter
9218e97441
Add privacy field to Character 2016-09-20 13:08:41 -05:00
Robert Richter
b17f3fb108
Remove pragmatic_context from Universes 2016-09-06 18:50:42 -05:00
Robert Richter
472bb6125a
Remove pragmatic_context from User 2016-09-06 18:43:18 -05:00
Robert Richter
b817cdf1fe
Add JSON-LD to Universes 2016-09-06 10:36:16 -05:00
Robert Richter
ccc2aeef24
Add JSON LD blocks to User pages 2016-09-06 10:23:05 -05:00
Andrew Brown
8e2f095f91 Link from content pages to author profiles 2016-09-06 00:01:01 -05:00
Andrew Brown
6b9c1bf9c5 Add author profile mvp 2016-09-05 23:48:06 -05:00
Andrew Brown
c839f0d9c2 Add original and current owner relations, maker relations, for items 2016-09-03 17:50:21 -05:00
Andrew Brown
f3d7dbca2b Add leaders relation between location and characters 2016-09-03 17:21:10 -05:00
Andrew Brown
51fecdcaea Add capital cities as location sr-relation to locations 2016-09-03 17:15:26 -05:00
Andrew Brown
75f6d6580b Relate notable_cities as location link on locations 2016-09-03 17:11:34 -05:00
Andrew Brown
10ee0a916d Set up location linking for location#largest_cities 2016-09-03 17:08:03 -05:00
Robert Richter
af7af4a3e2
Rubocop auto-correct 2016-08-26 14:56:52 -05:00
Andrew Brown
8f6cc0ee3a Properly show universe content from within universe#show page 2016-08-19 00:44:16 -05:00
Andrew Brown
f2eab8daf3 Allow linking locations and items to universes 2016-08-06 02:29:24 -05:00
Andrew Brown
76be39d214 Allow specifying children of a character 2016-08-06 01:36:24 -05:00
Andrew Brown
b7771f4a27 Merge branch 'master' of https://github.com/indentlabs/Indent 2016-07-31 02:00:39 -05:00
Andrew Brown
28cd4c4739 add proof of concept editor 2016-07-31 00:20:28 -05:00
Robert Richter
534c9519e1 Start getting build closer to passing 
Also updated URLs to point to new org repo.
 2016-07-05 17:47:47 -05:00
Andrew Brown
c809b3ed9c Character birthplace / tweaking for Character-->Location relations 2016-05-03 15:46:58 -05:00
Andrew Brown
829d7709ab Self referential assoc cleanup 2016-05-03 15:06:02 -05:00
Andrew Brown
5062a41f89 All self-referential relations for Characters 2016-05-03 14:48:01 -05:00
Andrew Brown
c39a644aff ContentGroupers concern 2016-05-03 14:23:28 -05:00
Andrew Brown
ffdb9c7b26 Character#mothers is now a relation 2016-05-03 13:45:14 -05:00
Andrew Brown
bd6a2236db Characters#fathers is now a relation 2016-05-03 13:34:05 -05:00
Andrew Brown
c0df16d7e0 Add content groupers / organize models 2016-05-03 12:57:00 -05:00
Andrew Brown
4300bf492a Edit siblingships/relations from #_form 2016-05-02 19:37:37 -05:00
Andrew Brown
344ac20fb7 Relation autocomplete tweaking 2016-04-30 15:14:08 -05:00
Andrew Brown
c611022f1d Recognize associations on content#edit 2016-04-30 12:21:32 -05:00
Andrew Brown
b065cd8908 Link to siblings in Character#show 2016-04-29 16:11:02 -05:00
Andrew Brown
1d12e96506 Siblingship join model 2016-04-29 14:01:35 -05:00
Andrew Brown
395fc83b89 Remove siblings from Character 2016-04-29 13:58:53 -05:00
Andrew Brown
8a89519c5e Content#edit restyling with tabs 2016-04-27 18:29:57 -05:00
Andrew Brown
0fc8585127 Content#show restyling with tabs 2016-04-27 17:13:53 -05:00
Andrew Brown
9719fdbeed cleanup 2016-04-27 16:22:12 -05:00
Andrew Brown
afcb02036e clean up redundancy 2016-04-07 02:30:38 -05:00
Andrew Brown
e56fddeeac Index and sidebar revamps for all 2016-04-07 00:35:50 -05:00
Andrew Brown
8cb416c04b shows and forms for everything 2016-04-07 00:06:15 -05:00
Andrew Brown
467cf6e33d Abstract new/edit forms to content model 2016-04-06 23:30:14 -05:00
Andrew Brown
d1295ef243 ponr: replace custom login with devise login 2016-04-06 15:04:06 -05:00
Andrew Brown
c5564968fd Add devise 2016-04-04 22:58:47 -05:00
Andrew Brown
6ad0acf524 Start abstracting index views 2015-09-03 22:11:33 -05:00
Andrew Brown
8f88d28c0e Rubocopification 2015-09-01 20:27:07 -05:00
Andrew Brown
47377f1d40 ApplicationHelper simplification 2015-08-28 01:00:58 -05:00
Robert Richter
3df0ff50e1 Migrate to built-in ActiveModel secure passwords 2015-04-19 19:29:42 -05:00
Robert Richter
9683f67ad0 Change regex to use %r{}, as per RuboCop 2015-04-19 19:26:28 -05:00
Robert Richter
47e8e4b057 Fix reference to self 2015-03-29 11:27:54 -05:00
Robert Richter
6fdefcd3a9 Extract NilsBlankUniverse concern 2015-03-29 11:26:10 -05:00
Robert Richter
d939d5bd44 Clean style of Model classes 2015-03-28 12:11:37 -05:00
Robert Richter
a6728af397 Clean style in the EquipmentController 2015-03-27 18:20:29 -05:00
Robert Richter
636c020f85 Make Character set a blank Universe value to nil 2015-03-26 18:14:36 -05:00
Robert Richter
00e793bf1e Refactor style using the Rubocop auto-correct 2015-03-25 22:42:45 -05:00
Robert Richter
dfd80d9539 Refactor CharactersController for style 2015-03-25 22:38:18 -05:00
Robert Richter
b5668aa1a9 Revert "Comment out some validations for import" 
This reverts commit 90ee3cc136.
 2015-03-16 17:19:27 -05:00
Andrew Brown
90ee3cc136 Comment out some validations for import 2015-03-16 00:50:11 -05:00
Robert Richter
12ea8f8b48 Include fix for #378 2015-03-13 20:15:54 -05:00
Robert Richter
1cab3282ff Add all the remaining tests and code to get the site functional 2015-03-13 20:15:54 -05:00
Robert Richter
a02ab0e735 Add tests for validations, and the validations as per schema 2015-03-13 20:14:47 -05:00
Robert Richter
c251f50f2b Create tests for models, and add associations to models 2015-03-13 20:14:46 -05:00
Robert Richter
ccad5e6d1f Fix Character model and tests 2015-03-13 20:14:06 -05:00
Robert Richter
d0192b47a6 Create Character tests 2015-03-13 20:14:06 -05:00
Andrew Brown
06c6b0ce89 Merge resolution 2015-03-13 20:12:42 -05:00
Andrew Brown
1140037f3d Do not double-hash user passwords #378 2014-08-03 19:44:31 -05:00
Andrew Brown
ed419d6865 Change card title when switching facets 2014-07-28 22:04:36 -05:00
Andrew Brown
d1574fe08d add private notes field to magic 2014-01-09 17:39:17 +00:00
Andrew Brown
1b4d7956b0 add private notes to locations model 2014-01-09 17:30:04 +00:00
Andrew Brown
5096de4261 add private notes to equipment 2014-01-09 17:20:11 +00:00
Andrew Brown
68e1c92258 add private notes to characters 2014-01-09 17:16:09 +00:00
Andrew Brown
7e09c0f16d add notes and private notes to universes 2014-01-09 17:04:42 +00:00
Andrew Brown
e0a1bf4fe6 tie magic to universe + show it on universe#show 2014-01-09 14:57:03 +00:00
Andrew Brown
632a8ded0b location pairing with universe + showing on universe#show 2014-01-09 14:48:10 +00:00
Andrew Brown
02556afe32 allow languages to be tied to a universe 2014-01-09 14:25:21 +00:00
Andrew Brown
cde90ead99 let equipment be tied to a universe 2014-01-09 14:01:36 +00:00
Andrew Brown
34e08d3705 show character list on universe page of chars in that universe 2014-01-09 13:51:02 +00:00
Andrew Brown
294a282aff let users specify a privacy setting on universes 2014-01-09 02:41:35 +00:00
Andrew Brown
f715fe1f8d add placeholder map if user doesn't upload one 2014-01-08 19:55:33 +00:00
Andrew Brown
39b6cdddce Squashed commit of the following: 
commit 98cce1cece
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 22:32:13 2014 +0000

    precompile assets

commit 5d8ee6b0b9
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 22:30:10 2014 +0000

    show map on location page

commit 0bbbf65be6
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 22:18:43 2014 +0000

    upload + read works oh god that took long enough

commit 8ca38110d3
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 19:48:23 2014 +0000

    halve the number of transformations needed on map uploads

commit 866ad0f32c
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 19:48:03 2014 +0000

    add aws credentials to dev environment

commit f55dc796fa
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 19:34:20 2014 +0000

    imagemagick gem for image resizing

commit 666e7ac260
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 19:18:55 2014 +0000

    add dev s3 bucket for testing

commit 9984a475e8
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 19:17:45 2014 +0000

    add upload form to locations#new

commit 72ed656e82
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 19:05:25 2014 +0000

    use mongoid-paperclip instead of paperclip

commit 01204e1443
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 19:00:38 2014 +0000

    add attached_file property to location model

commit 3097be4a5a
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 18:58:25 2014 +0000

    set paperclip aws config
 2014-01-07 22:48:06 +00:00
Andrew Brown
86de62a5fd move universe history to its own tabas per #147 2013-12-10 21:28:42 -06:00
Andrew Brown
143d5f28a9 add facial hair field to character 2013-04-21 02:08:02 -05:00
Andrew Brown
2743fa5d51 add history field to universe, fix sizing of long-form 2013-04-20 17:59:49 -05:00
Andrew Brown
bd3489ffda add long-form background field under history tab (issue #109) 2013-04-20 17:44:02 -05:00
Andrew Brown
cf5e75e970 notes on all models but universe 2013-03-11 23:43:51 -05:00
Andrew Brown
e7ed81f5f2 omg finally fixed #4 2013-03-11 19:22:03 -05:00
Andrew Brown
e17cf877ed onboarding process from anon account to real account 2013-03-10 22:40:48 -05:00
Andrew Brown
39cd1dbc0f Recalculate pw hash whenever user is modified 2013-03-04 02:06:26 -06:00
Andrew Brown
7404bd63e6 password hashing (finally) 2013-03-03 20:14:37 -06:00
Andrew Brown
da32014f2a content func in user model 2013-03-03 02:19:13 -06:00
Andrew Brown
9a7e4129c6 see content of users with model functions 2013-02-26 02:07:37 -06:00
Andrew Brown
5344da8943 add description to locations, move location to geography section 2013-02-03 19:08:46 -06:00
Andrew Brown
bd086ca19f add more fields to magic 2013-01-22 22:06:09 -06:00
Andrew Brown
7f8b3c401d filter characters by universe 2013-01-10 02:38:25 -06:00
Andrew Brown
42721e3a3d add universes 2013-01-10 02:05:55 -06:00
Andrew Brown
54bd06f35f magic is here 2013-01-01 23:04:47 -06:00
Andrew Brown
58a18fc406 remove comment 2013-01-01 14:53:12 -06:00
Andrew Brown
30b2e1f583 locations 2012-12-28 00:38:54 -06:00
Andrew Brown
ca8beb18dc languages 2012-12-27 23:18:41 -06:00
Andrew Brown
286f12a95a character role in story 2012-12-27 19:57:26 -06:00
Andrew Brown
4b91f4ccdc equipment (exclamation mark) 2012-12-26 23:30:04 -06:00
Andrew Brown
dcc24ea614 oh god that character form is so sexy now 2012-12-26 02:32:54 -06:00
Andrew Brown
e045883840 wtf when did it get 7am 2012-12-24 06:49:42 -06:00
Andrew Brown
9719d4ebc2 Validations on user signup 2012-12-23 22:33:59 -06:00
Andrew Brown
34689fa706 characters scaffolding 2012-12-23 17:42:28 -06:00
Andrew Brown
d00045eedf started drinking 2012-12-22 23:50:10 -06:00
Andrew Brown
69110c64e9 users scaffold 2012-12-22 20:24:25 -06:00
Andrew Brown
bb7c5eeee4 rails app 2012-12-22 17:39:34 -06:00