Skip to content

Commit

Permalink
Merge pull request #10 from R-a-dio/develop
Browse files Browse the repository at this point in the history
v0.1.1
  • Loading branch information
David Collinson committed Nov 6, 2013
2 parents f7aa82a + e4b46f0 commit 6f939c5
Show file tree
Hide file tree
Showing 76 changed files with 42,085 additions and 238 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ composer.lock
.DS_Store
/app/config/database.php
/app/config/app.php
.vagrant
*.sublime-workspace
*.sublime-project
18 changes: 18 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,21 @@ Bug reports go into issues. Be as detailed as possible.
Discussion should ideally be first on IRC (#r/a/[email protected]) and then in a github issue if the discussion has any merit.

Pull request to your heart's content if you fancy doing something that's lacking.

# Translations

All translations are made using the system that Laravel 4 uses: http://laravel.com/docs/localization

Files for localizing are arrays, located in `app/lang/:locale/:file.php`.

These are PHP files, meaning you can put executable code in them, but be warned that this means your pull request will be flat-out rejected in that case.

Rules for translations:

1. Translations must not be filled with shitposting
2. No HTML is allowed inside of translations
3. You must not use code to pluralize sentences. Use the format `"singular|plural"` instead.
4. All translations must be sent via pull request on github and signed off.
5. There must be no executable code in the language files

To see where all of the translations are physically on a page, set `"locale" => "<YOUR_LOCALE_CODE_HERE>"` in `app/config/app.php` before you do any work. This will result in a bunch of strings (e.g. "search.placeholder", "search.button") appearing everywhere. These are the locale placeholders, which you then replace in the relevant files (i.e. `search.placeholder` would be `"placeholder" => "Search"` in `app/lang/en/search.php`).
31 changes: 31 additions & 0 deletions Vagrantfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :

# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
VAGRANTFILE_API_VERSION = "2"

Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# All Vagrant configuration is done here. The most common configuration
# options are documented and commented below. For a complete reference,
# please see the online documentation at vagrantup.com.

# Every Vagrant virtual environment requires a box to build off of.
config.vm.box = "radio"

# The url from where the 'config.vm.box' box will be fetched if it
# doesn't already exist on the user's system.
config.vm.box_url = "https://r-a-d.io/vagrant.box"

# Create a forwarded port mapping which allows access to a specific port
# within the machine from a port on the host machine. In the example below,
# accessing "localhost:8080" will access port 80 on the guest machine.
config.vm.network :forwarded_port, guest: 80, host: 8080

# We need more memory. Laravel's installation is a little intensive.
config.vm.provider :virtualbox do |vb|
vb.customize ["modifyvm", :id, "--memory", "512"]
end

# Shared folder permissions matter
config.vm.synced_folder ".", "/vagrant", :mount_options => ["dmode=775", "fmode=664"], :owner => "vagrant", :group => "www-data"
end
15 changes: 14 additions & 1 deletion app/config/app.php.sample
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,20 @@ return array(
|
*/

'base' => '/dev',
'base' => '',

/*
|--------------------------------------------------------------------------
| Sentry DSN
|--------------------------------------------------------------------------
|
| DSN to your Sentry Project. False = no Sentry.
| It is used to provide neat error logging.
| See https://github.com/getsentry/sentry
|
*/

'sentry' => false,

/*
|--------------------------------------------------------------------------
Expand Down
8 changes: 7 additions & 1 deletion app/config/cache.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

return array(

'times' => [
'search' => 3,
'api' => 1,
'themes', 180
],

/*
|--------------------------------------------------------------------------
| Default Cache Driver
Expand All @@ -15,7 +21,7 @@
|
*/

'driver' => 'file',
'driver' => 'redis',

/*
|--------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion app/config/database.php.sample
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ return array(
'mysql' => array(
'driver' => 'mysql',
'host' => 'localhost',
'database' => 'database',
'database' => 'radio',
'username' => 'root',
'password' => '',
'charset' => 'utf8',
Expand Down
207 changes: 207 additions & 0 deletions app/config/packages/cartalyst/sentry/config.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,207 @@
<?php
/**
* Part of the Sentry package.
*
* NOTICE OF LICENSE
*
* Licensed under the 3-clause BSD License.
*
* This source file is subject to the 3-clause BSD License that is
* bundled with this package in the LICENSE file. It is also available at
* the following URL: http://www.opensource.org/licenses/BSD-3-Clause
*
* @package Sentry
* @version 2.0.0
* @author Cartalyst LLC
* @license BSD License (3-clause)
* @copyright (c) 2011 - 2013, Cartalyst LLC
* @link http://cartalyst.com
*/

return array(

/*
|--------------------------------------------------------------------------
| Default Authentication Driver
|--------------------------------------------------------------------------
|
| This option controls the authentication driver that will be utilized.
| This drivers manages the retrieval and authentication of the users
| attempting to get access to protected areas of your application.
|
| Supported: "eloquent" (more coming soon).
|
*/

'driver' => 'eloquent',

/*
|--------------------------------------------------------------------------
| Default Hasher
|--------------------------------------------------------------------------
|
| This option allows you to specify the default hasher used by Sentry
|
| Supported: "native", "bcrypt", "sha256", "whirlpool"
|
*/

'hasher' => 'native',

/*
|--------------------------------------------------------------------------
| Cookie
|--------------------------------------------------------------------------
|
| Configuration specific to the cookie component of Sentry.
|
*/

'cookie' => array(

/*
|--------------------------------------------------------------------------
| Default Cookie Key
|--------------------------------------------------------------------------
|
| This option allows you to specify the default cookie key used by Sentry.
|
| Supported: string
|
*/

'key' => 'radio_sentry',

),

/*
|--------------------------------------------------------------------------
| Groups
|--------------------------------------------------------------------------
|
| Configuration specific to the group management component of Sentry.
|
*/

'groups' => array(

/*
|--------------------------------------------------------------------------
| Model
|--------------------------------------------------------------------------
|
| When using the "eloquent" driver, we need to know which
| Eloquent models should be used throughout Sentry.
|
*/

'model' => 'Cartalyst\Sentry\Groups\Eloquent\Group',

),

/*
|--------------------------------------------------------------------------
| Users
|--------------------------------------------------------------------------
|
| Configuration specific to the user management component of Sentry.
|
*/

'users' => array(

/*
|--------------------------------------------------------------------------
| Model
|--------------------------------------------------------------------------
|
| When using the "eloquent" driver, we need to know which
| Eloquent models should be used throughout Sentry.
|
*/

'model' => 'Cartalyst\Sentry\Users\Eloquent\User',

/*
|--------------------------------------------------------------------------
| Login Attribute
|--------------------------------------------------------------------------
|
| If you're the "eloquent" driver and extending the base Eloquent model,
| we allow you to globally override the login attribute without even
| subclassing the model, simply by specifying the attribute below.
|
*/

'login_attribute' => 'email',

),

/*
|--------------------------------------------------------------------------
| Throttling
|--------------------------------------------------------------------------
|
| Throttling is an optional security feature for authentication, which
| enables limiting of login attempts and the suspension & banning of users.
|
*/

'throttling' => array(

/*
|--------------------------------------------------------------------------
| Throttling
|--------------------------------------------------------------------------
|
| Enable throttling or not. Throttling is where users are only allowed a
| certain number of login attempts before they are suspended. Suspension
| must be removed before a new login attempt is allowed.
|
*/

'enabled' => true,

/*
|--------------------------------------------------------------------------
| Model
|--------------------------------------------------------------------------
|
| When using the "eloquent" driver, we need to know which
| Eloquent models should be used throughout Sentry.
|
*/

'model' => 'Cartalyst\Sentry\Throttling\Eloquent\Throttle',

/*
|--------------------------------------------------------------------------
| Attempts Limit
|--------------------------------------------------------------------------
|
| When using the "eloquent" driver and extending the base Eloquent model,
| you have the option to globally set the login attempts.
|
| Supported: int
|
*/

'attempt_limit' => 5,

/*
|--------------------------------------------------------------------------
| Suspension Time
|--------------------------------------------------------------------------
|
| When using the "eloquent" driver and extending the base Eloquent model,
| you have the option to globally set the suspension time, in minutes.
|
| Supported: int
|
*/

'suspension_time' => 15,

),

);
4 changes: 2 additions & 2 deletions app/config/session.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
|
*/

'driver' => 'native',
'driver' => 'redis',

/*
|--------------------------------------------------------------------------
Expand Down Expand Up @@ -94,7 +94,7 @@
|
*/

'cookie' => 'laravel_session',
'cookie' => 'radio_session',

/*
|--------------------------------------------------------------------------
Expand Down
Loading

0 comments on commit 6f939c5

Please sign in to comment.