did
|
599b1d6395
|
first work on migrating the javascripts to coffeescript and backbone (wip)
|
2011-11-10 02:43:19 +01:00 |
|
did
|
248d3803c2
|
use the last version of formtastic + tweak the css for formtastic with scss + compass (wip) + clean code (wip)
|
2011-11-09 02:35:59 +01:00 |
|
did
|
1b015efd48
|
cleaning stylesheets so that they fit the new assets system
|
2011-11-08 15:34:25 +01:00 |
|
did
|
fee5a5e98e
|
custom_fields from git
|
2011-11-08 01:29:12 +01:00 |
|
did
|
dd75f69b74
|
fix module collisions and missing namespaces all over the templates (wip)
|
2011-11-08 01:11:15 +01:00 |
|
did
|
9169cb386e
|
waiting for the new devise gem (coming probably this week)
|
2011-11-08 00:16:23 +01:00 |
|
did
|
b383086242
|
wip
|
2011-11-06 12:18:34 +01:00 |
|
did
|
a3f66e19b5
|
fix issue #243 (Kaminari causing error on Bushido)
|
2011-11-05 15:18:15 +01:00 |
|
Mario Visic
|
e309b62386
|
Merge branch '236_paginate_has_many'
|
2011-11-05 19:19:18 +11:00 |
|
Mario Visic
|
4d9c77d41a
|
Tidy up cucumbers a tad.
|
2011-11-05 19:17:30 +11:00 |
|
Mario Visic
|
ad0adc7153
|
Added a cucumber feature to paginate through models.
|
2011-11-05 19:10:26 +11:00 |
|
Mario Visic
|
c3c5d8e754
|
Tests are passing for has many pagination with Kaminari.
|
2011-11-05 18:42:04 +11:00 |
|
Mario Visic
|
45d4b7cb60
|
Merge branch 'master' into 236_paginate_has_many
|
2011-11-05 18:03:27 +11:00 |
|
Mario Visic
|
06ab49ecec
|
Replaced will_paginate with kaminari
|
2011-11-05 16:45:43 +11:00 |
|
did
|
87d2440f14
|
working on fixing issues with devise (wip)
|
2011-11-04 16:55:51 +01:00 |
|
did
|
8979957d43
|
convert stylesheets in sass (wip) + fix the installation module + customize devise (wip)
|
2011-11-03 14:01:08 +01:00 |
|
did
|
851a255301
|
fixing assets (wip)
|
2011-11-01 01:58:44 +01:00 |
|
did
|
cdab48f0a9
|
isolate the engine (urls, helpers, ...etc) + change urls + remove the warning about bson_ext
|
2011-11-01 00:44:23 +01:00 |
|
did
|
99e442673c
|
namespace controllers, models, ...etc (wip)
|
2011-10-31 00:02:41 +01:00 |
|
did
|
732f8f76f3
|
revert to bson_ext (1.3.1) because the last versions (1.4.x) have been yanked recently (temporary solution)
|
2011-10-30 14:58:13 +01:00 |
|
did
|
9f8d2e4146
|
assets (wip)
|
2011-10-30 14:28:45 +01:00 |
|
did
|
44007ac664
|
fix image references in assets
|
2011-10-30 13:34:16 +01:00 |
|
did
|
34cd6f464e
|
change database settings for this branch
|
2011-10-30 13:20:20 +01:00 |
|
did
|
ed6020be3e
|
upgrade to new gems + remove hosting modules + change settings for Rails 3.1 + move assets to app/assets
|
2011-10-30 13:17:05 +01:00 |
|
Mario Visic
|
fda3382300
|
No Site now renders a 404 error, this will prevent indexing of pages
that do not exist. Fixes #237
|
2011-10-29 23:44:28 +11:00 |
|
Mario Visic
|
9f8906d840
|
Merge branch 'master' into 236_paginate_has_many
|
2011-10-29 14:36:01 +08:00 |
|
Mario Visic
|
4939017f8d
|
No Site now renders a 404 error, this will prevent indexing of pages that do not exist.
|
2011-10-29 14:35:23 +08:00 |
|
Mario Visic
|
786d2d9693
|
Added will paginate to liquid.
|
2011-10-24 23:44:35 +08:00 |
|
Mario Visic
|
e6abd6bbe0
|
Path fix for pagination.
|
2011-10-24 23:37:39 +08:00 |
|
Mario Visic
|
2bb9f5ed05
|
Revert "Arrays now paginate correctly."
This reverts commit 25441ff60a.
|
2011-10-24 23:34:43 +08:00 |
|
Mario Visic
|
25441ff60a
|
Arrays now paginate correctly.
|
2011-10-24 22:35:21 +08:00 |
|
Mario Visic
|
2c5407d588
|
Merge branch 'master' into 236_paginate_has_many
|
2011-10-24 21:40:44 +08:00 |
|
Mario Visic
|
a2303f40f0
|
Only test the master branch on travis.
|
2011-10-24 21:24:27 +08:00 |
|
Mario Visic
|
d574939e2c
|
Added a failing test for paginating has many associations.
|
2011-10-24 20:52:43 +08:00 |
|
did
|
99386f8866
|
new version of plupload (fixing bug #232)
|
2011-10-21 11:11:17 +02:00 |
|
did
|
ca44edd58f
|
Merge branch 'master' of github.com:locomotivecms/engine
|
2011-10-18 18:46:03 +02:00 |
|
did
|
8298b2a4bf
|
preventing recursive loop when used as engine in an app
|
2011-10-18 18:45:45 +02:00 |
|
Mario Visic
|
fcac15c6b1
|
Fixed a failing cucumber scenario, bumped cucumber-rails.
|
2011-10-18 23:55:21 +08:00 |
|
Mario Visic
|
dc7b83d6b7
|
Merge branch 'master' of https://github.com/locomotivecms/engine
|
2011-10-18 22:56:18 +08:00 |
|
Mario Visic
|
4088500795
|
Fixed syntax for a cucumber scenario.
|
2011-10-18 22:55:31 +08:00 |
|
did
|
32f7552a50
|
typo in the French translation for Norway + remove crack from Gemfile
|
2011-10-17 19:15:08 +02:00 |
|
Didier Lafforgue
|
05e3e73210
|
Merge pull request #230 from Sharagoz/master
Norwegian translations
|
2011-10-17 10:07:43 -07:00 |
|
Didier Lafforgue
|
b655431ea6
|
Merge pull request #228 from pacifists/master
added published? and listed? methods for Page drop
|
2011-10-17 10:03:35 -07:00 |
|
did
|
e0707a8f0a
|
Merge branch 'master' of github.com:locomotivecms/engine
|
2011-10-17 19:00:31 +02:00 |
|
did
|
443606f0f3
|
fix issue #216
|
2011-10-17 19:00:10 +02:00 |
|
Mario Visic
|
4d19117351
|
Print cucumber backtraces for travis on failure.
|
2011-10-17 23:53:21 +08:00 |
|
Mario Visic
|
70dacfcef2
|
Set the hostname on travis.
|
2011-10-17 23:47:51 +08:00 |
|
Mario Visic
|
6b9ccf3854
|
Updated travis config.
|
2011-10-17 23:37:33 +08:00 |
|
Mario Visic
|
930a67429d
|
Added a travis CI config.
|
2011-10-17 22:55:09 +08:00 |
|
Mario Visic
|
dd118a7147
|
Only use autotest with MRI (doesnt work on rbx).
|
2011-10-16 13:21:12 +08:00 |
|