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

284 Commits

Author SHA1 Message Date
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
Robert Richter
81b6d6e435 Move a few production gems outside of groups 2015-03-23 23:53:26 -05:00
Robert Richter
32b53886ae Force Sass to be required in all environments 2015-03-21 23:22:41 -05:00
Robert Richter
b47549b2c4 Require Sass in all environments 2015-03-21 23:16:16 -05:00
Robert Richter
b505b52969 Fix some test dependencies 2015-03-21 18:05:32 -05:00
Robert Richter
67f51045f5 Add experimental framework update builds 
Also add bundler arguments to speed up build
 2015-03-21 17:55:32 -05:00
Robert Richter
f9fb523fc2 Create gem dependency groups 2015-03-21 12:53:45 -05:00
Robert Richter
cb7174067d Configure SimpleCov for test coverage 2015-03-21 12:27:51 -05:00
Robert Richter
cb589702d1 Push around dependencies so I can work on Windows 2015-03-17 20:09:47 -05:00
Robert Richter
2d71dfd497 Add coveralls gem 2015-03-13 20:18:49 -05:00
Robert Richter
f40f7ceae6 Add PostgreSQL gem to allow Travis pg build to work 2015-03-13 20:18:49 -05:00
Robert Richter
29c0e6727f Set up Capybara functional testing, and write our first functional test! 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
Andrew Brown
06c6b0ce89 Merge resolution 2015-03-13 20:12:42 -05:00
Andrew Brown
e14f980532 Merge branch 'master' into fix-bootplus 
Conflicts:
	Gemfile.lock
 2014-08-02 04:53:55 +00:00
Andrew Brown
976de6439c Specify rubyracer and libv8 to make server work locally :( 2014-07-20 02:27:38 -05:00
Robert Richter
a90540605e Keep trying trying to fix tests 2014-03-16 23:30:45 -05:00
Robert Richter
a56e427d8b Get factory_girl working 2014-03-16 21:14:51 -05:00
Robert Richter
ac033ffabd Use factory_girl for test fixtures 2014-03-16 20:34:30 -05:00
Andrew Brown
a221597ab8 removed bootstrap 2 and bootplus, installed bootstrap 3 2014-03-04 01:55:53 +00:00
Andrew Brown
9392830fe9 finalized navbar + card border fix 2014-03-03 02:00:55 +00:00
Andrew Brown
2118bd424b navbar collapses* and icons are back 2014-03-02 23:25:45 +00:00
Andrew Brown
9e3bfaaad7 specify ruby version for heroku 2014-01-08 21:03:12 +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
49d188bb3d include paperclip/aws gems 2014-01-07 18:58:03 +00:00
Andrew Brown
f1d1068c21 put less-rails gem back in assets 2013-12-08 19:45:32 -06:00
Andrew Brown
b10f8a959e take less out of gem assets 2013-12-08 19:30:14 -06:00
Euan
ab0192a5c6 Upgrade to rails 3.2.13 
This is the earliest version to support ruby2.0
so I needed it to run this locally. It should
be updated more once there's time.
 2013-12-08 17:53:12 -05:00
Andrew Brown
3ac9c6bc5b drop vanilla bootstrap for bootplus override 2013-12-07 19:28:17 -06:00
Andrew Brown
c73f4e1327 don't bundle bleeding rails 2013-12-07 18:40:44 -06:00
Andrew Brown
c91fe1a23b mongoid 2 -> 3 2012-12-26 18:04:31 -06:00
Andrew Brown
393ce2b6e4 bootstrapped user 2012-12-23 23:23:00 -06:00
Andrew Brown
19323838e9 rubyracer 2012-12-22 17:47:50 -06:00
Andrew Brown
dcdfa6b0ec mongo gems 2012-12-22 17:43:48 -06:00
Andrew Brown
bb7c5eeee4 rails app 2012-12-22 17:39:34 -06:00