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

1331 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
did
50917a919e Use the 2.0.0.rc branch for the custom_fields gem 2012-01-26 02:41:31 +01:00
did
c0b8587eb2 rename the i18n site module into locales in order to avoid conflicts with the original i18n + rendering a page according to a locale specified in the url seems to work (tests are following) 2012-01-26 02:33:39 +01:00
did
11383f9c05 remove useless tmp files from git 2012-01-25 22:34:48 +01:00
did
4600f94922 extend i18n to pages (wip) 2012-01-25 22:07:10 +01:00
Mario Visic
e849318cc4 Fixed a few remaining typos. 2012-01-25 22:24:36 +11:00
Mario Visic
44b3579e02 Removed the locomotive init. 2012-01-25 22:24:13 +11:00
Mario Visic
5c191e59cd Merge remote-tracking branch 'origin/2.0.0.rc' into 2.0.0.rc 
Conflicts:
	Gemfile.lock
 2012-01-25 22:20:05 +11:00
Mario Visic
840609cbce Merge remote-tracking branch 'origin/master' into rails_3_1 
Conflicts:
	Gemfile
	Gemfile.lock
	app/cells/locomotive/menu_cell.rb
	app/helpers/admin/content_types_helper.rb
	app/models/content_instance.rb
	app/models/page.rb
	app/views/admin/shared/menu/_contents.html.haml
	config/initializers/locomotive.rb
	config/locales/admin_ui.de.yml
	config/locales/admin_ui.en.yml
	config/locales/admin_ui.es.yml
	config/locales/admin_ui.fr.yml
	config/locales/admin_ui.it.yml
	config/locales/admin_ui.nl.yml
	config/locales/admin_ui.no.yml
	config/locales/admin_ui.pt-BR.yml
	config/locales/admin_ui.ru.yml
	lib/generators/locomotive/install/templates/locomotive.rb
	lib/locomotive/configuration.rb
	locomotive_cms.gemspec
	spec/models/locomotive/account_spec.rb
 2012-01-25 22:16:43 +11:00
Corey Woodcox
7aadd9d129 add a message for deprecated config option 2012-01-25 18:52:55 +11:00
Corey Woodcox
1a5050a0c1 case sensitive search is a monster. 2012-01-25 18:52:54 +11:00
Corey Woodcox
81db1da423 fix spelling error in locales 2012-01-25 18:52:54 +11:00
did
7ace1d9a48 fix the broken link to the back-office in the toolbar when the inline_editor tag is missing 2012-01-24 22:04:49 +01: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
Gil Vandendriessche
d665a85591 Add sample option on import rake task 2012-01-21 16:05:36 +11:00
Mario Visic
07ff99e135 Ensure uniqueness and format of an accounts email address. 2012-01-21 15:51:38 +11:00
Mario Visic
40c2902e80 Added shoulda matchers. 2012-01-21 15:51:16 +11:00
Mario Visic
0a2bd13058 Merge pull request #283 from cwoodcox/facebook 
Upgrade to devise 1.5.x
 2012-01-20 20:19:08 -08:00
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
0f3c672777 make the toolbar smaller 2012-01-18 02:04:48 +01:00
did
fc20fe70c9 fix annoying bug about popups within the submenu 2012-01-18 01:54:26 +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
7169abb8c2 stylish buttons in the toolbar 2012-01-17 03:21:30 +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
15f9111ea8 Small fix to the global action spec. 2012-01-15 17:05:33 +11:00
Mario Visic
9a06042c4b Fixed some main menu tests. 2012-01-15 16:50:58 +11:00
Mario Visic
ddfd8c6a07 Fixed up some specs for the global action spec. 2012-01-15 15:38:07 +11:00
Mario Visic
ae244c2703 Fixed a failing test (class missing namespace). 2012-01-15 15:05:50 +11:00
Mario Visic
4622c4359f Fixed up a failing test due to the i18n module, left a fixme note. 2012-01-15 15:05:31 +11:00
Mario Visic
216b77ab41 Fixed up a bad merge of the content instance spec changes. 2012-01-15 14:50:23 +11: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
Mario Visic
a50715091d Merge remote-tracking branch 'origin/rails_3_1' into rails_3_1 2012-01-15 00:03:06 +10:30
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
Mario Visic
c2779dde51 Merge pull request #277 from jstirk/pr-229 
German locale changes from locomotivecms/engine#229
 2012-01-14 05:11:19 -08:00
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
did
531017ab62 merging 2012-01-14 13:14:59 +01:00
did
50a2453995 polish again the content_locale picker 2012-01-14 13:12:44 +01:00
Mario Visic
23f3705223 Added a contributing section to the readme. 2012-01-14 22:34:39 +10:30
Mario Visic
14fc4bf12d Merge remote-tracking branch 'origin/master' 2012-01-14 22:07:08 +10:30
Mario Visic
a0d02b2fce Add a failing tests for ContentInstance#set_visibility returning false. 2012-01-14 22:06:42 +10:30