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

431 Commits

Author SHA1 Message Date
Mario Visic
cecdfa4762 Merge branch 'master' into rails_3_1 2011-11-27 21:17:58 +11:00
Mario Visic
791c5f9d43 Merge pull request #223 from frisoft/master 
Method missing "disable_parent_editable_elements" for nil
 2011-11-27 01:53:25 -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
5c6794d69c Fixed some failing dragonfly specs. 2011-11-27 19:02:20 +11:00
Mario Visic
7f7ed896cf use starts_with? instead of start_with, fixes #253 and #251 2011-11-27 18:22:00 +11:00
Mario Visic
ad6273e2fd Lots of spec fixes (mostly namespacing), down to 107 failing specs. 2011-11-26 17:24:34 +11:00
Mario Visic
fa138b28d0 Fixed some failing export specs. 2011-11-26 16:22:48 +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
a50df5ad8e menu and submenu in full css3 (without any images) + delete useless images + clean the code (wip) 2011-11-23 05:01:15 -08:00
did
0b7cc6ebd2 merging 2011-11-21 02:28:12 +01:00
did
1a1a92e12f refactor the presenters + convert the editable_elements partial into a full backbone, coffeescript, handlebar, json stack 2011-11-21 02:27:05 +01:00
Mario Visic
769cf7548c Updated gemfile with kaminari again. 2011-11-20 21:36:10 +11: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
Sean Grove
ef5caad897 Proper mongoid exists? syntax 2011-11-16 12:04:51 -08:00
Sean Grove
d1306aec53 Horrific rebasing strategy, but working code. 2011-11-16 11:39:47 -08:00
Sean Grove
ed96ab1cf5 BUSHIDO_FIX: Adds bushido hooks user.added user.removed, and updates app.claimed to work with bushido_user_id as the permanent id 
Conflicts:

	lib/locomotive/hosting/bushido/hooks.rb
 2011-11-16 11:38:23 -08:00
Sean Grove
43dee9391d Uses a more careful approach when removing a user based on the bushido user.removed hook 2011-11-16 11:38:01 -08:00
Sean Grove
5a4a9f5475 BUSHIDO_FIX: Adds bushido hooks user.added user.removed, and updates app.claimed to work with bushido_user_id as the permanent id 
Conflicts:

	lib/locomotive/hosting/bushido/hooks.rb
 2011-11-16 11:37:30 -08:00
Sean Grove
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 2011-11-16 11:32:00 -08:00
did
80a9a11c7b javascript for add/edit page (wip) 2011-11-14 01:13:58 -08:00
did
596eb78a55 first draft for the json template response (tested on sorting pages) 2011-11-11 00:39:25 -08:00
did
bef9dd8e67 fix various namespace errors issues and api changes for the models 2011-11-10 13:41:20 -08:00
did
6122983835 fix the annoying bug of duplicated flash messages + first backbone view for the index pages section 2011-11-10 13:29:59 +01:00
did
aa1abd2e92 remove useless piece of code 2011-11-10 02:47:26 +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
1b015efd48 cleaning stylesheets so that they fit the new assets system 2011-11-08 15:34:25 +01:00
did
b383086242 wip 2011-11-06 12:18:34 +01:00
did
a3f66e19b5 fix issue #243 (Kaminari causing error on Bushido) 2011-11-05 15:18:15 +01:00
Mario Visic
ad0adc7153 Added a cucumber feature to paginate through models. 2011-11-05 19:10:26 +11:00
Mario Visic
c3c5d8e754 Tests are passing for has many pagination with Kaminari. 2011-11-05 18:42:04 +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
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
9f8906d840 Merge branch 'master' into 236_paginate_has_many 2011-10-29 14:36:01 +08:00
Mario Visic
4939017f8d No Site now renders a 404 error, this will prevent indexing of pages that do not exist. 2011-10-29 14:35:23 +08:00
Mario Visic
786d2d9693 Added will paginate to liquid. 2011-10-24 23:44:35 +08:00
Mario Visic
e6abd6bbe0 Path fix for pagination. 2011-10-24 23:37:39 +08:00
Mario Visic
2bb9f5ed05 Revert "Arrays now paginate correctly." 
This reverts commit 25441ff60a.
 2011-10-24 23:34:43 +08:00
Mario Visic
25441ff60a Arrays now paginate correctly. 2011-10-24 22:35:21 +08:00
Didier Lafforgue
05e3e73210 Merge pull request #230 from Sharagoz/master 
Norwegian translations
 2011-10-17 10:07:43 -07:00
Didier Lafforgue
b655431ea6 Merge pull request #228 from pacifists/master 
added published? and listed? methods for Page drop
 2011-10-17 10:03:35 -07:00
did
443606f0f3 fix issue #216 2011-10-17 19:00:10 +02:00
Sharagoz
35e2fd2d57 Merge branch 'master' of git://github.com/locomotivecms/engine 2011-10-08 21:17:03 +02:00
Rytis Lukoševičius
6b9d2317da adding .published? and .listed? methods for the liquid Page drop class 2011-10-04 04:35:40 +03:00
Andrea Frigido
d5534a4a2b Bugfix in snippets with block and editable_elements. 2011-09-27 09:01:55 +02:00
did
718b3c67bb improve the with_scope tag based on the work on the editor 2011-09-27 00:25:47 +02:00
did
ce24270948 fix issue #193 2011-09-22 01:38:23 +02:00
Sharagoz
ffc7057669 "no" locale added to config options 2011-09-19 16:15:25 +02:00
Karl Brightman
769b0569db Added examples 2011-09-16 11:37:48 +08:00
Karl Brightman
75f4835d3e Integrated next and previous methods for content in content types 2011-09-16 11:35:40 +08:00
did
8dfefe5094 fix issue #201 2011-09-14 11:32:14 +02:00
Mario Visic
8dbd51734a Visiting /edit when not authenticated now sends users to the login page. 2011-09-04 01:15:43 +08:00
Didier Lafforgue
4a82935b46 Merge pull request #188 from GarPit/master 
Russian translation
 2011-08-31 14:21:47 -07:00
