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

368 Commits

Author SHA1 Message Date
Corey Woodcox 81db1da423 fix spelling error in locales 2012-01-25 18:52:54 +11:00
did e523cb952c access entries of a content type from the API 2012-01-24 21:33:34 +01:00
did ab507dc165 change the default API base path + implement the API for content_assets, content_types and pages resources 2012-01-24 21:16:53 +01:00
did 0534c5504f prevent pow to crash when no flash message (bug) + add api resources for pages 2012-01-24 01:00:41 +01:00
did 739d2db0a9 first api draft 2012-01-23 09:05:50 +01:00
did b8b8cef089 make the edition of content types more robust (ex: better errors handler) 2012-01-18 01:43:01 +01:00
did 09d6060633 refactoring (rename modules, clean code, remove useless files, ...etc) + improve the inline editor module (locale picker + better ui workflow) 2012-01-17 17:04:45 +01:00
did 801f7bfca5 Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1 2012-01-17 12:05:52 +01:00
did e210953d01 inline editor work in progress 2012-01-17 12:05:39 +01:00
did 89020e7cf5 got a working version of the inline editor 2012-01-17 02:53:49 +01:00
did ebe149110b first draft of the new inline editing toolbar 2012-01-16 23:59:59 +01:00
Mario Visic 8ac8289394 Merge remote-tracking branch 'origin/master' into rails_3_1 
Conflicts:
	app/models/content_instance.rb
	config/locales/admin_ui.de.yml
	public/javascripts/admin/inline_editor_toolbar.js
	spec/models/content_instance_spec.rb
 2012-01-15 00:02:46 +10:30
benni 00035287c3 Update german locales (admin_ui and formtastic) 
Conflicts:

	config/locales/admin_ui.de.yml
	config/locales/formtastic.de.yml
 2012-01-14 23:19:57 +10:30
