github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • cffe64f6be rebuilding the editing page for the site (wip) did 2011-11-25 15:10:56 +0100
  • 2a5861e8a7 Specs now correctly use a multisite test app. Mario Visic 2011-11-25 23:59:44 +1100
  • 915a28dc0a Merge remote-tracking branch 'origin/rails_3_1' into rails_3_1 Mario Visic 2011-11-25 23:46:12 +1100
  • 1c5d19ad71 Fixed for locomotive setup test method. Mario Visic 2011-11-25 23:45:16 +1100
  • cb735a0539 cleaning did 2011-11-25 13:38:31 +0100
  • fcd2146c11 foldable fieldsets fixed on firefox did 2011-11-25 12:31:18 +0100
  • 5bb29d9702 fix styling issues with form and firefox did 2011-11-25 12:05:30 +0100
  • cda038e320 style submenu on firefox did 2011-11-25 11:12:55 +0100
  • 80c9d5091f style submenu popup on firefox did 2011-11-25 10:56:56 +0100
  • 76ef0cb28d Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1 did 2011-11-25 02:05:14 +0100
  • 47625dfa17 refactor code (wip) + fix bugs (wip) + tweak ui + save an existing page in ajax (HTML5 + FormData) + create a new page in ajax (wip) did 2011-11-25 02:04:42 +0100
  • 06f4fc98e3 Fixed a bunch of model tests. Mario Visic 2011-11-25 00:37:17 +1100
  • a50df5ad8e menu and submenu in full css3 (without any images) + delete useless images + clean the code (wip) did 2011-11-23 05:01:15 -0800
  • 40ef3e4fff Fixed a couple of failing tests. Mario Visic 2011-11-22 00:08:18 +1100
  • b2a5e1de85 new file input behaviour (for now just on editable_file) did 2011-11-21 03:12:06 -0800
  • 0b7cc6ebd2 merging did 2011-11-21 02:28:12 +0100
  • 1a1a92e12f refactor the presenters + convert the editable_elements partial into a full backbone, coffeescript, handlebar, json stack did 2011-11-21 02:27:05 +0100
  • e21a40c157 Some fixes for the content asset spec. Mario Visic 2011-11-20 22:52:20 +1100
  • 75041ba21c Specs now run for all models. The account model now passes GREEEEn. Mario Visic 2011-11-20 22:47:41 +1100
  • a99ba18200 Temporarily removed a module include causing issues. Mario Visic 2011-11-20 22:47:03 +1100
  • 47db53e0e5 Namespace factory girl factories. Mario Visic 2011-11-20 22:25:01 +1100
  • a7b66f0e25 Lots of fixes to get tets closer to working. Mario Visic 2011-11-20 21:59:12 +1100
  • a97978468f Use a later custom fields version. Mario Visic 2011-11-20 21:52:22 +1100
  • 51c0397531 Removed spork to get spec helper working. Will readd later if required. Mario Visic 2011-11-20 21:39:46 +1100
  • 769cf7548c Updated gemfile with kaminari again. Mario Visic 2011-11-20 21:36:10 +1100
  • e6c1d6e94e changes to the gemfile to remove local gem dependencies. Mario Visic 2011-11-20 21:18:42 +1100
  • 5f893d51c0 Merge remote-tracking branch 'origin/master' into rails_3_1 Mario Visic 2011-11-20 21:08:23 +1100
  • c267f8ccbc inverse toggle effects + add missing redirect_url field + fix an anoying bug about the locomotive_media plugin did 2011-11-20 01:27:23 +0100
  • a6211d594e almost done with the tinyMCE customization did 2011-11-20 00:54:33 +0100
  • cd411de4ce implement a generic asset picker did 2011-11-19 17:33:16 +0100
  • 63e2a63d1a polishing the locomotive_media plugin (wip) did 2011-11-19 16:41:16 +0100
  • 72c2cb2059 rename asset to content_asset + clean the locomotive_media plugin for tinyMCE (wip) did 2011-11-19 15:47:56 +0100
  • 5ea81930b4 tinymce integration (wip) + polish the jquery dialog window (wip) did 2011-11-19 00:20:37 +0100
  • 2620748b81 restyling the editable elements in css3 (wip) did 2011-11-17 18:05:51 +0100
  • 0e5e16c8b4 Merge pull request #245 from locomotivecms/bushido_add_user Sean Grove 2011-11-16 12:30:23 -0800
  • ef5caad897 Proper mongoid exists? syntax bushido_add_user Sean Grove 2011-11-16 12:04:51 -0800
  • d1306aec53 Horrific rebasing strategy, but working code. Sean Grove 2011-11-16 11:39:47 -0800
  • ed96ab1cf5 BUSHIDO_FIX: Adds bushido hooks user.added user.removed, and updates app.claimed to work with bushido_user_id as the permanent id Sean Grove 2011-11-16 11:38:23 -0800
  • 43dee9391d Uses a more careful approach when removing a user based on the bushido user.removed hook Sean Grove 2011-11-16 11:21:01 -0800
  • 5a4a9f5475 BUSHIDO_FIX: Adds bushido hooks user.added user.removed, and updates app.claimed to work with bushido_user_id as the permanent id Sean Grove 2011-11-16 11:37:30 -0800
  • 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 Sean Grove 2011-11-16 11:32:00 -0800
  • 67615a7fe3 polishing (wip) + refactor the js code (wip) did 2011-11-16 13:42:42 +0100
  • a9dace0d0f right translation keys for the image picker did 2011-11-16 11:24:14 +0100
  • a48b602ea9 sub menu popup in place did 2011-11-16 11:19:57 +0100
  • 2c18f401bb adding the last refactored features on the pages section (wip) + clean code did 2011-11-16 01:39:16 +0100
  • 80a9a11c7b javascript for add/edit page (wip) did 2011-11-14 01:13:58 -0800
  • 596eb78a55 first draft for the json template response (tested on sorting pages) did 2011-11-11 00:39:25 -0800
  • bef9dd8e67 fix various namespace errors issues and api changes for the models did 2011-11-10 13:41:20 -0800
  • 6122983835 fix the annoying bug of duplicated flash messages + first backbone view for the index pages section did 2011-11-10 13:29:59 +0100
  • aa1abd2e92 remove useless piece of code did 2011-11-10 02:47:26 +0100
  • 599b1d6395 first work on migrating the javascripts to coffeescript and backbone (wip) did 2011-11-10 02:43:19 +0100
  • 248d3803c2 use the last version of formtastic + tweak the css for formtastic with scss + compass (wip) + clean code (wip) did 2011-11-09 02:35:59 +0100
  • 1b015efd48 cleaning stylesheets so that they fit the new assets system did 2011-11-08 15:34:25 +0100
  • fee5a5e98e custom_fields from git did 2011-11-08 01:29:12 +0100
  • dd75f69b74 fix module collisions and missing namespaces all over the templates (wip) did 2011-11-08 01:11:15 +0100
  • 9169cb386e waiting for the new devise gem (coming probably this week) did 2011-11-08 00:16:23 +0100
  • b383086242 wip did 2011-11-06 12:18:34 +0100
  • a3f66e19b5 fix issue #243 (Kaminari causing error on Bushido) did 2011-11-05 15:18:15 +0100
  • e309b62386 Merge branch '236_paginate_has_many' Mario Visic 2011-11-05 19:19:18 +1100
  • 4d9c77d41a Tidy up cucumbers a tad. Mario Visic 2011-11-05 19:17:30 +1100
  • ad0adc7153 Added a cucumber feature to paginate through models. Mario Visic 2011-11-05 19:10:26 +1100
  • c3c5d8e754 Tests are passing for has many pagination with Kaminari. Mario Visic 2011-11-05 18:42:04 +1100
  • 45d4b7cb60 Merge branch 'master' into 236_paginate_has_many Mario Visic 2011-11-05 18:03:27 +1100
  • 06ab49ecec Replaced will_paginate with kaminari Mario Visic 2011-11-05 16:45:43 +1100
  • 87d2440f14 working on fixing issues with devise (wip) did 2011-11-04 16:55:51 +0100
  • 8979957d43 convert stylesheets in sass (wip) + fix the installation module + customize devise (wip) did 2011-11-03 14:01:08 +0100
  • 851a255301 fixing assets (wip) did 2011-11-01 01:58:44 +0100
  • cdab48f0a9 isolate the engine (urls, helpers, ...etc) + change urls + remove the warning about bson_ext did 2011-11-01 00:44:23 +0100
  • 99e442673c namespace controllers, models, ...etc (wip) did 2011-10-31 00:02:41 +0100
  • 732f8f76f3 revert to bson_ext (1.3.1) because the last versions (1.4.x) have been yanked recently (temporary solution) did 2011-10-30 14:58:13 +0100
  • 9f8d2e4146 assets (wip) did 2011-10-30 14:28:45 +0100
  • 44007ac664 fix image references in assets did 2011-10-30 13:34:16 +0100
  • 34cd6f464e change database settings for this branch did 2011-10-30 13:20:20 +0100
  • ed6020be3e upgrade to new gems + remove hosting modules + change settings for Rails 3.1 + move assets to app/assets did 2011-10-30 13:17:05 +0100
  • fda3382300 No Site now renders a 404 error, this will prevent indexing of pages that do not exist. Fixes #237 Mario Visic 2011-10-29 14:35:23 +0800
  • 9f8906d840 Merge branch 'master' into 236_paginate_has_many Mario Visic 2011-10-29 14:36:01 +0800
  • 4939017f8d No Site now renders a 404 error, this will prevent indexing of pages that do not exist. Mario Visic 2011-10-29 14:35:23 +0800
  • 786d2d9693 Added will paginate to liquid. Mario Visic 2011-10-24 23:44:35 +0800
  • e6abd6bbe0 Path fix for pagination. Mario Visic 2011-10-24 23:37:39 +0800
  • 2bb9f5ed05 Revert "Arrays now paginate correctly." Mario Visic 2011-10-24 23:34:43 +0800
  • 25441ff60a Arrays now paginate correctly. Mario Visic 2011-10-24 22:35:21 +0800
  • 2c5407d588 Merge branch 'master' into 236_paginate_has_many Mario Visic 2011-10-24 21:40:44 +0800
  • a2303f40f0 Only test the master branch on travis. Mario Visic 2011-10-24 21:24:27 +0800
  • d574939e2c Added a failing test for paginating has many associations. Mario Visic 2011-10-24 20:52:43 +0800
  • 99386f8866 new version of plupload (fixing bug #232) did 2011-10-21 11:11:17 +0200
  • ca44edd58f Merge branch 'master' of github.com:locomotivecms/engine did 2011-10-18 18:46:03 +0200
  • 8298b2a4bf preventing recursive loop when used as engine in an app did 2011-10-18 18:45:45 +0200
  • fcac15c6b1 Fixed a failing cucumber scenario, bumped cucumber-rails. Mario Visic 2011-10-18 23:55:21 +0800
  • dc7b83d6b7 Merge branch 'master' of https://github.com/locomotivecms/engine Mario Visic 2011-10-18 22:56:18 +0800
  • 4088500795 Fixed syntax for a cucumber scenario. Mario Visic 2011-10-18 22:55:31 +0800
  • 32f7552a50 typo in the French translation for Norway + remove crack from Gemfile did 2011-10-17 19:15:08 +0200
  • 05e3e73210 Merge pull request #230 from Sharagoz/master Didier Lafforgue 2011-10-17 10:07:43 -0700
  • b655431ea6 Merge pull request #228 from pacifists/master Didier Lafforgue 2011-10-17 10:03:35 -0700
  • e0707a8f0a Merge branch 'master' of github.com:locomotivecms/engine did 2011-10-17 19:00:31 +0200
  • 443606f0f3 fix issue #216 did 2011-10-17 19:00:10 +0200
  • 4d19117351 Print cucumber backtraces for travis on failure. Mario Visic 2011-10-17 23:53:21 +0800
  • 70dacfcef2 Set the hostname on travis. Mario Visic 2011-10-17 23:47:51 +0800
  • 6b9ccf3854 Updated travis config. Mario Visic 2011-10-17 23:37:33 +0800
  • 930a67429d Added a travis CI config. Mario Visic 2011-10-17 22:55:09 +0800
  • dd118a7147 Only use autotest with MRI (doesnt work on rbx). Mario Visic 2011-10-16 13:21:12 +0800