Mario Visic
|
9a1a0f016f
|
Merge branch 'master' into rails_3_1
Conflicts:
app/models/content_type.rb
config/boot.rb
|
2011-12-15 22:29:07 +08:00 |
Robsteranium
|
282e2486b6
|
Previous comparison method failed when the sort column is a date with a Nil. This revision doesn't really sort Nils, rather ignore them.
|
2011-12-14 11:26:24 +00:00 |
did
|
a25009824c
|
fix some bugs + refactor look and feel of the import screens (wip)
|
2011-12-08 07:47:17 -08:00 |
did
|
368f643cf0
|
theme assets page in progress
|
2011-12-07 02:09:13 +01:00 |
|
Mario Visic
|
aa68d59979
|
Merge remote-tracking branch 'origin/rails_3_1' into rails_3_1
|
2011-12-05 22:31:14 +08:00 |
|
Mario Visic
|
4e6fc04889
|
Use contents_custom_fields instead of content_custom_fields
|
2011-12-05 22:29:32 +08:00 |
|
did
|
8af3445045
|
snippets done
|
2011-12-05 04:29:58 -08:00 |
|
Mario Visic
|
0eac23c3e3
|
Added target custom fields to the content instance model.
|
2011-12-05 16:38:07 +08:00 |
|
did
|
3fffe7bd91
|
new way of handling ajax post requests (redirecting if everything is fine)
|
2011-12-02 18:20:59 +01:00 |
|
did
|
fb0e87c64d
|
done (for now) with the my account screen
|
2011-12-02 01:43:49 +01:00 |
|
did
|
5d271239b7
|
the screen for editing site has been refactored
|
2011-11-29 14:58:19 +01:00 |
|
did
|
35012ca2b2
|
polishing the current site editing screen (wip)
|
2011-11-29 02:24:02 +01:00 |
|
did
|
cad1f5e68f
|
Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1
|
2011-11-27 08:23:12 -08:00 |
|
did
|
71d48fe726
|
refactor the current site editing screen (screen)
|
2011-11-27 08:22:54 -08:00 |
|
Mario Visic
|
ad6273e2fd
|
Lots of spec fixes (mostly namespacing), down to 107 failing specs.
|
2011-11-26 17:24:34 +11:00 |
|
did
|
cffe64f6be
|
rebuilding the editing page for the site (wip)
|
2011-11-25 15:10:56 +01:00 |
|
did
|
0b7cc6ebd2
|
merging
|
2011-11-21 02:28:12 +01:00 |
|
did
|
1a1a92e12f
|
refactor the presenters + convert the editable_elements partial into a full backbone, coffeescript, handlebar, json stack
|
2011-11-21 02:27:05 +01:00 |
|
Mario Visic
|
75041ba21c
|
Specs now run for all models. The account model now passes GREEEEn.
|
2011-11-20 22:47:41 +11:00 |
|
Mario Visic
|
a99ba18200
|
Temporarily removed a module include causing issues.
|
2011-11-20 22:47:03 +11:00 |
|
Mario Visic
|
a7b66f0e25
|
Lots of fixes to get tets closer to working.
|
2011-11-20 21:59:12 +11:00 |
|
did
|
63e2a63d1a
|
polishing the locomotive_media plugin (wip)
|
2011-11-19 16:41:16 +01:00 |
|
did
|
72c2cb2059
|
rename asset to content_asset + clean the locomotive_media plugin for tinyMCE (wip)
|
2011-11-19 15:47:56 +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
|
bef9dd8e67
|
fix various namespace errors issues and api changes for the models
|
2011-11-10 13:41:20 -08: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
|
b383086242
|
wip
|
2011-11-06 12:18:34 +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
|
99e442673c
|
namespace controllers, models, ...etc (wip)
|
2011-10-31 00:02:41 +01:00 |
|
did
|
016d773b2d
|
fix issue #217 (memberships not correctly removed)
|
2011-09-28 18:27:29 +02:00 |
|
Mario Visic
|
03b6649742
|
Designers cannot set others to admins, fixes #197
|
2011-09-17 22:23:43 +08:00 |
Karl Brightman
|
93667018c1
|
Updated with hashrocket
|
2011-09-16 11:55:30 +08:00 |
|
Karl Brightman
|
75f4835d3e
|
Integrated next and previous methods for content in content types
|
2011-09-16 11:35:40 +08:00 |
Paul
|
acd731347c
|
should sort by Page#depth so slug parts are in the right order
|
2011-08-29 16:17:18 +03:00 |
|
did
|
71a592eec1
|
fix issue #177
|
2011-08-25 18:27:43 +02:00 |
|
Mario Visic
|
a7bc648333
|
Implemented the site ability fix for designers.
|
2011-08-20 17:33:13 +08:00 |
|
Didier Lafforgue
|
12c9bd1eca
|
Merge pull request #159 from bquorning/patch-1
Adding indexes
|
2011-08-14 12:44:59 -07:00 |
|
did
|
67d7b13f4f
|
Add the reverse has_many field feature (mainly based on pull request #142)
|
2011-08-11 13:45:46 -07:00 |
Benjamin Quorning
|
e2eb8f2e90
|
Adding indexes on :position and [[:depth, :asc], [:position, :asc]] to avoid Mongo::OperationFailure: too much data for sort() with no index
|
2011-08-09 15:07:15 +03:00 |
|
did
|
4c8272dfa0
|
seo information were not imported for contents
|
2011-07-28 11:53:36 +02:00 |
|
did
|
8da0db2454
|
improve the solution for the issue #127 and write tests (pull request #139)
|
2011-07-28 00:39:59 +02:00 |
|
did
|
4f7312a659
|
CAS feature + Cells
|
2011-07-25 23:07:32 +02:00 |
|
did
|
819d7ac5ff
|
fix issue #131
|
2011-07-19 16:20:53 +02:00 |
|
Didier Lafforgue
|
4a9da56341
|
Merge pull request #114 from frisoft/master
Italian localization update + Locomotive.config.default_locale as default locale for new accounts.
|
2011-07-14 01:02:08 -07:00 |
|
did
|
770ae3a543
|
fix a couple of tiny bugs about: export, import and aloha
|
2011-07-13 11:14:44 +02:00 |
Andrea Frigido
|
f6c91ed791
|
Locomotive.config.default_locale as default locale for new accounts.
|
2011-07-11 13:13:58 +02:00 |
|
did
|
b2ddaf805c
|
show page kind: templatized or redirect
|
2011-07-07 18:03:55 +02:00 |
|
did
|
37d10aa25b
|
fix bug #104
|
2011-07-06 11:48:04 -07:00 |
|
did
|
1a62d8f5ad
|
Adding the ability to set a robots.txt for each site (ticket #87)
|
2011-07-05 22:34:15 +02:00 |