locomotive_cms 2.0.0.rc7 → 2.0.0.rc8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (95) hide show
  1. data/Gemfile +6 -4
  2. data/README.textile +4 -3
  3. data/app/assets/images/locomotive/icons/flags/{no.png → nb.png} +0 -0
  4. data/app/assets/javascripts/aloha/plugins/custom/locomotive_media/lib/locomotive_media-plugin.js +1 -1
  5. data/app/assets/javascripts/locomotive/utils/core_ext.js +2 -0
  6. data/app/assets/javascripts/locomotive/views/application_view.js.coffee +7 -0
  7. data/app/assets/javascripts/locomotive/views/content_assets/picker_view.js.coffee +4 -1
  8. data/app/assets/javascripts/locomotive/views/content_entries/_form_view.js.coffee +4 -2
  9. data/app/assets/javascripts/locomotive/views/content_entries/_popup_form_view.js.coffee +8 -3
  10. data/app/assets/javascripts/locomotive/views/content_types/_form_view.js.coffee +0 -2
  11. data/app/assets/javascripts/locomotive/views/content_types/custom_field_entry_view.js.coffee +9 -2
  12. data/app/assets/javascripts/locomotive/views/current_site/edit_view.js.coffee +10 -11
  13. data/app/assets/javascripts/locomotive/views/inline_editor/application_view.js.coffee +9 -0
  14. data/app/assets/javascripts/locomotive/views/pages/_form_view.js.coffee +3 -3
  15. data/app/assets/javascripts/locomotive/views/shared/asset_picker_view.js.coffee +11 -18
  16. data/app/assets/javascripts/locomotive/views/shared/fields/many_to_many_view.js.coffee +0 -4
  17. data/app/assets/javascripts/locomotive/views/shared/form_view.js.coffee +2 -1
  18. data/app/assets/javascripts/locomotive/views/snippets/_form_view.js.coffee +3 -1
  19. data/app/assets/javascripts/locomotive/views/theme_assets/_form_view.js.coffee +4 -4
  20. data/app/assets/javascripts/locomotive/views/theme_assets/image_picker_view.js.coffee +10 -2
  21. data/app/assets/javascripts/tinymce/plugins/locomotive_media/editor_plugin.js +4 -1
  22. data/app/assets/stylesheets/locomotive/backoffice/codemirror_changes.css.scss +1 -0
  23. data/app/assets/stylesheets/locomotive/backoffice/datepicker.css.scss +1 -1
  24. data/app/assets/stylesheets/locomotive/backoffice/dialog_changes.css.scss +9 -3
  25. data/app/assets/stylesheets/locomotive/backoffice/formtastic_changes.css.scss +3 -1
  26. data/app/cells/locomotive/global_actions_cell.rb +1 -1
  27. data/app/controllers/locomotive/api/base_controller.rb +7 -4
  28. data/app/controllers/locomotive/api/content_assets_controller.rb +13 -0
  29. data/app/controllers/locomotive/api/content_types_controller.rb +14 -1
  30. data/app/controllers/locomotive/api/current_site_controller.rb +3 -1
  31. data/app/controllers/locomotive/api/memberships_controller.rb +49 -0
  32. data/app/controllers/locomotive/api/pages_controller.rb +14 -1
  33. data/app/controllers/locomotive/api/sites_controller.rb +44 -0
  34. data/app/controllers/locomotive/api/snippets_controller.rb +14 -1
  35. data/app/controllers/locomotive/api/theme_assets_controller.rb +13 -0
  36. data/app/controllers/locomotive/public/content_entries_controller.rb +7 -3
  37. data/app/helpers/locomotive/content_types_helper.rb +4 -0
  38. data/app/helpers/locomotive/custom_fields_helper.rb +1 -1
  39. data/app/models/locomotive/ability.rb +2 -0
  40. data/app/models/locomotive/content_entry.rb +4 -2
  41. data/app/models/locomotive/content_type.rb +7 -0
  42. data/app/models/locomotive/extensions/content_type/default_values.rb +1 -1
  43. data/app/models/locomotive/extensions/page/redirect.rb +1 -1
  44. data/app/models/locomotive/extensions/page/tree.rb +14 -1
  45. data/app/models/locomotive/site.rb +5 -1
  46. data/app/models/locomotive/theme_asset.rb +1 -1
  47. data/app/presenters/locomotive/membership_presenter.rb +7 -2
  48. data/app/presenters/locomotive/site_presenter.rb +5 -0
  49. data/app/views/locomotive/content_assets/_picker.html.haml +3 -3
  50. data/app/views/locomotive/content_entries/_form.html.haml +1 -1
  51. data/app/views/locomotive/content_types/_form.html.haml +2 -2
  52. data/app/views/locomotive/current_site/_form.html.haml +1 -1
  53. data/app/views/locomotive/custom_fields/types/_many_to_many.html.haml +5 -5
  54. data/app/views/locomotive/my_account/edit.html.haml +1 -1
  55. data/app/views/locomotive/pages/_form.html.haml +1 -1
  56. data/app/views/locomotive/public/pages/show_toolbar.html.haml +2 -2
  57. data/app/views/locomotive/public/sitemaps/show.xml.builder +2 -2
  58. data/app/views/locomotive/shared/_form_actions.html.haml +1 -1
  59. data/app/views/locomotive/shared/_head.html.haml +2 -2
  60. data/app/views/locomotive/snippets/_form.html.haml +1 -1
  61. data/app/views/locomotive/theme_assets/_form.html.haml +1 -1
  62. data/app/views/locomotive/theme_assets/index.html.haml +5 -5
  63. data/config/locales/admin_ui.de.yml +37 -31
  64. data/config/locales/admin_ui.en.yml +1 -1
  65. data/config/locales/admin_ui.es.yml +2 -1
  66. data/config/locales/admin_ui.fr.yml +1 -1
  67. data/config/locales/admin_ui.it.yml +2 -1
  68. data/config/locales/{admin_ui.no.yml → admin_ui.nb.yml} +72 -55
  69. data/config/locales/admin_ui.nl.yml +2 -1
  70. data/config/locales/admin_ui.pt-BR.yml +2 -1
  71. data/config/locales/admin_ui.ru.yml +1 -1
  72. data/config/locales/{carrierwave.no.yml → carrierwave.nb.yml} +1 -1
  73. data/config/locales/default.de.yml +13 -3
  74. data/config/locales/default.en.yml +5 -0
  75. data/config/locales/default.fr.yml +4 -0
  76. data/config/locales/{default.no.yml → default.nb.yml} +43 -1
  77. data/config/locales/{devise.no.yml → devise.nb.yml} +9 -9
  78. data/config/locales/{flash.no.yml → flash.nb.yml} +1 -1
  79. data/config/locales/{formtastic.no.yml → formtastic.nb.yml} +21 -17
  80. data/config/routes.rb +4 -0
  81. data/lib/generators/locomotive/install/templates/locomotive.rb +9 -2
  82. data/lib/locomotive.rb +1 -0
  83. data/lib/locomotive/configuration.rb +4 -3
  84. data/lib/locomotive/custom_fields.rb +2 -0
  85. data/lib/locomotive/liquid/drops/page.rb +1 -1
  86. data/lib/locomotive/liquid/tags/csrf.rb +40 -0
  87. data/lib/locomotive/liquid/tags/extends.rb +3 -9
  88. data/lib/locomotive/liquid/tags/nav.rb +8 -8
  89. data/lib/locomotive/mongoid/patches.rb +54 -9
  90. data/lib/locomotive/rails.rb +1 -0
  91. data/lib/locomotive/rails/action_view.rb +9 -0
  92. data/lib/locomotive/render.rb +4 -4
  93. data/lib/locomotive/version.rb +1 -1
  94. data/vendor/assets/javascripts/locomotive/backbone.modelbinding.js +13 -4
  95. metadata +259 -95
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: locomotive_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0.rc7
4
+ version: 2.0.0.rc8
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-04-22 00:00:00.000000000 Z
12
+ date: 2012-06-08 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake
16
- requirement: &2157124100 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,21 +21,31 @@ dependencies:
21
21
  version: 0.9.2
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *2157124100
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ~>
28
+ - !ruby/object:Gem::Version
29
+ version: 0.9.2
25
30
  - !ruby/object:Gem::Dependency
