Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' into interface

Browse source
This commit is contained in:
Martin Edenhofer 2014-07-28 09:42:13 +02:00
commit 4e637fbfcd
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
db/migrate/20140728000001_update_setting1.rb
View file

@ -1,7 +1,7 @@
class UpdateSetting1 < ActiveRecord::Migration class UpdateSetting1 < ActiveRecord::Migration
def up def up
Setting.create_if_not_exists( Setting.create_if_not_exists(
:title => 'Send client stats.', :title => 'Send client stats',
:name => 'ui_send_client_stats', :name => 'ui_send_client_stats',
:area => 'System::UI', :area => 'System::UI',
:description => 'Send client stats to central server.', :description => 'Send client stats to central server.',
@ -23,7 +23,7 @@ class UpdateSetting1 < ActiveRecord::Migration
:frontend => true :frontend => true
) )
Setting.create_if_not_exists( Setting.create_if_not_exists(
:title => 'Client storage.', :title => 'Client storage',
:name => 'ui_client_storage', :name => 'ui_client_storage',
:area => 'System::UI', :area => 'System::UI',
:description => 'Use client storage to cache data to perform speed of application.', :description => 'Use client storage to cache data to perform speed of application.',

4
db/seeds.rb
View file

@ -179,7 +179,7 @@ Setting.create_if_not_exists(
) )
Setting.create_if_not_exists( Setting.create_if_not_exists(
:title => 'Send client stats.', :title => 'Send client stats',
:name => 'ui_send_client_stats', :name => 'ui_send_client_stats',
:area => 'System::UI', :area => 'System::UI',
:description => 'Send client stats to central server.', :description => 'Send client stats to central server.',
@ -201,7 +201,7 @@ Setting.create_if_not_exists(
:frontend => true :frontend => true
) )
Setting.create_if_not_exists( Setting.create_if_not_exists(
:title => 'Client storage.', :title => 'Client storage',
:name => 'ui_client_storage', :name => 'ui_client_storage',
:area => 'System::UI', :area => 'System::UI',
:description => 'Use client storage to cache data to perform speed of application.', :description => 'Use client storage to cache data to perform speed of application.',