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

264 Commits

Author SHA1 Message Date
Mario Visic
34f9755d9a Altered admin menu cells inheritence, fixes #257 without limiting cells version. 2012-01-21 15:10:58 +11:00
Corey Woodcox
868c2d2e0e upgrade devise to 1.5.x 2012-01-20 19:32:53 -07:00
did
4d0f8610c5 bad display of content types if none + add new gems for tinymce and aloha 2012-01-21 01:48:00 +01:00
did
7af9ea34a6 trying to make it work with the precompilation of assets (issue with Aloha and TinyMCE) 2012-01-20 14:46:09 +01:00
did
4060b1859f use the right path to the back-office in the js components as well as in the middlewares 2012-01-14 14:54:01 +01:00
did
531017ab62 merging 2012-01-14 13:14:59 +01:00
Mario Visic
75b0137230 Merge remote-tracking branch 'origin/master' into rails_3_1 
Conflicts:
	Gemfile
	Gemfile.lock
	features/support/env.rb
	locomotive_cms.gemspec
	spec/cells/locomotive/global_actions_spec.rb
	spec/cells/locomotive/main_menu_cell_spec.rb
	spec/cells/locomotive/settings_menu_cell_spec.rb
 2012-01-14 16:37:24 +10:30
Mario Visic
04b1a7aa90 Bump RedCloth to a newer version to avoid warnings when running tests. 2012-01-14 13:04:34 +08:00
did
0489bbe4c2 implement the mechanism to pick a different locale for content types + implement multi-language for content types + rename scss files to css.scss 2012-01-14 01:38:09 +01:00
did
42db5ba656 namespace assets in vendor 2012-01-10 09:09:56 +01:00
did
4c204ef6a6 refactor and clean code (wip) + the api controller has been deleted and replace by the entry_submission_controller (+ custom responder) 2012-01-09 06:49:59 -08:00
did
5dfbb2bdb7 upgrade to the last version of delayed_job_mongoid gem + remove reference to the previous handlebars-rails gem (just add the js file instead) + refactor the way to display the list of content types in the back-office menu 2012-01-08 16:17:31 -08:00
did
9a21cd818a new rspec-cells gem 2012-01-07 02:53:33 +01:00
did
a1e692a34d fix tests suite with ruby 1.9.2 2012-01-07 02:49:23 +01:00
did
dc24c1b184 update delayed_job / delayed_job_mongoid gems (issue #267) 2012-01-07 01:39:30 +01:00
Mario Visic
c881750d78 Bundle update cells. 2012-01-05 01:47:10 +08:00
did
0f1b4f59d3 listing all entries (done) + fix bugs + tweak ui 2012-01-04 02:07:53 +01:00
did
e9ef4d48c3 content_instance becomes now content_entry with its shortcut content_type.entries + change references to the old custom_fields API 2011-12-23 00:45:32 +01:00
did
81a6569fe7 UI compoment to add options for the select type field (wip) 2011-12-22 02:59:30 +01:00
did
d1bb45d7c8 polishing the UI for the content types, refactoring still in progress 2011-12-22 01:31:33 +01:00
did
00283993c0 minimal version of the new UI for content types 2011-12-21 15:24:39 +01:00
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