26
31
  name: rails
27
- requirement: &2156916180 !ruby/object:Gem::Requirement
32
+ requirement: !ruby/object:Gem::Requirement
28
33
  none: false
29
34
  requirements:
30
35
  - - ~>
31
36
  - !ruby/object:Gem::Version
32
- version: 3.2.3
37
+ version: 3.2.5
33
38
  type: :runtime
34
39
  prerelease: false
35
- version_requirements: *2156916180
40
+ version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - ~>
44
+ - !ruby/object:Gem::Version
45
+ version: 3.2.5
36
46
  - !ruby/object:Gem::Dependency
37
47
  name: devise
38
- requirement: &2156915360 !ruby/object:Gem::Requirement
48
+ requirement: !ruby/object:Gem::Requirement
39
49
  none: false
40
50
  requirements:
41
51
  - - ~>
@@ -43,10 +53,15 @@ dependencies:
43
53
  version: 1.5.3
44
54
  type: :runtime
45
55
  prerelease: false
46
- version_requirements: *2156915360
56
+ version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
58
+ requirements:
59
+ - - ~>
60
+ - !ruby/object:Gem::Version
61
+ version: 1.5.3
47
62
  - !ruby/object:Gem::Dependency
48
63
  name: cancan
49
- requirement: &2156913660 !ruby/object:Gem::Requirement
64
+ requirement: !ruby/object:Gem::Requirement
50
65
  none: false
