Commit Graph

957 Commits

Author SHA1 Message Date
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
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
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
a2303f40f0 Only test the master branch on travis. 2011-10-24 21:24:27 +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
Sharagoz
35e2fd2d57 Merge branch 'master' of git://github.com/locomotivecms/engine 2011-10-08 21:17:03 +02:00
Sharagoz
f864980685 norwegian JS translations 2011-10-08 21:09:08 +02:00
Rytis Lukoševičius
6b9d2317da adding .published? and .listed? methods for the liquid Page drop class 2011-10-04 04:35:40 +03:00
Mario Visic
85cabafe67 Merge pull request #218 from corgibytes/ensure_rails_3_0
Rails 3.1 is getting used as a dependency when installing as a gem
2011-10-01 08:52:01 -07:00
did
016d773b2d fix issue #217 (memberships not correctly removed) 2011-09-28 18:27:29 +02:00
did
544e9e5c3c fix issue #225 (bson_ext version) 2011-09-28 11:57:48 +02:00
did
718b3c67bb improve the with_scope tag based on the work on the editor 2011-09-27 00:25:47 +02:00
M. Scott Ford
c18dfa035e Prevent rails 3.1 from getting pulled in as a dependency. 2011-09-25 21:03:50 -04:00