github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 33b3e5a600 stupid simple support for a granular permissions system based on a content types table. h@xx subdirectory-support John Bintz 2012-06-22 15:40:15 -0400
  • 60cb10c4ca tweak John Bintz 2012-06-20 15:18:49 -0400
  • 07e37d0521 mounted_on uses url_for John Bintz 2012-06-20 10:38:06 -0400
  • 07f868594a basic suport for subdirectories John Bintz 2012-06-20 10:28:10 -0400
  • c2cc991281 make routes friendlier for subdirectory sites subdirectory-friendly-routes John Bintz 2012-06-19 15:33:37 -0400
  • fbcda9cdd6 simply re-organize little piece of code (cleaning stuff) master Didier Lafforgue 2012-06-10 01:31:10 +0200
  • 6350652e4b Merge pull request #437 from paulsponagl/devise_2_1 Didier Lafforgue 2012-06-09 15:52:05 -0700
  • a6ba124a9e need to require devise-encryptable Paul Sponagl 2012-06-09 09:54:58 +0200
  • 702283322d Upgrade to devise 2.1 rspec and cucumber tests working untest within a real app Paul Sponagl 2012-06-08 12:52:00 +0200
  • ef66f88f5a forgot to update Gemfile.lock v2.0.0.rc8 Didier Lafforgue 2012-06-08 11:06:17 +0200
  • bae2fe4432 releasing new version: 2.0.0.rc8 Didier Lafforgue 2012-06-08 11:04:23 +0200
  • 50204b6556 dependency conflict with carrierwave and custom_fields (fixed) Didier Lafforgue 2012-06-08 10:57:09 +0200
  • 11c4f98efc asset picker was not accessible from the Aloha toolbar (fixed now) did 2012-06-06 01:34:37 -0700
  • 55b7d4dbf2 status of a redirect page is now 301 (previously 302) did 2012-06-05 09:32:10 -0700
  • 2bd9e254c8 rails 3.2.5 + remove warnings + fix broken features + enhance upgrade script Didier Lafforgue 2012-06-04 23:23:03 +0200
  • 3f1380408e fix issue #427 + make the content types API features more predictable did 2012-06-04 08:26:10 -0700
  • 5f9c46b42c Merge pull request #419 from colibri-software/api_auth Didier Lafforgue 2012-06-02 10:02:23 -0700
  • b4dd590f9a Merge pull request #432 from colibri-software/fix_page_drop Didier Lafforgue 2012-06-02 09:47:08 -0700
  • 34ba62c15c Merge pull request #431 from klaffenboeck/master Didier Lafforgue 2012-06-02 09:36:35 -0700
  • acd46f1c10 fix issue #430 did 2012-06-02 06:54:16 -0700
  • 30557ef8b0 updated german locale with propper encoding (UTF-8) Manfred Klaffenboeck 2012-06-01 19:36:33 +0200
  • 6f5eec18c6 Fixed issue with page drop slug on templatized pages Alex Sanford 2012-06-01 14:28:10 -0300
  • bc63cd8acf Merge pull request #429 from klaffenboeck/master Didier Lafforgue 2012-06-01 01:12:23 -0700
  • b993b4f0ca Updated german locale Manfred Klaffenboeck 2012-05-31 21:14:46 +0200
  • 590c4bb048 added translation for de.locomotive.messages.sending_form Manfred Klaffenboeck 2012-05-31 20:42:42 +0200
  • 2bec96e9f1 add a default message for the locomotive.messages.sending_form translation key (fix issue #428) did 2012-05-31 10:03:57 -0700
  • 2568510f01 fix issue #426 did 2012-05-31 09:41:37 -0700
  • f8725ede67 fix issue #414 did 2012-05-31 01:41:19 -0700
  • f4ee99b72b fix issue #425 did 2012-05-30 15:41:11 -0700
  • 763fe5215f fix issue #407 (ie: boolean fields take the false value by default) did 2012-05-30 15:30:42 -0700
  • 261575eb94 a little bit of cleaning for the upgrade scripts did 2012-05-29 16:24:28 -0700
  • b706d50bdf Merge pull request #424 from Sharagoz/master Didier Lafforgue 2012-05-29 16:21:54 -0700
  • 3a4654e8f7 the upgrade script v1.1 did not work correctly + fix issue #403 (more generally, enhance the way jQuery modals were used within the back-office) + select the first inverse_of value of a has_many field (UI) did 2012-05-29 15:53:48 -0700
  • a662366637 bug in prev commit Bjørn Trondsen 2012-05-29 22:34:38 +0200
  • 6ac3d72aed rename norwegian locale when upgrading Bjørn Trondsen 2012-05-29 22:13:41 +0200
  • 8b56ee5889 update norwegian locale Bjørn Trondsen 2012-05-29 20:35:21 +0200
  • b751e3d990 trying to fix the big problem with jQuery UI modals (if modals have the same z-index, it causes weird behaviours) (WIP) Didier Lafforgue 2012-05-29 01:26:51 +0200
  • ae16661286 trying to fix cucumber tests Didier Lafforgue 2012-05-26 15:21:47 +0200
  • da2d689bdc fix issue #412 Didier Lafforgue 2012-05-26 14:35:04 +0200
  • 2ac74c9a50 fix issue #411 Didier Lafforgue 2012-05-25 13:24:10 +0200
  • 24ae75c6f5 Gemfile.lock gets updated Didier Lafforgue 2012-05-24 23:37:48 +0200
  • c58075b7c3 Merge branch 'master' of github.com:locomotivecms/engine Didier Lafforgue 2012-05-24 19:19:57 +0200
  • 662e359acb fix issue #393 Didier Lafforgue 2012-05-24 19:19:46 +0200
  • 8be23f1cc2 Updated the readme a tad with PhantomJS info. Mario Visic 2012-05-25 00:23:13 +0800
  • fbef06f103 Merge branch 'poltergeist' Mario Visic 2012-05-25 00:16:33 +0800
  • 38098e93da Updated the doco to instruct users to install PhantomJS for testing. Mario Visic 2012-05-25 00:16:25 +0800
  • 3a27845fe5 Small fix for poltergeist. Mario Visic 2012-05-25 00:13:55 +0800
  • 4c5d6c92d0 Added poltergeist and a small JS fix. Mario Visic 2012-05-25 00:06:07 +0800
  • 817ee8b0e5 Merge branch 'master' of github.com:locomotivecms/engine Mario Visic 2012-05-24 23:13:56 +0800
  • 13b4d8c606 Do not pass the host option to URL helpers for sitemaps. Fixes #415. Mario Visic 2012-05-24 23:13:25 +0800
  • 6342b94ede Merge branch 'master' of github.com:locomotivecms/engine did 2012-05-24 06:47:15 -0700
  • d3e219018b fix issue #388 did 2012-05-24 06:46:48 -0700
  • 177f1e6c82 Merge pull request #416 from miskander/wildcards wildcards Mario Visic 2012-05-24 03:45:35 -0700
  • 415817e20b Merge pull request #409 from waynegerard/label_field_name Mario Visic 2012-05-24 03:35:30 -0700
  • 04d9fe17f8 Merge branch 'master' of github.com:locomotivecms/engine did 2012-05-23 15:03:37 -0700
  • d90123e321 public forms are now protected from csrf attacks (see issue #382 did 2012-05-23 15:03:21 -0700
  • 2fa81112fc Removing inline rescue in favor of where/try combination for label ID in setter method. Thanks @mariovisic\! waynegerard 2012-05-22 18:27:38 -0700
  • 02ea6913e3 Merge branch 'master' into wildcards Marko Iskander 2012-05-22 20:39:30 -0400
  • be26ae3059 Added a setter method for label_field_id in content_types.rb model. Should resolve issue where label_field_name was not being updated properly through the UI. Fix for issue #398. waynegerard 2012-05-19 13:51:41 -0700
  • 7e0fcb62ee Merge pull request #395 from willcosgrove/patch-1 Mario Visic 2012-05-08 20:49:23 -0700
  • c0627bf8a7 Fixed typo for bootstrap setting: data-toogle to data-toggle Will Cosgrove 2012-05-08 22:31:20 -0500
  • e225ad2278 fix issue #385 Didier Lafforgue 2012-05-07 00:31:59 +0200
  • a939629cbf new multi_json gem did 2012-05-05 02:39:23 -0700
  • f42fb1afe1 finally the new version of the multi_json gem (issue #387) Didier Lafforgue 2012-05-05 11:17:18 +0200
  • 03d13d92d0 fix issue #387 did 2012-05-04 03:35:07 -0700
  • 24e5eb855a Added auth feature for memberships Alex Sanford 2012-04-30 16:29:32 -0300
  • 9c15f1cbab Added API sites_controller and auth feature Alex Sanford 2012-04-27 14:52:09 -0300
  • 06e493477c Added auth feature for current site Alex Sanford 2012-04-27 12:05:21 -0300
  • 96007174cb Added auth feature for content_assets Alex Sanford 2012-04-26 16:14:23 -0300
  • a921c44ce9 Fixed access denied error checking step Alex Sanford 2012-04-26 16:10:40 -0300
  • 37f87e694c Added auth feature for theme assets Alex Sanford 2012-04-25 16:26:02 -0300
  • bf480a6df5 forgot to merge that file 2.1-dev Didier Lafforgue 2012-04-26 12:47:56 +0200
  • e5cb5d1f9a merge with master Didier Lafforgue 2012-04-26 12:46:31 +0200
  • a8646e7ef3 date picker was not correctly displayed in the popup form (has_many relationship) + previous form errors remained even within a fresh new popup Didier Lafforgue 2012-04-26 12:12:55 +0200
  • 3cad1b734e Merge pull request #384 from Ruxton/patch-1 1.0-stable Mario Visic 2012-04-26 01:08:17 -0700
  • 8067c93880 Fixes issue in public/javascripts/admin/tutorial.js - was matching on /admin/content_types/new when you have a model called news. Thanks to @karlbright Greg Tangey (Ruxton) 2012-04-26 16:06:05 +0800
  • f9a6155c19 content types can auto-reference them (in a many_to_many relationship for instance) Didier Lafforgue 2012-04-26 04:00:46 +0200
  • 23600edb1f performance improvements as described in #383 Didier Lafforgue 2012-04-26 03:39:23 +0200
  • 9613058b97 improve the upgrade script (wip) Didier Lafforgue 2012-04-25 19:09:46 +0200
  • 4e6c106772 Added auth feature for snippets Alex Sanford 2012-04-25 10:56:38 -0300
  • d2da4b659e Added auth feature for content entries Alex Sanford 2012-04-25 09:51:11 -0300
  • 44aadb8926 Added auth feature for content_types Alex Sanford 2012-04-24 15:40:54 -0300
  • 75e694a6f0 Cleaned up API features Alex Sanford 2012-04-24 13:36:25 -0300
  • 7dcc1ba3f6 Merge branch 'master' into api_auth Alex Sanford 2012-04-24 13:22:35 -0300
  • 1344463222 Cleaned up features Alex Sanford 2012-04-24 12:47:32 -0300
  • bf65fa47f3 Added destroy API method for pages and fixed feature Alex Sanford 2012-04-24 12:13:26 -0300
  • f53ab18f90 Added features for destroying pages Alex Sanford 2012-04-24 12:04:24 -0300
  • 0502cf3305 bump version to 2.0.0.rc7 v2.0.0.rc7 Didier Lafforgue 2012-04-23 01:04:06 +0200
  • 69c51fbe07 new aloha-rails gem (fixing a typo in a css when precompiling it) Didier Lafforgue 2012-04-23 01:03:21 +0200
  • b3902bb3d5 Merge branch 'master' of github.com:locomotivecms/engine Didier Lafforgue 2012-04-22 23:44:24 +0200
  • ce5576da09 the extends tag was not looking for the right fullpath (when localization is enabled) + sample in order to modify the tinyMCE settings in the back-office Didier Lafforgue 2012-04-22 23:25:18 +0200
  • 283a0d9be4 Merge pull request #378 from davide-malagoli/master Mario Visic 2012-04-22 03:15:05 -0700
  • 57b7cc1ef2 just a quick test to demonstrate the documentation was wrong (issue #377) Didier Lafforgue 2012-04-22 01:27:07 +0200
  • 08cf381bc3 simple media plugin for Aloha Didier Lafforgue 2012-04-22 01:14:25 +0200
  • 632e16b18e issue #321 (current_user) working. url_helpers removed. Annalisa 2012-04-21 11:06:13 +0200
  • 043b78a061 strange error Annalisa 2012-04-21 01:50:37 +0200
  • fc380e3e4d strange error Annalisa 2012-04-21 01:31:33 +0200
  • b87c76bc67 added current_user Annalisa 2012-04-21 00:54:54 +0200
  • d6059c2a9b fix issue #373 Didier Lafforgue 2012-04-20 15:42:10 +0200
  • fa6e62dd84 Merge branch 'master' of github.com:locomotivecms/engine Didier Lafforgue 2012-04-20 13:13:30 +0200