GarPit
1e5e151be6 russian translation 2011-08-29 16:54:21 +04:00
Arjen Oosterkamp
a78bcdaf38 Added .htc file content type to white list 
Added .htc file content type javascripts folder
 2011-08-29 10:46:31 +02:00
Didier Lafforgue
201063aae0 Merge pull request #180 from mariovisic/cache_double_render_error 
Issue #176 Fix: Do not render twice for cached pages.
 2011-08-25 12:56:17 -07:00
did
71a592eec1 fix issue #177 2011-08-25 18:27:43 +02:00
Mario Visic
fdf55aee88 Do not render twice for cached pages. 2011-08-25 22:11:57 +08:00
did
01f6a0aad5 fix issue #171 2011-08-25 15:32:00 +02:00
Alex Sanford
88fd17a5aa Fixed issue with tablerow tag 2011-08-19 10:10:26 -03:00
did
8e26b922f4 BSON::ObjectId has to be converted in String in liquid templates 2011-08-18 12:03:34 +02:00
Didier Lafforgue
c3ba38216d Merge pull request #167 from pacifists/master 
added parent and breadcrumbs methods to page drop
 2011-08-15 15:38:20 -07:00
did
2d4f3df106 has_many target is not exported correctly (issue #165) + fix the import function as well 2011-08-15 14:39:53 -07:00
Rytis Lukoševičius
69e24e8fe0 added .breadcrumbs method to Page drop. It gives all the ancestors of the page and the page itself 2011-08-14 11:34:57 +03:00
Rytis Lukoševičius
025d5a7dda added .parent method to Page drop 2011-08-14 11:34:08 +03: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
37c50d27ff Bugfix: import site with empty editable file. 2011-08-03 08:58:47 +02:00
did
a9b6c234e7 fix issue #150 2011-07-28 16:42:16 +02:00
Didier Lafforgue
92ec012472 Merge pull request #149 from corgibytes/content_type_names 
Fixed issue with the way import was handling content_type name attributes
 2011-07-28 06:09:23 -07:00
did
6d66275def merge pull request #148 2011-07-28 15:03:13 +02:00
did
dbee233d0a add test for the issue #146 2011-07-28 13:51:59 +02:00
did
4c8272dfa0 seo information were not imported for contents 2011-07-28 11:53:36 +02:00
M. Scott Ford
36914834a1 Switched from calling #update to #update_attributes!. 2011-07-28 01:21:28 -04:00
M. Scott Ford
a532bb4c60 Fixed issues with the way import handled the content_type.name attribute. 2011-07-28 01:20:39 -04:00
Didier Lafforgue
7e31d3ea76 Merge pull request #143 from Sharagoz/master 
Cells gem not initialized in engine
 2011-07-27 16:34:55 -07:00
did
8da0db2454 improve the solution for the issue #127 and write tests (pull request #139) 2011-07-28 00:39:59 +02:00
Didier Lafforgue
e74f996c8c Merge pull request #139 from frisoft/master 
Added fix for #127
 2011-07-27 07:58:16 -07:00
Sharagoz
4f34610918 initialize Cells when used as an engine 2011-07-27 15:56:56 +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
Andrea Frigido
1dd432c2c8 Added fix for #127 2011-07-26 09:51:18 +02:00
Sean Grove
5e3a4ffa0f Set account.username for the cas lookup 2011-07-25 21:21:55 -07:00
Sean Grove
09343dd20a Event data structure tweak. 2011-07-25 20:39:09 -07:00
Sean Grove
93a852c705 Tweak with a local variable. 2011-07-25 20:13:21 -07:00
Sean Grove
8de926bca9 Bushido::Hooks -> Bushido::Data 2011-07-25 20:00:17 -07:00
Sean Grove
9bab872e5b Updated gem hooks for bushido claimed event 2011-07-25 19:37:23 -07:00
did
7b8053241d add more tests for cells + disable the cas_create_user option for the bushi.do env 2011-07-26 03:02:13 +02:00
did
4f7312a659 CAS feature + Cells 2011-07-25 23:07:32 +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
2a9a49f1b1 No more need for debug output 2011-07-21 18:48:46 -07:00
Sean Grove
32f57cc43c Output some debug information 2011-07-21 18:21:47 -07:00
Petr Blaho
a491b15801 Added possibility to use https in js and css url with liquid tags 2011-07-19 23:00:58 +02:00
Didier Lafforgue
294da07565 Merge pull request #132 from petrblaho/js_css_url 
javascript_url and stylesheet_url liquid tag
 2011-07-19 09:05:44 -07:00
Petr Blaho
41472c88bd Created stylesheet_url and javascript_url liquid filters 2011-07-19 16:27:42 +02:00
did
194a01d15f solve temporarily the issue #127 2011-07-19 15:51:29 +02:00
did
47088f9b0e fix issue #115 + clean code + exporting a site works now with ruby 1.8.7 2011-07-19 14:52:02 +02:00
did
45ff488ae8 enhance the rake task which forces to serialize page templates + do not import twice an asset with the same filename 2011-07-19 11:49:15 +02:00