51
66
  requirements:
52
67
  - - ~>
@@ -54,10 +69,15 @@ dependencies:
54
69
  version: 1.6.7
55
70
  type: :runtime
56
71
  prerelease: false
57
- version_requirements: *2156913660
72
+ version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
74
+ requirements:
75
+ - - ~>
76
+ - !ruby/object:Gem::Version
77
+ version: 1.6.7
58
78
  - !ruby/object:Gem::Dependency
59
79
  name: mongo
60
- requirement: &2156912960 !ruby/object:Gem::Requirement
80
+ requirement: !ruby/object:Gem::Requirement
61
81
  none: false
62
82
  requirements:
63
83
  - - ~>
@@ -65,10 +85,15 @@ dependencies:
65
85
  version: 1.5.2
66
86
  type: :runtime
67
87
  prerelease: false
68
- version_requirements: *2156912960
88
+ version_requirements: !ruby/object:Gem::Requirement
89
+ none: false
90
+ requirements:
91
+ - - ~>
92
+ - !ruby/object:Gem::Version
93
+ version: 1.5.2
69
94
  - !ruby/object:Gem::Dependency
70
95
  name: bson_ext
71
- requirement: &2156912420 !ruby/object:Gem::Requirement
96
+ requirement: !ruby/object:Gem::Requirement
72
97
  none: false
73
98
  requirements:
74
99
  - - ~>
@@ -76,21 +101,31 @@ dependencies:
76
101
  version: 1.5.2
77
102
  type: :runtime
78
103
  prerelease: false
79
- version_requirements: *2156912420
104
+ version_requirements: !ruby/object:Gem::Requirement
105
+ none: false
106
+ requirements:
107
+ - - ~>
108
+ - !ruby/object:Gem::Version
109
+ version: 1.5.2
80
110
  - !ruby/object:Gem::Dependency
81
111
  name: mongoid
82
- requirement: &2156911220 !ruby/object:Gem::Requirement
112
+ requirement: !ruby/object:Gem::Requirement
83
113
  none: false
84
114
  requirements:
85
115
  - - ~>
86
116
  - !ruby/object:Gem::Version
87
- version: 2.4.6
117
+ version: 2.4.9
88
118
  type: :runtime
89
119
  prerelease: false
90
- version_requirements: *2156911220
120
+ version_requirements: !ruby/object:Gem::Requirement
121
+ none: false
122
+ requirements:
123
+ - - ~>
124
+ - !ruby/object:Gem::Version
125
+ version: 2.4.9
91
126
  - !ruby/object:Gem::Dependency
92
127
  name: locomotive-mongoid-tree
93
- requirement: &2156910660 !ruby/object:Gem::Requirement
128
+ requirement: !ruby/object:Gem::Requirement
94
129
  none: false
95
130
  requirements:
96
131
  - - ~>
@@ -98,21 +133,31 @@ dependencies:
98
133
  version: 0.6.2
99
134
  type: :runtime
100
135
  prerelease: false
101
- version_requirements: *2156910660
136
+ version_requirements: !ruby/object:Gem::Requirement
137
+ none: false
138
+ requirements:
139
+ - - ~>
140
+ - !ruby/object:Gem::Version
141
+ version: 0.6.2
102
142
  - !ruby/object:Gem::Dependency
103
143
  name: custom_fields
104
- requirement: &2156909980 !ruby/object:Gem::Requirement
144
+ requirement: !ruby/object:Gem::Requirement
105
145
  none: false
106
146
  requirements:
107
147
  - - ~>
108
148
  - !ruby/object:Gem::Version
109
- version: 2.0.0.rc10
149
+ version: 2.0.0.rc12
110
150
  type: :runtime
111
151
  prerelease: false
112
- version_requirements: *2156909980
152
+ version_requirements: !ruby/object:Gem::Requirement
153
+ none: false
154
+ requirements:
155
+ - - ~>
156
+ - !ruby/object:Gem::Version
157
+ version: 2.0.0.rc12
113
158
  - !ruby/object:Gem::Dependency
114
159
  name: kaminari
115
- requirement: &2156909220 !ruby/object:Gem::Requirement
160
+ requirement: !ruby/object:Gem::Requirement
116
161
  none: false
117
162
  requirements:
118
163
  - - ~>
@@ -120,32 +165,47 @@ dependencies:
120
165
  version: 0.13.0
121
166
  type: :runtime
122
167
  prerelease: false
