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

128 Commits

Author SHA1 Message Date
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
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
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
Mario Visic
85cabafe67 Merge pull request #218 from corgibytes/ensure_rails_3_0 
Rails 3.1 is getting used as a dependency when installing as a gem
 2011-10-01 08:52:01 -07:00
did
544e9e5c3c fix issue #225 (bson_ext version) 2011-09-28 11:57:48 +02:00
M. Scott Ford
c18dfa035e Prevent rails 3.1 from getting pulled in as a dependency. 2011-09-25 21:03:50 -04:00
Sharagoz
2b474626b6 add crack to gemspec 2011-09-19 16:28:21 +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
0e3d601ea9 fix xss vulnerability issue (#170) 2011-08-18 16:06:34 +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
did
67d7b13f4f Add the reverse has_many field feature (mainly based on pull request #142) 2011-08-11 13:45:46 -07: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
4f7312a659 CAS feature + Cells 2011-07-25 23:07:32 +02:00
did
8956145da7 use carrierwave instead of locomotive_carrierwave now (engine) 2011-07-13 21:29:39 +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
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
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
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
afe07d4976 update gemspec with the last version of locomotive carrierwave 2011-06-12 16:38:11 +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
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
8ad6ee580e fix issue #78 2011-05-24 12:23:05 -07:00
did
e8cdfc4794 new version of custom fields + display error messages for has_one and has_many field types 2011-05-20 15:27:07 +02:00
did
9b4f9064f3 bump versions 2011-05-17 01:03:35 +02:00
did
7dfce2c336 migration to mongoid 2.0.1 2011-05-16 23:06:46 +02:00
did
6dd810b44e new custom_fields gem version as well as an heroku patch to fix the weird issue about json/heroku 2011-05-01 00:28:25 +02:00
did
49c451ea54 small typo in the index page of the content types + merge Gemfile as well as the gemspec 2011-04-28 01:03:01 +02:00
did
483dfc350b merging sgrove-master into master 2011-04-27 16:09:21 +02:00
Keith Pitt
ee1dfc1e9e Upgraded to latest version of rails 2011-04-07 13:07:50 +08:00
Keith Pitt
8c3a799e9f Version of mongo requires bson_ext version >= 1.3.0 2011-04-07 12:46:51 +08:00
did
9dedde8b07 trying to remove json warning + new heroku gem version 2011-04-06 00:31:56 +02:00
did
ec1b0fea3a fix bson_ext issue (new version of mongo) + add the bushido gem 2011-04-05 23:49:17 +02:00
dinedine
a2d4e825b5 mongoid 2.0 not compatible with custom_fields, back to rc.7 2011-04-04 02:08:57 +02:00
dinedine
c0a5a4b443 single site / multi sites option in progress + integrating bushi.do + revert back to mongoid rc.7 2011-04-04 01:59:41 +02:00
did
ce5f0de165 new version of the custom fields gem 2011-03-22 20:51:10 +01:00
did
affdde0187 new custom fields gem version 2011-03-21 10:11:50 +01:00
did
ebf183c6f6 back to heroku 1.18.2 2011-03-10 09:32:34 +01:00
did
8f43ef401a updates on heroku servers should fix the issue with the heroku gem (http://goo.gl/PIxZe) 2011-03-10 09:19:25 +01:00
did
63530a3a30 still a problem with the last heroku gem (json) + fix an issue with invalid assets 2011-03-10 02:59:35 +01:00
did
8456033269 upgrade heroku gem 2011-03-10 02:40:25 +01:00
did
78715ddf1e fix issue #48 2011-03-08 16:39:14 +01:00
did
e4b34eac3f patch mongoid to enable the limit option for embedded collections + ui widget to allow more than 5 custom models in the content section 2011-03-08 16:05:07 +01:00
did
865c811d0b upgrade the gemspec file (new carrierwave and custom_fields gems 2011-03-06 22:09:24 +01:00
did
94be90986d merge Dirk's branch + upgrade a lot of gems (rails, ...etc) 2011-02-12 15:00:57 +01:00
dinedine
6ac4ff0393 revert a piece of the theme assets refactoring + upgrade Gemfile as well as the gemspec 2011-02-04 11:18:34 +01:00
Keith Pitt
124bacba6b Let bundler decide the best version to use 2011-02-04 16:29:12 +08:00
Keith Pitt
a6872b60ef Upgrade fog 2011-02-04 16:26:52 +08:00
Keith Pitt
cad4471995 Use an old version of fog that carrierwave supports 2011-02-04 14:41:51 +08:00
Keith Pitt
8f73d214ad Don't require delayed_job_mongoid in gemspec 2011-02-04 14:39:46 +08:00
dinedine
c9e1e3278b forgot to update the gemspec file 2011-01-27 19:00:20 +01:00
dinedine
56059b6579 gems dependency with mongoid was messy 2011-01-27 15:34:33 +01:00
dinedine
69c9dbbbcf new Gemfile + fixing broken tests + improve the way we fetch the sicurrent te when serving fonts 2011-01-26 14:07:33 +01:00
dinedine
415ce9fb82 bson_ext is now in 1.2.0 + add lastmod for the sitemap xml + fix issue #19 2011-01-21 12:04:59 +01:00
dinedine
2f478a86fd cleaning 2011-01-03 23:53:25 +01:00
dinedine
727a824745 prepare locomotive as a gem 2010-12-16 13:39:05 +01:00
dinedine
cc0b50e22e add rspec tests for the import module + debug the cms to handle correctly the default theme 2010-10-29 01:36:45 +02:00
dinedine
b4d3aae46f order assets when used in liquid templates 2010-10-19 16:56:50 +02:00
dinedine
344a737b9a clean code + fix gem requirements for the engine version of this app 2010-10-17 03:18:41 +02:00
dinedine
a03dd77a65 update gem dependencies + gemspec + liquid tags (stylesheet_tag, ...etc) work with amazon S3 2010-10-16 11:27:26 +02:00
dinedine
acaf997b6e build locomotive engine as a gem 2010-10-15 02:05:21 +02:00
Jacques Crocker
350aee82a8 Vendoring mongo_session_store so we have one less dependency 2010-09-28 02:19:55 -07:00
Jacques Crocker
3d42e87da6 revert carrierwave 2010-09-28 01:30:31 -07:00
Jacques Crocker
ea4c09c7ce Updating dependencies, removing jeweler, and cleaning up gemspec 2010-09-27 23:04:40 -07:00
Jacques Crocker
8a17394223 Updating to the latest Mongoid association syntax 
has_many_related => references_many
belongs_to_related => referenced_in
 2010-07-30 19:15:24 -07:00
dinedine
0304565f30 accept font assets in theme 2010-07-17 22:51:52 +02:00
dinedine
50c578b138 if 404 page is not published, go to root site 2010-07-16 23:28:44 +02:00
dinedine
0be89c253d action_mailer_request plugin was not called when Locomotive was used as an engine [fixed] 2010-07-15 13:10:00 +02:00
dinedine
486f86f366 add gemspec 2010-07-14 01:49:55 +02:00