Commit Graph

85 Commits

Author SHA1 Message Date
Andrew Brown
aeb01c2963 Merge branch 'master' into dev-api 2020-08-10 15:29:19 -07:00
Andrew Brown
a8e73c5e6a timeline events 2020-06-16 02:21:39 -05:00
Andrew Brown
438a7b4eef timelines#index 2020-06-10 15:04:51 -05:00
Andrew Brown
f73bc4dee8 add discussions to content stream 2020-06-03 21:04:09 -05:00
Andrew Brown
68575a8c08 move help center from sidebar to data vault 2020-06-01 23:16:31 -05:00
Andrew Brown
5493647ae5 collection submissions model/controller 2020-05-01 21:17:10 -05:00
Andrew Brown
b8fa922575 page collections controller scaffold 2020-04-30 15:22:06 -05:00
Andrew Brown
525e208eec add commenting on shares 2020-04-25 16:31:45 -05:00
Andrew Brown
9a1c3d8403 stream share form & design 2020-04-24 15:53:29 -05:00
Andrew Brown
f6fa089030 Merge branch 'master' into collaboration-expansion 2020-04-23 16:43:53 -05:00
Andrew Brown
7ce21710dc hook up notification flow 2020-04-20 18:58:12 -05:00
Andrew Brown
5c5fe88ff2 add notification model 2020-04-20 17:35:10 -05:00
Andrew Brown
22ab05702f wip stream 2020-03-29 02:38:58 -05:00
Andrew Brown
fb6e9d5595 allow users to block other users 2020-03-28 18:26:44 -05:00
Andrew Brown
f462831728 Add the ability to follow/unfollow other users 2020-03-28 17:49:17 -05:00
Andrew Brown
ab384815ae initial integration authorization flow 2020-03-02 23:10:26 -06:00
Andrew Brown
9cceb118f6 add initial application integration page 2020-02-22 10:32:08 -06:00
Andrew Brown
ed8782ffdc add api_docs#index & api docs plumbing 2020-02-21 16:58:35 -06:00
Andrew Brown
98096bcc14 data vault skeleton 2019-10-13 07:59:12 -05:00
Andrew Brown
8979ebef26 wip 2019-10-01 06:36:59 -05:00
Andrew Brown
091d345589 include this helper, whoops 2019-07-01 00:41:43 -05:00
Andrew Brown
56ca3132f7 dismissals 2019-05-30 15:26:36 -05:00
Andrew Brown
7af6f079c2 remove empty helper classes 2018-01-22 23:52:36 -06:00
Andrew Brown
81e0f5797a local cleanup 2018-01-19 21:42:44 -06:00
Andrew Brown
cab9d0ca51 Add and hook up town/country/landmark 2017-12-31 15:56:33 -06:00
Andrew Brown
f2a42a0bae Add page type customization page 2017-12-27 13:50:48 -06:00
Andrew Brown
0022adb953 Contributor invite flow #migration 2017-08-15 01:41:43 +02:00
Andrew Brown
d6daf0c204 Add Flora model #migration 2017-07-31 02:39:13 +02:00
Andrew Brown
578b365c22 Add super-secret search results page 2017-06-20 16:34:17 +00:00
Andrew Brown
6eb2e08102 Add scratchpad page and update sidebar design #migration 2017-05-17 16:54:30 +01:00
Andrew Brown
adcea851f4 Add babel translation app 2017-05-01 15:35:03 +01:00
Andrew Brown
8bcd9172b7 Integrated js navigator PoC 2017-04-30 01:57:44 +01:00
Andrew Brown
c3b00257a2 Voting MVP 2017-04-17 16:22:02 +01:00
Andrew Brown
86ae882c51 Add one-click unsubscribe action for emails 2017-04-15 19:44:30 +01:00
Andrew Brown
6ce64d09b0 Merge branch 'master' into release/uploads
Conflicts:
	app/views/content/form/_panel.html.erb
	app/views/content/show.html.erb
2017-02-18 00:56:37 +00:00
Andrew Brown
737273d2ae Single image uploading, needs processing in controller 2017-02-17 01:41:41 +00:00
Andrew Brown
798ac705ed Clean up content panel actions + allow expanding all tabs at once 2017-02-14 19:58:27 +00:00
Andrew Brown
3450df2a04 Typo in tab disabling 2017-02-14 18:04:18 +00:00
Andrew Brown
cf18b7fb8e Add subscriptions UI 2017-01-21 15:13:01 +00:00
Andrew Brown
28fde85db6 Fix hidden tabs on content#show 2016-11-06 15:18:48 +01: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
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
Andrew Brown
1c937fea5b Add content exporting to TXT, CSV, and JSON 2016-10-04 14:25:28 +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
e5f088d3d0 Add users controller + routes for author profiles 2016-09-05 21:51:21 -05:00
Andrew Brown
d04024f7a3 Show content names as page titles when available 2016-08-04 22:41:48 -05:00