123
- version_requirements: *2156909220
168
+ version_requirements: !ruby/object:Gem::Requirement
169
+ none: false
170
+ requirements:
171
+ - - ~>
172
+ - !ruby/object:Gem::Version
173
+ version: 0.13.0
124
174
  - !ruby/object:Gem::Dependency
125
175
  name: haml
126
- requirement: &2157048120 !ruby/object:Gem::Requirement
176
+ requirement: !ruby/object:Gem::Requirement
127
177
  none: false
128
178
  requirements:
129
179
  - - ~>
130
180
  - !ruby/object:Gem::Version
131
- version: 3.1.4
181
+ version: 3.1.6
132
182
  type: :runtime
133
183
  prerelease: false
134
- version_requirements: *2157048120
184
+ version_requirements: !ruby/object:Gem::Requirement
185
+ none: false
186
+ requirements:
187
+ - - ~>
188
+ - !ruby/object:Gem::Version
189
+ version: 3.1.6
135
190
  - !ruby/object:Gem::Dependency
136
191
  name: jquery-rails
137
- requirement: &2157047180 !ruby/object:Gem::Requirement
192
+ requirement: !ruby/object:Gem::Requirement
138
193
  none: false
139
194
  requirements:
140
195
  - - ~>
141
196
  - !ruby/object:Gem::Version
142
- version: 1.0.16
197
+ version: 1.0.19
143
198
  type: :runtime
144
199
  prerelease: false
145
- version_requirements: *2157047180
200
+ version_requirements: !ruby/object:Gem::Requirement
201
+ none: false
202
+ requirements:
203
+ - - ~>
204
+ - !ruby/object:Gem::Version
205
+ version: 1.0.19
146
206
  - !ruby/object:Gem::Dependency
147
207
  name: rails-backbone
148
- requirement: &2157046680 !ruby/object:Gem::Requirement
208
+ requirement: !ruby/object:Gem::Requirement
149
209
  none: false
150
210
  requirements:
151
211
  - - ~>
@@ -153,10 +213,15 @@ dependencies:
153
213
  version: 0.6.1
154
214
  type: :runtime
155
215
  prerelease: false
156
- version_requirements: *2157046680
216
+ version_requirements: !ruby/object:Gem::Requirement
217
+ none: false
218
+ requirements:
219
+ - - ~>
220
+ - !ruby/object:Gem::Version
221
+ version: 0.6.1
157
222
  - !ruby/object:Gem::Dependency
158
223
  name: codemirror-rails
159
- requirement: &2157044940 !ruby/object:Gem::Requirement
224
+ requirement: !ruby/object:Gem::Requirement
160
225
  none: false
161
226
  requirements:
162
227
  - - ~>
@@ -164,10 +229,15 @@ dependencies:
164
229
  version: '2.21'
165
230
  type: :runtime
166
231
  prerelease: false
167
- version_requirements: *2157044940
232
+ version_requirements: !ruby/object:Gem::Requirement
233
+ none: false
234
+ requirements:
235
+ - - ~>
236
+ - !ruby/object:Gem::Version
237
+ version: '2.21'
168
238
  - !ruby/object:Gem::Dependency
169
239
  name: locomotive-tinymce-rails
170
- requirement: &2157044020 !ruby/object:Gem::Requirement
240
+ requirement: !ruby/object:Gem::Requirement
171
241
  none: false
172
242
  requirements:
173
243
  - - ~>
@@ -175,10 +245,15 @@ dependencies:
175
245
  version: 3.4.7.2
176
246
  type: :runtime
177
247
  prerelease: false
178
- version_requirements: *2157044020
248
+ version_requirements: !ruby/object:Gem::Requirement
249
+ none: false
250
+ requirements:
251
+ - - ~>
252
+ - !ruby/object:Gem::Version
253
+ version: 3.4.7.2
179
254
  - !ruby/object:Gem::Dependency
180
255
  name: locomotive-aloha-rails
181
- requirement: &2157042940 !ruby/object:Gem::Requirement
256
+ requirement: !ruby/object:Gem::Requirement
182
257
  none: false
183
258
  requirements:
184
259
  - - ~>
@@ -186,10 +261,15 @@ dependencies:
186
261
  version: 0.20.1.4
187
262
  type: :runtime
188
263
  prerelease: false
189
- version_requirements: *2157042940
264
+ version_requirements: !ruby/object:Gem::Requirement
265
+ none: false
266
+ requirements:
267
+ - - ~>
268
+ - !ruby/object:Gem::Version
269
+ version: 0.20.1.4
190
270
  - !ruby/object:Gem::Dependency
191
271
  name: flash_cookie_session
192
- requirement: &2157042360 !ruby/object:Gem::Requirement
272
+ requirement: !ruby/object:Gem::Requirement
193
273
  none: false
194
274
  requirements:
195
275
  - - ~>
