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

139 Commits

Author SHA1 Message Date
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
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
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
Rytis Lukoševičius
6b9d2317da adding .published? and .listed? methods for the liquid Page drop class 2011-10-04 04:35:40 +03:00
did
718b3c67bb improve the with_scope tag based on the work on the editor 2011-09-27 00:25:47 +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
did
71a592eec1 fix issue #177 2011-08-25 18:27:43 +02:00
Alex Sanford
88fd17a5aa Fixed issue with tablerow tag 2011-08-19 10:10:26 -03: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
did
a9b6c234e7 fix issue #150 2011-07-28 16:42:16 +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
Petr Blaho
a491b15801 Added possibility to use https in js and css url with liquid tags 2011-07-19 23:00:58 +02:00
Petr Blaho
41472c88bd Created stylesheet_url and javascript_url liquid filters 2011-07-19 16:27:42 +02:00
did
770ae3a543 fix a couple of tiny bugs about: export, import and aloha 2011-07-13 11:14:44 +02:00
did
007f34ed8c export didn't work when sub pages 2011-07-07 01:34:11 +02:00
Didier Lafforgue
bf4b2be2b9 Merge pull request #108 from corgibytes/variables-as-values 
Enabled the use of variable values as the default values for editable con
 2011-07-06 15:06:47 -07:00
M. Scott Ford
314c1293d9 Enabled the use of variable values as the default values for editable content. 2011-07-06 15:19:55 -04:00
Didier Lafforgue
43670714b9 Merge pull request #86 from mariovisic/hotfix/nested_snippets 
Fix for issue #84 (Nested snippets)
 2011-07-05 12:16:30 -07:00
did
1e465e231e remove whilelist for theme assets (no useful since we have got roles now) + a little bit of refactoring 2011-07-04 19:40:14 +02:00
did
812965ad50 tweak the form UI (errors, input separator) + add more tests 2011-07-01 02:15:45 +02:00
did
fa7e4c24d8 implement feature #57 2011-06-23 05:57:52 -07:00
did
d4b7734003 fix issue #90 2011-06-23 01:14:36 -07:00
did
f4d9acd282 fix the tests + finish the integration of Dragonfly + clean code 2011-06-20 17:39:59 -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
ecdb79bb2d removing asset_collections: script + remove references in liquid 2011-06-20 04:25:17 -07:00
did
abcf4f684a help to create public form with has_one field 2011-06-03 02:25:19 +02:00
Mario Visic
8c62ec4dba Small refactoring on the snippet tag constructor. 2011-06-02 22:34:06 +08:00
Mario Visic
684b1ddf5c Nested snippets now update correctly, fixes #84 2011-06-02 21:56:05 +08:00
did
91119bf54e allow administrators to change the text displayed for each content in the back-office (documentation is coming) 2011-06-01 23:43:12 +02:00
Didier Lafforgue
028312bc9e Merge pull request #71 from onelaw/seo_metadata 
Adds support for page- and content instance-specific metadata.
 2011-05-16 14:28:20 -07:00
did
e429fbf7ca indentation + detect asset urls in a css file even if one long line (case: css generated by sass) 2011-04-30 01:58:15 +02:00
AJ Schuster
f65cd0b2fc Allows for page- and content instance-specific metadata. 
Falls back to site metadata when not specified.
 2011-04-29 16:10:13 -04:00
did
ea050afd5e use absolute urls for the pagination links + allow developers to access the http params within a liquid template + the with_scope handles category fields 2011-04-29 01:16:40 +02:00
Didier Lafforgue
5654924e0b Merged pull request #69 from JaimeAndres/liquid_markup. 
fixed problem with pagination url, it was creating a relative path instead
 2011-04-28 15:17:58 -07:00
did
537e222f79 code indentation (I am a little bit picky) 2011-04-27 17:04:33 +02:00
Jaime Andres
860b206b0a fixed problem with pagination url, it was creating a relative path instead of an absolute path 2011-04-19 00:33:54 -05:00
karlbright
57dff76d8e Added ability to set media attribute within stylesheet_tag 2011-04-11 15:22:41 +08:00
did
50f06a7b85 invalidate dynamic klass after an import + change the id of a link in the nav tag 2011-03-09 00:27:46 +01:00