Skip to content

Commit efb61df

Browse files
doshitandoshitan
committed
Merge branch 'madison-4'
* madison-4: (124 commits) Remove reference to annotator.js source map Support Rollbar client-side error tracking Link to "become a sponsor" page on the homepage, not the create sponsor page Fix stray curly brace Add Hotjar support Improve performance of note pane animation Hide content overflow on the document page Fix document background title not cutting off More mobile tweaks Provide some fallback flexbox properties Make jumbotrons bleed to the screen edge Better note pane loading UX Add background document title Fix outline not affixing at bottom of content Make notes pane match new comment style and general tweaks Fix "Become a Sponsor" page Superfriendly admin page tweaks Design updates for document management User can see paginated list of documents Fix styling of links on dark backgrounds ...
2 parents 52f7089 + 9b37af3 commit efb61df

File tree

1,041 files changed

+30972
-74381
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,041 files changed

+30972
-74381
lines changed

‎.arclint‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
{
2+
"exclude": [
3+
"(^node_modules/)",
4+
"(^resources/assets/vendor/)",
5+
"(^storage/)",
6+
"(^vendor/)"
7+
],
8+
29
"linters": {
310
"chmod": {
411
"type": "chmod"

‎.chef/knife.rb‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎.editorconfig‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ indent_style = space
88
indent_size = 2
99
trim_trailing_whitespace = true
1010

11+
[*.js]
12+
indent_style = space
13+
indent_size = 2
14+
1115
[*.php]
1216
indent_style = space
1317
indent_size = 4

‎.env.dusk.testing.example‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
APP_ENV=testing
2+
APP_NAME='Madison'
3+
APP_URL='http://localhost'
4+
APP_DEBUG=true
5+
6+
DB_DATABASE=homestead_testing
7+
DB_USERNAME=homestead
8+
DB_PASSWORD=secret
9+
10+
BROADCAST_DRIVER=log
11+
CACHE_DRIVER=array
12+
SESSION_DRIVER=database
13+
QUEUE_DRIVER=sync
14+
MAIL_DRIVER=log

‎.env.example‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
APP_ENV=local
2+
# The APP_KEY setting needs to be 32 characters long for proper encryption usage
3+
APP_KEY=SomeRandomStringSomeRandomString
4+
APP_DEBUG=true
5+
APP_LOG_LEVEL=debug
6+
APP_NAME='Madison'
7+
APP_URL='http://mymadison.local'
8+
9+
DB_CONNECTION=mysql
10+
DB_HOST=localhost
11+
DB_PORT=3306
12+
DB_DATABASE=homestead
13+
DB_USERNAME=root
14+
DB_PASSWORD=secret
15+
16+
BROADCAST_DRIVER=log
17+
CACHE_DRIVER=redis
18+
SESSION_DRIVER=file
19+
QUEUE_DRIVER=sync
20+
21+
REDIS_HOST=127.0.0.1
22+
REDIS_PASSWORD=null
23+
REDIS_PORT=6379
24+
25+
# We strongly recommend you signup for a mailer service, such as Sendgrid,
26+
# Mailgun, Mandrill, Amazon SES, etc. Enter your account info here.
27+
MAIL_DRIVER=smtp
28+
MAIL_HOST=mailtrap.io
29+
MAIL_PORT=2525
30+
MAIL_USERNAME=null
31+
MAIL_PASSWORD=null
32+
MAIL_ENCRYPTION=null
33+
MAIL_FROM_ADDRESS=user@mail.com
34+
MAIL_FROM_NAME=user
35+
36+
# Rollbar Error Reporting, rollbar.com
37+
ROLLBAR_SERVER_TOKEN=
38+
ROLLBAR_CLIENT_TOKEN=
39+
ROLLBAR_LEVEL=error
40+
41+
PUSHER_APP_ID=
42+
PUSHER_APP_KEY=
43+
PUSHER_APP_SECRET=
44+
45+
# The default settings for the admin user. Only affects database seeding.
46+
ADMIN_EMAIL=admin@example.com
47+
ADMIN_PASSWORD=secret
48+
49+
# Your Google Analytics account (eg. 'UA-00000000-0')
50+
GA=null

‎.env.testing.example‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
APP_ENV=testing
2+
APP_NAME='Madison'
3+
APP_URL='http://localhost'
4+
APP_DEBUG=true
5+
6+
DB_DATABASE=homestead_testing
7+
DB_USERNAME=homestead
8+
DB_PASSWORD=secret
9+
10+
BROADCAST_DRIVER=log
11+
CACHE_DRIVER=array
12+
SESSION_DRIVER=file
13+
QUEUE_DRIVER=sync
14+
MAIL_DRIVER=log

‎.gitignore‎

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,19 @@
1-
vendor
2-
.bundle
1+
.env
2+
.env.testing
3+
.env.dusk.testing
34
.vagrant
45

5-
server/vendor
6-
server/.env
7-
server/storage/db_backups
8-
9-
client/build
10-
client/app/css/*
11-
client/app/favicon.ico
12-
client/node_modules
13-
client/app/sass/.sass-cache
14-
client/.sass-cache
15-
client/npm-debug.*
16-
17-
# Custom locale files
18-
client/locales/custom/*.json
19-
20-
# Capistrano stage configuration files
21-
config/deploy/*
22-
!config/deploy/example.rb
6+
node_modules
7+
storage/db_backups
8+
vendor
239

24-
# Chef config files
25-
.chef/knife.local.rb
26-
config/chef/cookbooks/
27-
config/chef/data_bags/sites/*.json
28-
config/chef/data_bags/users/*.json
29-
config/chef/nodes/*.json
10+
# Mostly generated by Gulp/Elixir
11+
public
12+
# Except a few things
13+
!public/.htaccess
14+
!public/index.php
15+
!public/robots.txt
16+
!public/web.config
3017

3118
# OS
3219
shared

‎.ruby-version‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.travis.yml‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎Berksfile‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)