Commit Graph

52 Commits

Author SHA1 Message Date
Andrew Brown
8ae77f4b67 Implement authority for user permissions 2017-01-14 00:06:33 +01:00
Andrew Brown
efd4181972 Fix text data export 2016-11-02 14:00:18 +01:00
Andrew Brown
9e3b12bc6b Add new content types to user content count 2016-11-02 13:49:38 +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
4fbbbce411 Fix privacy fields on new content types 2016-10-30 02:33:59 +02: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
657be159c7 Minor dashboard/sidebar styling 2016-10-24 15:10:31 +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
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
Matthew Werner
7b109eb12b clean up 2016-10-10 16:45:03 -07:00
Matthew Werner
5a3cfcb6d1 Convert attribute_categories to system categories 2016-10-10 14:47:51 -07:00
Andrew Brown
b0b57e2e40 Don't prepopulate author name to 'Anon author' on signup 2016-10-05 12:42:51 +02:00
Andrew Brown
8ab97e7ea6 author page polish 2016-10-01 17:35:59 +02:00
Andrew Brown
061f0aef37 Add admin stat pages for users, characters, locations, items, and universes 2016-09-28 23:39:32 +02:00
Andrew Brown
2978c38102 Replace sharing toggles with an info message for content visitors 2016-09-23 23:33:11 +02: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
472bb6125a
Remove pragmatic_context from User 2016-09-06 18:43:18 -05:00
Robert Richter
ccc2aeef24
Add JSON LD blocks to User pages 2016-09-06 10:23:05 -05:00
Robert Richter
af7af4a3e2
Rubocop auto-correct 2016-08-26 14:56:52 -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
Robert Richter
3df0ff50e1 Migrate to built-in ActiveModel secure passwords 2015-04-19 19:29:42 -05:00
Robert Richter
d939d5bd44 Clean style of Model classes 2015-03-28 12:11:37 -05:00
Robert Richter
00e793bf1e Refactor style using the Rubocop auto-correct 2015-03-25 22:42:45 -05:00
Robert Richter
12ea8f8b48 Include fix for #378 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
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
9719d4ebc2 Validations on user signup 2012-12-23 22:33:59 -06:00