@@ -197,21 +277,31 @@ dependencies:
197
277
  version: 1.1.1
198
278
  type: :runtime
199
279
  prerelease: false
200
- version_requirements: *2157042360
280
+ version_requirements: !ruby/object:Gem::Requirement
281
+ none: false
282
+ requirements:
283
+ - - ~>
284
+ - !ruby/object:Gem::Version
285
+ version: 1.1.1
201
286
  - !ruby/object:Gem::Dependency
202
287
  name: locomotive_liquid
203
- requirement: &2157041500 !ruby/object:Gem::Requirement
288
+ requirement: !ruby/object:Gem::Requirement
204
289
  none: false
205
290
  requirements:
206
- - - =
291
+ - - '='
207
292
  - !ruby/object:Gem::Version
208
293
  version: 2.2.2
209
294
  type: :runtime
210
295
  prerelease: false
211
- version_requirements: *2157041500
296
+ version_requirements: !ruby/object:Gem::Requirement
297
+ none: false
298
+ requirements:
299
+ - - '='
300
+ - !ruby/object:Gem::Version
301
+ version: 2.2.2
212
302
  - !ruby/object:Gem::Dependency
213
303
  name: formtastic
214
- requirement: &2157144620 !ruby/object:Gem::Requirement
304
+ requirement: !ruby/object:Gem::Requirement
215
305
  none: false
216
306
  requirements:
217
307
  - - ~>
@@ -219,10 +309,15 @@ dependencies:
219
309
  version: 2.0.2
220
310
  type: :runtime
221
311
  prerelease: false
222
- version_requirements: *2157144620
312
+ version_requirements: !ruby/object:Gem::Requirement
313
+ none: false
314
+ requirements:
315
+ - - ~>
316
+ - !ruby/object:Gem::Version
317
+ version: 2.0.2
223
318
  - !ruby/object:Gem::Dependency
224
319
  name: responders
225
- requirement: &2157142720 !ruby/object:Gem::Requirement
320
+ requirement: !ruby/object:Gem::Requirement
226
321
  none: false
227
322
  requirements:
228
323
  - - ~>
@@ -230,10 +325,15 @@ dependencies:
230
325
  version: 0.6.4
231
326
  type: :runtime
232
327
  prerelease: false
233
- version_requirements: *2157142720
328
+ version_requirements: !ruby/object:Gem::Requirement
329
+ none: false
330
+ requirements:
331
+ - - ~>
332
+ - !ruby/object:Gem::Version
333
+ version: 0.6.4
234
334
  - !ruby/object:Gem::Dependency
235
335
  name: cells
236
- requirement: &2157140100 !ruby/object:Gem::Requirement
336
+ requirement: !ruby/object:Gem::Requirement
237
337
  none: false
238
338
  requirements:
239
339
  - - ~>
@@ -241,10 +341,15 @@ dependencies:
241
341
  version: 3.8.0
242
342
  type: :runtime
243
343
  prerelease: false
244
- version_requirements: *2157140100
344
+ version_requirements: !ruby/object:Gem::Requirement
345
+ none: false
346
+ requirements:
347
+ - - ~>
348
+ - !ruby/object:Gem::Version
349
+ version: 3.8.0
245
350
  - !ruby/object:Gem::Dependency
246
351
  name: RedCloth
247
- requirement: &2157138980 !ruby/object:Gem::Requirement
352
+ requirement: !ruby/object:Gem::Requirement
248
353
  none: false
249
354
  requirements:
250
355
  - - ~>
@@ -252,10 +357,15 @@ dependencies:
252
357
  version: 4.2.8
253
358
  type: :runtime
254
359
  prerelease: false
255
- version_requirements: *2157138980
360
+ version_requirements: !ruby/object:Gem::Requirement
361
+ none: false
362
+ requirements:
363
+ - - ~>
364
+ - !ruby/object:Gem::Version
365
+ version: 4.2.8
256
366
  - !ruby/object:Gem::Dependency
257
367
  name: sanitize
258
- requirement: &2157138420 !ruby/object:Gem::Requirement
368
+ requirement: !ruby/object:Gem::Requirement
259
369
  none: false
260
370
  requirements:
261
371
  - - ~>
@@ -263,10 +373,15 @@ dependencies:
263
373
  version: 2.0.3
264
374
  type: :runtime
265
375
  prerelease: false
266
- version_requirements: *2157138420
376
+ version_requirements: !ruby/object:Gem::Requirement
377
+ none: false
378
+ requirements:
379
+ - - ~>
380
+ - !ruby/object:Gem::Version
381
+ version: 2.0.3
267
382
  - !ruby/object:Gem::Dependency
268
383
  name: highline
269
- requirement: &2157137520 !ruby/object:Gem::Requirement
384
+ requirement: !ruby/object:Gem::Requirement
270
385
  none: false