benni edc1907cfa Fixed i18n bug in german locale when creating a new resource from api. 2012-01-14 23:13:18 +10:30
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
Pietro Giorgianni 6d08daaba3 Fix i18n files so that they don't make Psych angry. 
(Fixes #269)
 2012-01-10 15:00:07 +01:00
did 01c5de36a5 add the ui element to select the languages for a site 2012-01-09 17:24:34 -08: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
Paul Sponagl 2fd7b47b61 Revert "update cells dependency" 
This reverts commit 9a28ecbd1e.
 2012-01-04 17:53:58 +01:00
Paul Sponagl df10701746 added translations af bennibu 2012-01-04 17:43:47 +01:00
Paul Sponagl dc324893ce german translation additions 2012-01-04 14:12:41 +01:00
did 0f1b4f59d3 listing all entries (done) + fix bugs + tweak ui 2012-01-04 02:07:53 +01:00
did 912251d49b big refactoring (wip) + add/edit entries for content types 2012-01-02 05:54:01 -08:00
Paul Sponagl 9a28ecbd1e update cells dependency 2011-12-27 23:34:00 +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 9130544516 refactoring the creation of custom contents 2011-12-22 14:28:12 -08:00
did 2068fe060d it becomes possible to add options for the select type 2011-12-22 07:45:42 -08: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
Robsteranium 82a61b1d2d spec added to confirm content_type Date problem & patch. Also 1.8.7 compatibility with syck init. 2011-12-15 03:16:11 +00:00
did 368f643cf0 theme assets page in progress 2011-12-07 02:09:13 +01:00
did 37684654ac first attempt to polish the theme assets page + refactor the css (wip) 2011-12-03 01:11:31 +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 71d48fe726 refactor the current site editing screen (screen) 2011-11-27 08:22:54 -08:00
Mario Visic 05d9990e69 Use syck for yaml, fixes an issuew with new delayed job. 2011-11-27 20:05:39 +11:00
did 47625dfa17 refactor code (wip) + fix bugs (wip) + tweak ui + save an existing page in ajax (HTML5 + FormData) + create a new page in ajax (wip) 2011-11-25 02:04:42 +01:00
did b2a5e1de85 new file input behaviour (for now just on editable_file) 2011-11-21 03:12:06 -08:00
Mario Visic 5f893d51c0 Merge remote-tracking branch 'origin/master' into rails_3_1 
Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/will_paginate.rb
	lib/locomotive/engine.rb
	lib/locomotive/hosting/bushido/account_ext.rb
	lib/locomotive/hosting/bushido/enabler.rb
	lib/locomotive/hosting/bushido/hooks.rb
 2011-11-20 21:08:23 +11: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 5ea81930b4 tinymce integration (wip) + polish the jquery dialog window (wip) 2011-11-19 00:20:37 +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
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 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 99e442673c namespace controllers, models, ...etc (wip) 2011-10-31 00:02:41 +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 786d2d9693 Added will paginate to liquid. 2011-10-24 23:44:35 +08:00
did 32f7552a50 typo in the French translation for Norway + remove crack from Gemfile 2011-10-17 19:15:08 +02:00
Sharagoz 35e2fd2d57 Merge branch 'master' of git://github.com/locomotivecms/engine 2011-10-08 21:17:03 +02:00
Sharagoz a843f16be0 norwegian locale 2011-09-19 17:43:23 +02:00
Sharagoz c6ab499664 added norwegian locale 2011-09-19 15:48:43 +02:00
Mario Visic 4c55401728 Merge pull request #209 from GarPit/master 
Liquid syntax mistake
 2011-09-16 19:02:03 -07:00
PitOn 6945bed820 liquid syntax translated mistake 2011-09-16 11:23:03 +04:00
Mario Visic 8dbd51734a Visiting /edit when not authenticated now sends users to the login page. 2011-09-04 01:15:43 +08:00
did 6a2f0f17dd complete the Russian version of the engine (#188): add the Russian flag + translate the Russian word in all the other locales 2011-08-31 23:43:52 +02:00
Didier Lafforgue 4a82935b46 Merge pull request #188 from GarPit/master 
Russian translation
 2011-08-31 14:21:47 -07:00
did cd5f3b9712 a couple of Dutch translation keys were missing (issue #181) 2011-08-30 23:39:45 +02:00
GarPit 1e5e151be6 russian translation 2011-08-29 16:54:21 +04:00
PitOn 367b0aab4f formtastic.ru.yml finished 2011-08-30 00:35:56 +04:00
PitOn db5cb0950d devise.ru.tml finished 2011-08-30 00:03:47 +04:00
PitOn a1d976ace1 default.ru.yml finished 2011-08-29 23:52:42 +04:00
PitOn a46019da40 admin_ui.ru.yml finished 2011-08-29 23:48:33 +04:00
PitOn ef75d4acef devise transaltions 2011-08-27 06:33:33 +04:00
PitOn d9dafd2222 default.yml translations 2011-08-27 06:27:14 +04:00
PitOn e8bea2844b more translations 2011-08-27 00:45:25 +04:00
did bb48552b51 Ruby MRI 1.9.3 Compatability Fixes 2011-08-25 23:28:56 +02:00
GarPit 75e6f2cd08 more translations 2011-08-17 18:28:49 +04:00
did b3a8916565 upgrade to will_paginate 3.0 (issue #166) 2011-08-15 15:32:21 -07:00
did 4543e597ed complete issue #162 2011-08-14 12:51:11 -07:00
Enrique García Cota cab52f8f7b added/corrected entries in admin_ui.es.yml 2011-08-12 14:13:44 +02:00
GarPit 09689a0cc9 initial ru translation 2011-08-12 15:32:37 +04:00
did 161878f57e add information to set up carrierwave for local filesystems 2011-08-11 14:47:12 -07:00
Didier Lafforgue 7a4253a7e4 Merge pull request #152 from frisoft/master 
Bugfix: import and italian localization update.
 2011-08-11 14:00:48 -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
Andrea Frigido 3966c7bdae Italian localization update. 2011-08-01 16:21:15 +02:00
did 6d66275def merge pull request #148 2011-07-28 15:03:13 +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
did 0a8321ad3d writing cells specs + restore the bushido.json file 2011-07-26 02:00:35 +02:00
did ffb780238b minor modifications 2011-07-25 23:40:24 +02:00
did cb349b3ac0 enable debug mode for bushido + fix minor issues 2011-07-25 23:16:43 +02:00
did 4f7312a659 CAS feature + Cells 2011-07-25 23:07:32 +02:00
did e2b68ba861 restore production settings + fix broken tests + apply the coding convention on the recently modified haml file 2011-07-23 01:26:16 +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
Sean Grove 694ca19324 Le sigh... 2011-07-21 18:38:58 -07:00
Kev Zettler c1a1e720d3 added guider info to starter page 2011-07-20 22:19:21 -07:00
Kev Zettler 55f95499ce commented out the compression disable dev stuff 2011-07-20 12:24:04 -07:00
Kev Zettler e22e7a5e46 changed the 'update' buttons to save save 2011-07-18 20:55:55 -07:00
Andrea Frigido 0fde9917d5 Italian localization update. 2011-07-11 09:04:12 +02:00
Kev Zettler ca2fad461d omg awesome guides 2011-07-08 01:20:29 -07:00
did 37d10aa25b fix bug #104 2011-07-06 11:48:04 -07:00
did 6acec074e2 spanish translation (ticket #103) 2011-07-06 00:33:34 +02:00