did
|
5ea81930b4
|
tinymce integration (wip) + polish the jquery dialog window (wip)
|
2011-11-19 00:20:37 +01:00 |
|
did
|
2620748b81
|
restyling the editable elements in css3 (wip)
|
2011-11-17 18:05:51 +01:00 |
Sean Grove
|
0e5e16c8b4
|
Merge pull request #245 from locomotivecms/bushido_add_user
Bushido user.added, user.removed, app.claimed, and login fixes
|
2011-11-16 12:30:23 -08:00 |
|
Sean Grove
|
ef5caad897
|
Proper mongoid exists? syntax
|
2011-11-16 12:04:51 -08:00 |
Sean Grove
|
d1306aec53
|
Horrific rebasing strategy, but working code.
|
2011-11-16 11:39:47 -08:00 |
|
Sean Grove
|
ed96ab1cf5
|
BUSHIDO_FIX: Adds bushido hooks user.added user.removed, and updates app.claimed to work with bushido_user_id as the permanent id
Conflicts:
lib/locomotive/hosting/bushido/hooks.rb
|
2011-11-16 11:38:23 -08:00 |
|
Sean Grove
|
43dee9391d
|
Uses a more careful approach when removing a user based on the bushido user.removed hook
|
2011-11-16 11:38:01 -08:00 |
|
Sean Grove
|
5a4a9f5475
|
BUSHIDO_FIX: Adds bushido hooks user.added user.removed, and updates app.claimed to work with bushido_user_id as the permanent id
Conflicts:
lib/locomotive/hosting/bushido/hooks.rb
|
2011-11-16 11:37:30 -08:00 |
|
Sean Grove
|
b2bfec1bc4
|
BUSHIDO_FIX: Adds hooks for user.added and user.removed, updates app.claimed event, switches to using bushido_user_id as permanent unchanging user id
|
2011-11-16 11:32:00 -08:00 |
|
did
|
67615a7fe3
|
polishing (wip) + refactor the js code (wip)
|
2011-11-16 13:42:42 +01:00 |
|
did
|
a9dace0d0f
|
right translation keys for the image picker
|
2011-11-16 11:24:14 +01:00 |
|
did
|
a48b602ea9
|
sub menu popup in place
|
2011-11-16 11:19:57 +01:00 |
|
did
|
2c18f401bb
|
adding the last refactored features on the pages section (wip) + clean code
|
2011-11-16 01:39:16 +01:00 |
did
|
80a9a11c7b
|
javascript for add/edit page (wip)
|
2011-11-14 01:13:58 -08:00 |
|
did
|
596eb78a55
|
first draft for the json template response (tested on sorting pages)
|
2011-11-11 00:39:25 -08:00 |
|
did
|
bef9dd8e67
|
fix various namespace errors issues and api changes for the models
|
2011-11-10 13:41:20 -08:00 |
|
did
|
6122983835
|
fix the annoying bug of duplicated flash messages + first backbone view for the index pages section
|
2011-11-10 13:29:59 +01:00 |
|
did
|
aa1abd2e92
|
remove useless piece of code
|
2011-11-10 02:47:26 +01:00 |
|
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 |