271
386
  requirements:
272
387
  - - ~>
@@ -274,10 +389,15 @@ dependencies:
274
389
  version: 1.6.2
275
390
  type: :runtime
276
391
  prerelease: false
277
- version_requirements: *2157137520
392
+ version_requirements: !ruby/object:Gem::Requirement
393
+ none: false
394
+ requirements:
395
+ - - ~>
396
+ - !ruby/object:Gem::Version
397
+ version: 1.6.2
278
398
  - !ruby/object:Gem::Dependency
279
399
  name: unidecoder
280
- requirement: &2157136920 !ruby/object:Gem::Requirement
400
+ requirement: !ruby/object:Gem::Requirement
281
401
  none: false
282
402
  requirements:
283
403
  - - ~>
@@ -285,10 +405,15 @@ dependencies:
285
405
  version: 1.1.1
286
406
  type: :runtime
287
407
  prerelease: false
288
- version_requirements: *2157136920
408
+ version_requirements: !ruby/object:Gem::Requirement
409
+ none: false
410
+ requirements:
411
+ - - ~>
412
+ - !ruby/object:Gem::Version
413
+ version: 1.1.1
289
414
  - !ruby/object:Gem::Dependency
290
415
  name: rmagick
291
- requirement: &2157151180 !ruby/object:Gem::Requirement
416
+ requirement: !ruby/object:Gem::Requirement
292
417
  none: false
293
418
  requirements:
294
419
  - - ~>
@@ -296,32 +421,31 @@ dependencies:
296
421
  version: 2.12.2
297
422
  type: :runtime
298
423
  prerelease: false
299
- version_requirements: *2157151180
424
+ version_requirements: !ruby/object:Gem::Requirement
425
+ none: false
426
+ requirements:
427
+ - - ~>
428
+ - !ruby/object:Gem::Version
429
+ version: 2.12.2
300
430
  - !ruby/object:Gem::Dependency
301
431
  name: carrierwave-mongoid
302
- requirement: &2157149400 !ruby/object:Gem::Requirement
432
+ requirement: !ruby/object:Gem::Requirement
303
433
  none: false
304
434
  requirements:
305
435
  - - ~>
306
436
  - !ruby/object:Gem::Version
307
- version: 0.1.3
437
+ version: 0.2.1
308
438
  type: :runtime
309
439
  prerelease: false
310
- version_requirements: *2157149400
311
- - !ruby/object:Gem::Dependency
312
- name: carrierwave
313
- requirement: &2157147020 !ruby/object:Gem::Requirement
440
+ version_requirements: !ruby/object:Gem::Requirement
314
441
  none: false
315
442
  requirements:
316
443
  - - ~>
317
444
  - !ruby/object:Gem::Version
318
- version: 0.6.0
319
- type: :runtime
320
- prerelease: false
321
- version_requirements: *2157147020
445
+ version: 0.2.1
322
446
  - !ruby/object:Gem::Dependency
323
447
  name: fog
324
- requirement: &2157145280 !ruby/object:Gem::Requirement
448
+ requirement: !ruby/object:Gem::Requirement
325
449
  none: false
326
450
  requirements:
327
451
  - - ~>
@@ -329,10 +453,15 @@ dependencies:
329
453
  version: 1.3.1
330
454
  type: :runtime
331
455
  prerelease: false
332
- version_requirements: *2157145280
456
+ version_requirements: !ruby/object:Gem::Requirement
457
+ none: false
458
+ requirements:
459
+ - - ~>
460
+ - !ruby/object:Gem::Version
461
+ version: 1.3.1
333
462
  - !ruby/object:Gem::Dependency
334
463
  name: dragonfly
335
- requirement: &2157160660 !ruby/object:Gem::Requirement
464
+ requirement: !ruby/object:Gem::Requirement
336
465
  none: false
337
466
  requirements:
338
467
  - - ~>
@@ -340,10 +469,15 @@ dependencies:
340
469
  version: 0.9.8
341
470
  type: :runtime
342
471
  prerelease: false
343
- version_requirements: *2157160660
472
+ version_requirements: !ruby/object:Gem::Requirement
473
+ none: false
474
+ requirements:
475
+ - - ~>
476
+ - !ruby/object:Gem::Version
477
+ version: 0.9.8
344
478
  - !ruby/object:Gem::Dependency
345
479
  name: rack-cache
346
- requirement: &2157159120 !ruby/object:Gem::Requirement
480
+ requirement: !ruby/object:Gem::Requirement
347
481
  none: false
348
482
  requirements:
349
483
  - - ~>
@@ -351,10 +485,15 @@ dependencies:
351
485
  version: '1.1'
352
486
  type: :runtime
353
487
  prerelease: false
