github-migration
/
engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,306 Commits 13 Branches 7 Tags 15 MiB
Commit Graph

243 Commits

Author SHA1 Message Date
did 217000042a refactoring the content types section (wip) 2011-12-19 14:15:11 +01:00
did a25009824c fix some bugs + refactor look and feel of the import screens (wip) 2011-12-08 07:47:17 -08:00
Mario Visic e6d72cfc71 Bumped the custom fields version, should now work with the namespaced models. 2011-12-06 21:17:47 +08:00
Mario Visic 9f56eecd56 Merge branch 'master' into rails_3_1 
Conflicts:
	Gemfile
	Gemfile.lock
	config/boot.rb
 2011-11-27 20:33:45 +11:00
Mario Visic 9b049aa055 Bumped delayed job versions, fixes #249. 2011-11-27 19:44:06 +11:00
Mario Visic 0f09c577d0 New capybara and selenium version, works in FF8 now. 2011-11-27 19:29:09 +11:00
Mario Visic 1d1137fa36 Bumped the rails 3.1.3 2011-11-26 15:57:22 +11:00
did b2a5e1de85 new file input behaviour (for now just on editable_file) 2011-11-21 03:12:06 -08:00
Mario Visic a97978468f Use a later custom fields version. 2011-11-20 21:52:22 +11:00
Mario Visic 51c0397531 Removed spork to get spec helper working. Will readd later if required. 2011-11-20 21:39:46 +11:00
Mario Visic 769cf7548c Updated gemfile with kaminari again. 2011-11-20 21:36:10 +11:00
Mario Visic e6c1d6e94e changes to the gemfile to remove local gem dependencies. 2011-11-20 21:18:42 +11:00
did 5ea81930b4 tinymce integration (wip) + polish the jquery dialog window (wip) 2011-11-19 00:20:37 +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 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 fee5a5e98e custom_fields from git 2011-11-08 01:29:12 +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
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 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
Mario Visic fcac15c6b1 Fixed a failing cucumber scenario, bumped cucumber-rails. 2011-10-18 23:55:21 +08:00
did 544e9e5c3c fix issue #225 (bson_ext version) 2011-09-28 11:57:48 +02:00
did 13b82e66fe fix httparty version to 0.7.8 2011-09-15 16:59:14 +02:00
did c84a571afc new gems for rails and custom_fields (it fixes a bug with the has_many custom field) 2011-08-31 23:14:30 +02:00
did bb48552b51 Ruby MRI 1.9.3 Compatability Fixes 2011-08-25 23:28:56 +02:00
did 7a9caabc41 new custom_fields gem version (beta 24) 2011-08-25 15:15:42 +02:00
did d0566f917e fix issue #179 2011-08-25 14:58:49 +02:00
did 0e3d601ea9 fix xss vulnerability issue (#170) 2011-08-18 16:06:34 +02:00
did e0b9367f10 Got Mongoid and FactoryGirl to stop preloading models (#157) 2011-08-16 20:58:23 +02:00
did b3a8916565 upgrade to will_paginate 3.0 (issue #166) 2011-08-15 15:32:21 -07:00
did cdf386aac2 fix issue #163 2011-08-14 13:33:24 -07:00
Didier Lafforgue b4bfea616a Merge pull request #158 from colibri-software/add_admin_user 
Added rake task to create new admin user
 2011-08-14 12:27:03 -07:00
did 408ff098ba Set up specs to use spork for faster test runs (#157) 2011-08-14 12:16:59 -07:00
did b23f2697e9 clean tests and make them pass in the order observed on nix systems 2011-08-13 16:24:02 -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
Alex Sanford c225a8d394 Added rake task to create new admin user 2011-08-04 13:19:39 -03:00
did a1977085a3 new bushido gem 2011-07-28 00:41:32 +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 8a58a0cad1 using the last bushido gem (0.0.31) 2011-07-26 23:36:36 +02:00
did abbc151ed2 new factory_girl gem + fix the require pb with the devise_bushido_authenticatable gem 2011-07-26 23:11:43 +02:00
did d5111d2a4f fix a minor bug about the contents menu + new devise_bushido_authenticatable gem 2011-07-26 21:38:27 +02:00
did e05586d387 write tests for the last cells menu + write tests for the bushi.do events + refactor the locomotive logger + add the cas_extra_attributes hook 2011-07-26 21:20:03 +02:00
Sean Grove 9bab872e5b Updated gem hooks for bushido claimed event 2011-07-25 19:37:23 -07:00
did 0a8321ad3d writing cells specs + restore the bushido.json file 2011-07-26 02:00:35 +02:00
did cb349b3ac0 enable debug mode for bushido + fix minor issues 2011-07-25 23:16:43 +02:00
Kev Zettler 13e247691f Merge pull request #137 from Bushido/master 
Guiders and new gem version
 2011-07-22 15:28:03 -07:00
Kev Zettler 1ce9c2a432 bumped gem to 30 2011-07-21 19:00:49 -07:00
Kev Zettler cf0b49932e dropped bushido gem back to 29 2011-07-20 22:53:04 -07:00
Kev Zettler e5549cc600 bumped bushido gem 2011-07-20 22:02:12 -07:00
did 86259e94b7 new carrierwave gem in replacement of locomotive-carrierwave (thanks @trevorturk) 2011-07-10 22:40:12 +02:00
did 91f2f145b3 the BIG MERGE is now done 2011-07-04 15:43:05 +02:00
did 7405b9343b new custom_field gem version to fix the duplicated fields bug 2011-07-03 02:07:46 +02:00
did 812965ad50 tweak the form UI (errors, input separator) + add more tests 2011-07-01 02:15:45 +02:00
did b2d6a7e001 new rspec-rails version (2.6.1) + clean the cucumber env.rb file 2011-06-29 03:10:20 +02:00
did c8f0ad0bbe upgrade rake (0.9.2), cucumber-rails (1.0.2), capybara 2011-06-29 03:05:07 +02:00
did 5e8eac53d4 refactor the way the middlewares are loaded (both app and engine) + tweaks some back-office texts + improve the UI by adding icons on addind a picture links + fix an annoying bug with carrierwave 2011-06-28 15:38:13 +02:00
did 09171555a7 fix CSRF issues with tinymce and some ajax actions + begin to work on the roles feature powered by cancan (in progress, not stable) 2011-06-25 09:25:31 -07:00
did c9bc8c8222 update gem versions 2011-06-23 23:22:17 +02:00
did 1d1889d155 new bushido gem version 2011-06-23 23:17:36 +02:00
did eb37cdcf36 fix broken tests + update gemspec / readme 2011-06-23 07:27:03 -07:00
did 4d29500483 new version of custom_fields + allow users to change the permalink of the custom model instances 2011-06-21 14:53:21 -07:00
did 6ed9788d50 clean Gemfile 2011-06-21 03:41:32 +02:00
did b00c84019c new gems + rspec in colour 2011-06-20 18:40:18 -07:00
did 87e7ced3c1 integrate dragonfly + clean code + fix a js bug when editing a custom field 2011-06-20 12:05:12 -07:00
did be055e51bc new custom_fields version 2011-06-17 01:55:27 +02:00
did 0878a39858 saving with the inline editor toolbar did not work (fixed) 2011-06-16 05:07:28 -07:00
did adfcbb6658 fix conflict issue with the new linecache gem + clean carrierwave local patch 2011-06-12 16:29:59 +02:00
did f1d8e7c141 clean everything before merging it to the master branch 2011-06-10 01:04:13 +02:00
did 5bf6d46574 done for production tests (installation from source) 2011-06-08 17:53:53 +02:00
did 49080b737d testing out the lastest gems for rails / carrierwave / ...etc 2011-06-08 16:33:33 +02:00
did fdfa36838b Gemfile.lock updated 2011-06-08 10:57:01 +02:00
did f9decc0890 switching over mongoid 2.0.2 + fix bug when displaying content labels in the back-office 2011-06-04 17:35:22 +02:00
did 4618b35318 cache-busting asset id for bushido.js + new bushido config var (app_name) 2011-06-01 21:09:09 +02:00
did 20fd07409b bushido stub gem 2011-05-29 14:47:18 -07:00
did c6b272f9f9 disable authentication if the app has not been claimed yet 2011-05-28 10:52:36 -07:00
did 1731536649 new bushido gem 2011-05-27 15:23:42 -07:00
did ef7ac0e721 make the bushido installation process the smoothest 2011-05-27 15:14:45 -07:00
did 2ce1fadf52 simplify the installation procedure for bushido users 2011-05-27 08:19:20 -07:00
did 8ad6ee580e fix issue #78 2011-05-24 12:23:05 -07:00
did 4cd771aca5 Gemfile.lock updated 2011-05-20 15:36:34 +02:00
did e8cdfc4794 new version of custom fields + display error messages for has_one and has_many field types 2011-05-20 15:27:07 +02:00
did d2f6cc0c53 has_many ui has been implemented 2011-05-19 17:44:04 +02:00
did 7dfce2c336 migration to mongoid 2.0.1 2011-05-16 23:06:46 +02:00
did 7dafc66359 typo for the french translation of the italian locale + right italy flag 2011-05-07 13:48:49 +02:00
did 6dd810b44e new custom_fields gem version as well as an heroku patch to fix the weird issue about json/heroku 2011-05-01 00:28:25 +02:00
did 483dfc350b merging sgrove-master into master 2011-04-27 16:09:21 +02:00
did 8b27880df3 new actionmailer-with-request gem 2011-04-27 00:50:47 +02:00
did b58e49fce2 make locomotive work with bushido + refactor some portions of code (routing constraints, ...etc) + fix broken tests 2011-04-25 01:21:38 +02:00
did e03d7b5dcc smoother integration with bushi.do 2011-04-07 01:34:36 +02:00
did 2cba14afec do not run the locomotive core initializer if engine 2011-04-06 01:29:11 +02:00
did 9ec642136f debugging the heroku deployment 2011-04-06 00:56:44 +02:00
did 551ef03ff6 simply the installation screens + fix all the broken tests + add tests for bushido 2011-04-05 02:18:17 +02:00
dinedine 7b30c34a9b forgot to commit Gemfile.lock as well 2011-04-04 02:14:00 +02:00
dinedine c0a5a4b443 single site / multi sites option in progress + integrating bushi.do + revert back to mongoid rc.7 2011-04-04 01:59:41 +02:00
did 551d8a5761 big refactoring of the locomotive config file in order to handle bushido / single / multi sites, ...etc 2011-04-01 02:34:19 +02:00