Andrew Brown
c9678bf69e
replace treat with engtagger poc
2019-06-03 19:52:13 -05:00
Andrew Brown
eba71ae424
cross fingers on this dope merge hell
2019-06-03 18:42:42 -05:00
dependabot-preview[bot]
2961560dac
Bump shoulda-matchers from 3.1.2 to 4.0.1
...
Bumps [shoulda-matchers](https://github.com/thoughtbot/shoulda-matchers ) from 3.1.2 to 4.0.1.
- [Release notes](https://github.com/thoughtbot/shoulda-matchers/releases )
- [Changelog](https://github.com/thoughtbot/shoulda-matchers/blob/master/NEWS.md )
- [Commits](https://github.com/thoughtbot/shoulda-matchers/compare/v3.1.2...v4.0.1 )
2019-06-03 22:40:58 +00:00
dependabot-preview[bot]
a19a037025
Bump puma from 3.12.0 to 3.12.1
...
Bumps [puma](https://github.com/puma/puma ) from 3.12.0 to 3.12.1.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v3.12.0...v3.12.1 )
2019-06-03 11:02:14 +00:00
Andrew Brown
54f19759da
back to our fork
2019-05-31 23:39:35 -05:00
Andrew Brown
b225fab18d
ab test
2019-05-31 00:32:38 -05:00
Andrew Brown
3e70f1fa88
Merge branch 'master' into thredded-report
2019-05-30 23:29:22 -05:00
Andrew Brown
bc578f45a3
Merge branch 'master' into dependabot/bundler/aws-sdk-3.0.1
2019-05-30 19:11:43 -07:00
dependabot-preview[bot]
7c968b307c
Bump pg from 0.21.0 to 1.1.4
...
Bumps [pg](https://bitbucket.org/ged/ruby-pg ) from 0.21.0 to 1.1.4.
- [Changelog](https://bitbucket.org/ged/ruby-pg/src/default/History.rdoc )
- [Commits](https://bitbucket.org/ged/ruby-pg/commits )
2019-05-30 23:01:38 +00:00
dependabot-preview[bot]
8bed507e25
Bump ruby-prof from 0.15.9 to 0.18.0
...
Bumps [ruby-prof](https://github.com/ruby-prof/ruby-prof ) from 0.15.9 to 0.18.0.
- [Release notes](https://github.com/ruby-prof/ruby-prof/releases )
- [Changelog](https://github.com/ruby-prof/ruby-prof/blob/master/CHANGES )
- [Commits](https://github.com/ruby-prof/ruby-prof/compare/v0.15.9...0.18.0 )
2019-05-30 10:34:20 +00:00
dependabot-preview[bot]
f3eab9732a
Bump aws-sdk from 1.67.0 to 3.0.1
...
Bumps [aws-sdk](https://github.com/aws/aws-sdk-ruby ) from 1.67.0 to 3.0.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
2019-05-27 10:54:35 +00:00
Andrew Brown
f37a54046e
fix account deletion
2019-05-13 17:17:32 -05:00
Andrew Brown
161c8a7485
Merge branch 'master' into thredded-report
2019-05-10 16:57:20 -05:00
Andrew Brown
76082697cd
use tribute for @mentions & implement
2019-04-09 20:58:11 -05:00
Andrew Brown
7acab53b45
move nlp gems into a worker gem group
2019-03-01 16:03:46 -06:00
Andrew Brown
dd5f152034
add ibm watson document parsing
2019-02-27 16:52:27 -06:00
Andrew Brown
ac668fd29e
plug into the magic of ibm watson
2019-02-27 16:18:40 -06:00
Andrew Brown
f79417531b
add in highcharts for better words per sentence graph
2019-02-25 14:41:58 -06:00
Andrew Brown
d9e56f5b36
add parts of speech analysis
2019-02-25 02:01:51 -06:00
Andrew Brown
48ce6de609
get some magic up in here
2019-02-25 01:49:06 -06:00
Andrew Brown
cc75e8249b
convert html documents into plaintext and start extracting services
2019-02-24 21:03:17 -06:00
Andrew Brown
b8a6dca279
temporarily use our fork/branch of thredded for reporting posts
2019-02-22 15:53:49 -06:00
Andrew Brown
9941ad2ea4
analysis design work
2019-02-07 20:41:58 -06:00
Andrew Brown
cf59f741f0
Merge pull request #320 from indentlabs/jan-15-gem-upgrades
...
Gem upgrades
2019-01-16 03:14:32 -06:00
Andrew Brown
292f3276f7
remove skylight
2019-01-15 16:01:29 -06:00
Andrew Brown
391fa1d07c
hook up attribute category sort backend
2019-01-09 16:05:07 -06:00
Andrew Brown
a0ebac0439
remove rack-timeout gem
2018-12-03 22:19:50 -06:00
Andrew Brown
92be05daac
rip out all the delayed_job infra
2018-12-03 19:05:14 -06:00
Andrew Brown
7924a754b0
install skylight
2018-12-02 16:26:12 -06:00
Andrew Brown
c17ffe13ff
remove levenshtein-ffi gem
2018-12-02 15:29:50 -06:00
Andrew Brown
a8a71d4376
remove social-share-button gem
2018-12-02 15:07:47 -06:00
Andrew Brown
3fa8c52f04
Replace therubyracer with mini_racer
2018-12-02 13:31:54 -06:00
Andrew Brown
aaa7199053
pr polish
2018-11-15 16:17:30 -06:00
Andrew Brown
6a0133cdc9
polish with fa-icons
2018-11-15 15:29:51 -06:00
Andrew Brown
ecd252a1cd
Merge branch 'master' into documents
2018-11-14 14:47:42 -06:00
Andrew Brown
bfdbdf338c
add rails_admin for site_administrators
2018-10-20 14:39:26 -05:00
Andrew Brown
36eab5f4e3
Merge branch 'master' into documents
2018-10-18 13:11:10 -05:00
Andrew Brown
4f4a9994e8
remove raygun
2018-10-17 13:57:39 -05:00
Andrew Brown
5df7895241
add barnes for additional runtime info
2018-10-17 12:48:40 -05:00
Andrew Brown
d80ff65509
document resource stuff
2018-10-01 23:09:42 -05:00
Andrew Brown
a66e29c302
add more optimization gems
2018-09-14 07:14:46 -05:00
Andrew Brown
78153ec126
enable bullet
2018-09-10 02:30:56 -05:00
Andrew Brown
1a03148cfa
fix rspec tests
2018-08-31 19:38:48 -05:00
Andrew Brown
9ce4ef9e2b
quick bugfix I think?
2018-08-30 19:09:13 -05:00
Andrew Brown
cfa5cf18f7
upgrade thor
2018-08-16 11:28:49 -05:00
Andrew Brown
dab5d5f0ea
Merge branch 'master' into rails5-upgrade
2018-08-15 16:31:37 -05:00
Andrew Brown
43528f6f61
Link deities to religions
2018-07-21 18:06:58 -05:00
Andrew Brown
7a4c9dfbc1
update tests for 5.2
2018-07-05 02:07:12 -05:00
Andrew Brown
51787a383a
rails 5.2.0
2018-07-05 01:24:00 -05:00
Tristan
3f3c3cb3e6
upgrade fixes
2018-07-04 20:46:21 -05:00
Tristan
031585547b
include the new aws gem
2018-06-06 01:16:51 -05:00
Tristan
3ac0937fa8
pg 1.0 not compatible with rails 5.1 yet
2018-06-05 23:48:39 -05:00
Tristan
7b9bd4b150
swap factory_girl with factory_bot
2018-06-05 23:45:39 -05:00
Tristan
67e1dae46c
Add pg back to test environment gem list
2018-06-05 20:24:36 -05:00
Tristan
158c794f5d
Modernize ruby, bundler, and several gems
2018-06-05 20:17:00 -05:00
Andrew Brown
52ae8b8f70
Upgrade rails 4.2
2018-04-16 21:56:37 -05:00
Andrew Brown
f5678e0f0f
bundle update for thredded
2018-02-10 12:20:18 -06:00
Andrew Brown
71fcf17e16
re-enable paranoia on users
2018-01-19 21:41:38 -06:00
Andrew Brown
04856d105d
removes aap
2018-01-19 18:54:29 -06:00
Andrew Brown
ae5be07058
remove bullet
2018-01-16 00:46:05 -06:00
Andrew Brown
024204a603
add bullet in dev
2018-01-15 21:09:18 -06:00
Ahmad Saleem
58013e791b
Configure stripe event.
2018-01-07 23:22:06 +05:00
Andrew Brown
50070c4a9f
Add soft deletion to users and all content models
2017-12-26 14:37:09 -06:00
Andrew Brown
5d0e5d7b5f
add delayed_job to see if thredded uses it
2017-10-29 01:59:45 +03:00
Andrew Brown
8193a279de
require at least ruby 2.3 for &. usage on heroku
2017-10-28 22:58:03 +03:00
Andrew Brown
4e8d1ba9b8
Merge branch 'master' into thredded
2017-10-28 21:10:24 +03:00
Andrew Brown
9a1147366c
add new relic
2017-10-27 21:37:20 +03:00
Andrew Brown
d95f0f1c73
Don't show content footer to universe owner
2017-09-30 23:42:30 +02:00
Andrew Brown
0e972c186b
we're legitimate hackers now
2017-08-17 03:28:55 +02:00
Andrew Brown
8bbd46af3f
thredded in place
2017-07-24 14:17:57 +02:00
Andrew Brown
adcea851f4
Add babel translation app
2017-05-01 15:35:03 +01:00
Andrew Brown
fb948155a7
Share buttons and FAQ
2017-03-31 02:48:46 +01:00
Andrew Brown
64fb923ae9
Two-way relationship deletes working also
2017-02-28 15:38:49 +00:00
Andrew Brown
963769e3c9
Add mixpanel action tracking for all server actions
2017-02-21 17:12:43 +00: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
b211f7974f
Style gallery edit partial
2017-02-17 23:29:49 +00:00
Andrew Brown
ee5fe081e7
Store modified image styles properly, e2e uploads tested
2017-02-17 22:07:25 +00:00
Andrew Brown
bb01a25614
Upload images to S3
2017-02-17 21:03:29 +00:00
Andrew Brown
b970a8786f
Upgrade aws-sdk gem from 1.5 to 2.3
2017-02-16 20:08:27 +00:00
Andrew Brown
821e3a986a
Unbind paperclip and rmagick versions
2017-02-16 20:07:02 +00:00
Andrew Brown
84f1e86ce7
Report subscriptions to Slack even if there's an issue with delta change
2017-02-06 17:42:22 +00:00
Andrew Brown
aba66dccf3
Remove Scout gem, we're no longer using it
2017-02-06 16:19:15 +00:00
Andrew Brown
17910e4d4d
Upgrade rails from 4.2.5 to 4.2.7.1
2017-02-06 16:08:16 +00:00
Andrew Brown
1819561f34
Install raygun for monitoring
2017-02-02 22:10:27 +00:00
Andrew Brown
2363a29b36
Start on subscription controller specs #wip
2017-01-24 19:14:50 +00:00
Andrew Brown
81b26c2505
Add stripe + initialize stripe customers on user create
2017-01-23 15:22:58 +00:00
Andrew Brown
8ae77f4b67
Implement authority for user permissions
2017-01-14 00:06:33 +01:00
Robert Richter
7dcf798f8a
Optimize javascript load times
...
Our application JS is bloated with minified libraries, while our actual
application Javascript barely amounts to more than two hundred lines.
I propose removing these libraries from our sass file, and instead
load them as separate resources in `<link>` and `<script>` tags.
This has several advantages:
- By using common CDNs, users are likely to have many of these libraries
cached already.
- Even if the files aren't cached, the CDN is likely to deliver them
faster.
- We can use the HTML5 'async' attribute to load these libraries
asynchronously, so users aren't held up while they download.
- Our fully compiled application JS is much, much smaller, which
reduces the load on our host.
Also, on the topic of load times, I realized that in #152 that one of the
images was a PNG, not a JPG. I had tried optimizing the image, but I didn't
realize that it wasn't a JPG like the others. Here, I converted it to a JPG,
and it is significantly smaller, and it is visually unchanged.
I'm having some difficulty testing on my local machine, so I would appreciate
some additional manual testing before merging this.
2016-11-02 23:41:00 -05: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
6d3c36a888
Render notebook fields with markdown on content#show pages
2016-10-12 00:28:04 +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
Donovan Hernandez
44ee57edfb
Add scout_apm gem
2016-10-03 17:14:11 -05:00
Robert Richter
ab30d6b2e9
Alphabetize gems
2016-10-02 20:30:42 -05:00
Robert Richter
16eaf40109
Clean up gemfile groups and unused gems
2016-10-02 20:26:50 -05:00
Robert Richter
47166e1e72
Use rspec-prof
2016-10-02 14:18:05 -05:00
Robert Richter
f4d49a43ae
Update to ruby 2.3.1
2016-10-02 14:03:27 -05:00
Robert Richter
db0a6e721b
Ruby and bundle update
2016-10-02 12:47:20 -05:00
Robert Richter
56b744a858
Add coverage report
2016-10-01 18:46:08 -05:00
Robert Richter
40481975f4
Merge branch 'master' into feature/migrate-tests
2016-10-01 14:38:51 -05:00
Robert Richter
e99ea9e596
Properly add and configure shoulda
2016-10-01 11:27:34 -05:00
Robert Richter
58d2f8cc3c
Use shoulda matchers
2016-10-01 11:15:09 -05:00
Andrew Brown
07b5b99b5e
Merge branch 'master' into issue-18-serendipitous-i18n
2016-09-30 03:44:30 +02:00
Robert Richter
794c38d656
Serendipitous PR was merged, use master
2016-09-29 20:42:09 -05:00
Robert Richter
4ee0d5f008
Merge master
2016-09-29 20:06:41 -05:00
Robert Richter
240ce516b3
Install rspec
2016-09-29 18:54:42 -05:00
Andrew Brown
50a4626c66
Report new author signups to slackgit status!
2016-09-30 00:32:07 +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
Robert Richter
aa83c3a723
Remove sitemap stuff, for now
2016-09-19 22:00:07 -05:00
Robert Richter
3b11cea630
Remove practmatic_context gem
...
Use some simple hand-written JSON-LD for now
2016-09-06 18:37:15 -05:00
Robert Richter
ccc2aeef24
Add JSON LD blocks to User pages
2016-09-06 10:23:05 -05:00
Robert Richter
1e5658c771
Add sitemap gem
2016-09-06 09:20:55 -05:00
Robert Richter
528f0379ef
Start work on SEO info in header
2016-09-04 23:57:30 -05:00
Robert Richter
af7af4a3e2
Rubocop auto-correct
2016-08-26 14:56:52 -05:00
Andrew Brown
1d9576d442
Enable 12factor for heroku logging
2016-08-06 02:10:23 -05:00
Andrew Brown
5e64920cbb
Fix content link dropdowns (git statusgit status)
2016-08-04 19:43:33 -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
95229ab26c
Add Cucumber
2016-07-11 20:46:35 -05:00
Robert Richter
c9c9516a7c
Remove Ruby version from Gemfile
...
It's already defined in `.ruby-version`
2016-07-11 18:25:43 -05:00
Robert Richter
61278f8c12
Get User-based integration tests running
2016-07-08 22:26:36 -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
4300bf492a
Edit siblingships/relations from #_form
2016-05-02 19:37:37 -05:00
Andrew Brown
80e0a7228f
Relation autocomplete plumbing
2016-04-30 13:06:22 -05:00
Andrew Brown
c611022f1d
Recognize associations on content#edit
2016-04-30 12:21:32 -05:00
Andrew Brown
6cfd0e06af
Show serendipitous card base
2016-04-25 22:04:00 -05:00
Andrew Brown
00d32c8161
bring back gems for heroku
2016-04-07 01:22:09 -05:00
Andrew Brown
6273345e5a
to heroku we go
2016-04-07 00:56:33 -05:00
Andrew Brown
4f7456c11d
remove ruby gemfile spec for heroku?
2016-04-06 23:33:13 -05:00
Andrew Brown
0a44ce1a67
new navbar
2016-04-06 16:51:52 -05:00
Andrew Brown
c5564968fd
Add devise
2016-04-04 22:58:47 -05:00
Andrew Brown
7c8b215c06
upgrade ruby, rails
2016-04-04 22:46:01 -05:00
Andrew Brown
b05c15bbbd
more rapid dev gems
2015-09-01 22:08:11 -05:00
Andrew Brown
fee8cfa7e0
Hit ownership with a dose of metaprogramming
2015-08-27 23:46:59 -05:00
Andrew Brown
86df7b05b0
Enable guard & rubocop
2015-08-27 22:03:39 -05:00
Andrew Brown
5248c0b802
Revert "Internationalize strings"
2015-04-28 23:04:18 -05:00
Robert Richter
903d9d918b
Localize English model attribute names
...
Also add rails-i18n gem
2015-04-21 20:06:48 -05:00
Robert Richter
4442fff4b0
OF COURSE IT WAS WINDOWS' FAULT
2015-04-20 21:56:17 -05:00
Robert Richter
b2ded1320e
Of course this is Windows' fault
2015-04-20 21:38:31 -05:00
Robert Richter
a67d973785
Freeze bcrypt and bcrypt-ruby version
2015-04-20 21:33:04 -05:00
Robert Richter
60430751a6
Fix bcrypt version?
2015-04-20 21:28:38 -05:00
Robert Richter
661dc37e22
Fix bcrypt version again, sync gemfiles
2015-04-20 21:18:21 -05:00
Robert Richter
997c976463
Fix bcrypt gem version
2015-04-20 21:06:36 -05:00
Robert Richter
33ecdfe97b
Downgrade version of bcrypt for travis
2015-04-19 19:30:53 -05:00
Robert Richter
b28c9d6bc3
They ought to be more specific about the bcrypt gem
2015-04-19 19:30:51 -05:00
Robert Richter
3df0ff50e1
Migrate to built-in ActiveModel secure passwords
2015-04-19 19:29:42 -05:00
Robert Richter
7816d07d54
Freeze version of rmagic gem
...
This is the only one I can use on Windows, and updating is a huge hassle
2015-04-19 19:24:49 -05:00
Robert Richter
4914951053
Clean up style
2015-03-24 09:58:01 -05:00
Robert Richter
d03fa2d3f6
Add Rubocop scan
2015-03-24 09:53:13 -05:00