354
- version_requirements: *2157159120
488
+ version_requirements: !ruby/object:Gem::Requirement
489
+ none: false
490
+ requirements:
491
+ - - ~>
492
+ - !ruby/object:Gem::Version
493
+ version: '1.1'
355
494
  - !ruby/object:Gem::Dependency
356
495
  name: mimetype-fu
357
- requirement: &2157157380 !ruby/object:Gem::Requirement
496
+ requirement: !ruby/object:Gem::Requirement
358
497
  none: false
359
498
  requirements:
360
499
  - - ~>
@@ -362,21 +501,31 @@ dependencies:
362
501
  version: 0.1.2
363
502
  type: :runtime
364
503
  prerelease: false
365
- version_requirements: *2157157380
504
+ version_requirements: !ruby/object:Gem::Requirement
505
+ none: false
506
+ requirements:
507
+ - - ~>
508
+ - !ruby/object:Gem::Version
509
+ version: 0.1.2
366
510
  - !ruby/object:Gem::Dependency
367
511
  name: multi_json
368
- requirement: &2157155960 !ruby/object:Gem::Requirement
512
+ requirement: !ruby/object:Gem::Requirement
369
513
  none: false
370
514
  requirements:
371
- - - =
515
+ - - ~>
372
516
  - !ruby/object:Gem::Version
373
- version: 1.2.0
517
+ version: 1.3.4
374
518
  type: :runtime
375
519
  prerelease: false
376
- version_requirements: *2157155960
520
+ version_requirements: !ruby/object:Gem::Requirement
521
+ none: false
522
+ requirements:
523
+ - - ~>
524
+ - !ruby/object:Gem::Version
525
+ version: 1.3.4
377
526
  - !ruby/object:Gem::Dependency
378
527
  name: httparty
379
- requirement: &2157154360 !ruby/object:Gem::Requirement
528
+ requirement: !ruby/object:Gem::Requirement
380
529
  none: false
381
530
  requirements:
382
531
  - - ~>
@@ -384,10 +533,15 @@ dependencies:
384
533
  version: 0.8.1
385
534
  type: :runtime
386
535
  prerelease: false
387
- version_requirements: *2157154360
536
+ version_requirements: !ruby/object:Gem::Requirement
537
+ none: false
538
+ requirements:
539
+ - - ~>
540
+ - !ruby/object:Gem::Version
541
+ version: 0.8.1
388
542
  - !ruby/object:Gem::Dependency
389
543
  name: actionmailer-with-request
390
- requirement: &2157169060 !ruby/object:Gem::Requirement
544
+ requirement: !ruby/object:Gem::Requirement
391
545
  none: false
392
546
  requirements:
393
547
  - - ~>
@@ -395,7 +549,12 @@ dependencies:
395
549
  version: 0.3.0
396
550
  type: :runtime
397
551
  prerelease: false
398
- version_requirements: *2157169060
552
+ version_requirements: !ruby/object:Gem::Requirement
553
+ none: false
554
+ requirements:
555
+ - - ~>
556
+ - !ruby/object:Gem::Version
557
+ version: 0.3.0
399
558
  description: Locomotive is a next generation CMS system with sexy admin tools, liquid
400
559
  templating, and inline editing powered by mongodb and rails 3.2
401
560
  email:
@@ -431,8 +590,8 @@ files:
431
590
  - app/assets/images/locomotive/icons/flags/es.png
432
591
  - app/assets/images/locomotive/icons/flags/fr.png
433
592
  - app/assets/images/locomotive/icons/flags/it.png
593
+ - app/assets/images/locomotive/icons/flags/nb.png
434
594
  - app/assets/images/locomotive/icons/flags/nl.png
435
- - app/assets/images/locomotive/icons/flags/no.png
436
595
  - app/assets/images/locomotive/icons/flags/pt-BR.png
437
596
  - app/assets/images/locomotive/icons/flags/ru.png
438
597
  - app/assets/images/locomotive/icons/membership_edit.png
@@ -617,7 +776,9 @@ files:
617
776
  - app/controllers/locomotive/api/content_entries_controller.rb
618
777
  - app/controllers/locomotive/api/content_types_controller.rb
619
778
  - app/controllers/locomotive/api/current_site_controller.rb
779
+ - app/controllers/locomotive/api/memberships_controller.rb
620
780
  - app/controllers/locomotive/api/pages_controller.rb
781
+ - app/controllers/locomotive/api/sites_controller.rb
621
782
  - app/controllers/locomotive/api/snippets_controller.rb
622
783
  - app/controllers/locomotive/api/theme_assets_controller.rb
623
784
  - app/controllers/locomotive/api/tokens_controller.rb
@@ -794,8 +955,8 @@ files:
794
955
  - config/locales/admin_ui.es.yml
795
956
  - config/locales/admin_ui.fr.yml
796
957
  - config/locales/admin_ui.it.yml
958
+ - config/locales/admin_ui.nb.yml
797
959
  - config/locales/admin_ui.nl.yml
798
- - config/locales/admin_ui.no.yml
799
960
  - config/locales/admin_ui.pt-BR.yml
800
961
  - config/locales/admin_ui.ru.yml
801
962
  - config/locales/carrierwave.de.yml
@@ -803,8 +964,8 @@ files:
803
964
  - config/locales/carrierwave.es.yml
804
965
  - config/locales/carrierwave.fr.yml
805
966
  - config/locales/carrierwave.it.yml
967
+ - config/locales/carrierwave.nb.yml
806
968
  - config/locales/carrierwave.nl.yml
807
- - config/locales/carrierwave.no.yml
808
969
  - config/locales/carrierwave.pt-BR.yml
809
970
  - config/locales/carrierwave.ru.yml
810
971
  - config/locales/default.de.yml
@@ -812,8 +973,8 @@ files:
812
973
  - config/locales/default.es.yml
813
974
  - config/locales/default.fr.yml
814
975
  - config/locales/default.it.yml
976
+ - config/locales/default.nb.yml
815
977
  - config/locales/default.nl.yml
816
- - config/locales/default.no.yml
817
978
  - config/locales/default.pt-BR.yml
818
979
  - config/locales/default.ru.yml
819
980
  - config/locales/devise.de.yml
@@ -821,8 +982,8 @@ files:
821
982
  - config/locales/devise.es.yml
822
983
  - config/locales/devise.fr.yml
823
984
  - config/locales/devise.it.yml
985
+ - config/locales/devise.nb.yml
824
986
  - config/locales/devise.nl.yml
825
- - config/locales/devise.no.yml
826
987
  - config/locales/devise.pt-BR.yml
827
988
  - config/locales/devise.ru.yml
828
989
  - config/locales/flash.de.yml
@@ -830,8 +991,8 @@ files:
830
991
  - config/locales/flash.es.yml
831
992
  - config/locales/flash.fr.yml
832
993
  - config/locales/flash.it.yml
994
+ - config/locales/flash.nb.yml
833
995
  - config/locales/flash.nl.yml
834
- - config/locales/flash.no.yml
835
996
  - config/locales/flash.pt-BR.yml
836
997
  - config/locales/flash.ru.yml
837
998
  - config/locales/formtastic.de.yml
@@ -839,8 +1000,8 @@ files:
839
1000
  - config/locales/formtastic.es.yml
840
1001
  - config/locales/formtastic.fr.yml
841
1002
  - config/locales/formtastic.it.yml
1003
+ - config/locales/formtastic.nb.yml
842
1004
  - config/locales/formtastic.nl.yml
843
- - config/locales/formtastic.no.yml
844
1005
  - config/locales/formtastic.pt-BR.yml
845
1006
  - config/locales/formtastic.ru.yml
846
1007
  - config/routes.rb
@@ -889,6 +1050,7 @@ files:
889
1050
  - lib/locomotive/liquid/filters/resize.rb
890
1051
  - lib/locomotive/liquid/filters/text.rb
891
1052
  - lib/locomotive/liquid/tags/consume.rb
1053
+ - lib/locomotive/liquid/tags/csrf.rb
892
1054
  - lib/locomotive/liquid/tags/editable/base.rb
893
1055
  - lib/locomotive/liquid/tags/editable/control.rb
894
1056
  - lib/locomotive/liquid/tags/editable/file.rb
@@ -916,6 +1078,8 @@ files:
916
1078
  - lib/locomotive/mongoid/model_extensions.rb
917
1079
  - lib/locomotive/mongoid/patches.rb
918
1080
  - lib/locomotive/mongoid.rb
1081
+ - lib/locomotive/rails/action_view.rb
1082
+ - lib/locomotive/rails.rb
919
1083
  - lib/locomotive/regexps.rb
920
1084
  - lib/locomotive/render.rb
921
1085
  - lib/locomotive/routing/default_constraint.rb
@@ -983,7 +1147,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
983
1147
  version: '0'
984
1148
  segments:
985
1149
  - 0
986
- hash: -1009025569433287324
1150
+ hash: -3452373036066186043
987
1151
  required_rubygems_version: !ruby/object:Gem::Requirement
988
1152
  none: false
989
1153
  requirements:
@@ -992,7 +1156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
992
1156
  version: 1.3.6
993
1157
  requirements: []
994
1158
  rubyforge_project:
995
- rubygems_version: 1.8.11
1159
+ rubygems_version: 1.8.24
996
1160
  signing_key:
997
1161
  specification_version: 3
998
1162
  summary: A Next Generation Sexy CMS for Rails 3