Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge branch 'master' into rails4 | Uģis Ozols | 2014-01-20 | 10 | -53/+213 | |
| |\ | |/ |/| | | | | | | | Conflicts: app/helpers/refinery/blog/controller_helper.rb app/models/refinery/blog/post.rb | |||||
* | | Remove todo.md | Philip Arndt | 2013-12-09 | 1 | -5/+0 | |
| | | | | | | | | [ci skip] | |||||
* | | Merge pull request #363 from kenips/globalize_fix_master | Philip Arndt | 2013-12-07 | 1 | -1/+4 | |
|\ \ | | | | | | | Apply core globalize fix 2450. Fixes #361. | |||||
| * | | Apply core globalize fix 2450. Fixes #361. | Ken Ip | 2013-12-08 | 1 | -1/+4 | |
|/ / | ||||||
* | | Merge pull request #358 from snake66/fixup-nb-locale | Uģis Ozols | 2013-11-24 | 1 | -14/+154 | |
|\ \ | | | | | | | Update norwegian (nb) locale. | |||||
| * | | Update norwegian (nb) locale. | Harald Eilertsen | 2013-11-24 | 1 | -14/+154 | |
|/ / | ||||||
* | | Merge pull request #354 from jerefrer/patch-1 | Uģis Ozols | 2013-10-24 | 1 | -1/+1 | |
|\ \ | | | | | | | Fixes small french locale typo | |||||
| * | | Fixes small french locale typo | Jérémy FRERE | 2013-10-24 | 1 | -1/+1 | |
|/ / | ||||||
* | | Clarify license, authors, version requirement. | Philip Arndt | 2013-10-22 | 2 | -4/+5 | |
| | | ||||||
* | | Use expect syntax. | Uģis Ozols | 2013-10-18 | 1 | -3/+5 | |
| | | ||||||
* | | Merge pull request #352 from patrickdavey/restrict_tags_to_live_posts | Uģis Ozols | 2013-10-17 | 2 | -1/+26 | |
|\ \ | | | | | | | Restricting tags to live posts | |||||
| * | | Explicitly setting tag list in tests | Patrick Davey | 2013-10-18 | 1 | -2/+2 | |
| | | | ||||||
| * | | Restricting tags to live posts | Patrick Davey | 2013-10-17 | 2 | -1/+26 | |
| | | | ||||||
* | | | Don't set tag_list on the post factory - it's not a required attribute. | Uģis Ozols | 2013-10-17 | 2 | -3/+4 | |
|/ / | ||||||
| * | Supported Rails 4 and Refinery 3.0.0.dev | Philip Arndt | 2013-09-16 | 19 | -168/+188 | |
|/ | ||||||
* | Merge pull request #348 from gajeev/master | Uģis Ozols | 2013-09-07 | 1 | -6/+6 | |
|\ | | | | | scss fixes | |||||
| * | frontend scss edit | gajeev | 2013-09-05 | 1 | -14/+14 | |
| | | ||||||
| * | scss fixes | gajeev | 2013-09-05 | 1 | -17/+17 | |
|/ | ||||||
* | Use refinerycms-testing from the github repo to get latest ↵ | Uģis Ozols | 2013-09-04 | 1 | -1/+1 | |
| | | | | selenium-webdriver version. | |||||
* | Specify position for each page part when seeding db. | Uģis Ozols | 2013-09-04 | 1 | -2/+2 | |
| | | | | #318 | |||||
* | Use stable version of refinerycms-settings. | Uģis Ozols | 2013-09-04 | 1 | -1/+1 | |
| | ||||||
* | Merge pull request #345 from refinery/use_refinerycms-acts-as-indexed_for_search | Philip Arndt | 2013-08-11 | 8 | -60/+32 | |
|\ | | | | | Use refinerycms-acts-as-indexed for search functionality. | |||||
| * | Use select and map instead of pluck to make JRuby happy. | Uģis Ozols | 2013-08-12 | 1 | -1/+1 | |
| | | ||||||
| * | Use refinerycms-acts-as-indexed for search functionality. | Uģis Ozols | 2013-08-07 | 8 | -59/+31 | |
|/ | | | | | Also simplify index views for posts, categories and comments by removing redundant code. | |||||
* | Fix N+1 query in posts for associated authors. | Uģis Ozols | 2013-08-07 | 1 | -1/+1 | |
| | ||||||
* | Use proper gem versions/sources. | Uģis Ozols | 2013-08-07 | 1 | -2/+4 | |
| | ||||||
* | Merge pull request #344 from jurriaan/patch-1 | Uģis Ozols | 2013-08-06 | 1 | -0/+16 | |
|\ | | | | | Update nl.yml - forgot the activerecord part | |||||
| * | Update nl.yml - forgot the activerecord part | Jurriaan Pruis | 2013-08-06 | 1 | -0/+16 | |
| | | ||||||
* | | Merge pull request #343 from jurriaan/patch-1 | Uģis Ozols | 2013-08-06 | 1 | -2/+2 | |
|\| | | | | | Fix dutch locale | |||||
| * | Fix dutch locale | Jurriaan Pruis | 2013-08-06 | 1 | -2/+2 | |
|/ | ||||||
* | Remove jquery-rails from Gemfile because it gets required by Refinery::Core ↵ | Uģis Ozols | 2013-07-17 | 1 | -2/+0 | |
| | | | | engine. | |||||
* | Apply chnages recently made in main refinerycms repo. | Uģis Ozols | 2013-07-16 | 3 | -66/+28 | |
| | | | | | | * Remove notifier gems * Remove Guardfile * Add ability to specify additional gems when developing in .gemfile | |||||
* | Drop .dev from version. Delete version file and instead specify it directly ↵ | Uģis Ozols | 2013-07-16 | 2 | -24/+3 | |
| | | | | in gemspec. | |||||
* | Merge pull request #340 from refinery/css_refactor | Uģis Ozols | 2013-07-14 | 2 | -101/+112 | |
|\ | | | | | CSS Refactor | |||||
| * | Refactored CSS to SCSS. | Philip Arndt | 2013-07-15 | 2 | -101/+112 | |
|/ | ||||||
* | Specified git dependencies more cleanly. | Philip Arndt | 2013-07-15 | 1 | -4/+7 | |
| | ||||||
* | Fix longstanding typo filed_in -> filled_in | Philip Arndt | 2013-07-15 | 18 | -42/+42 | |
| | ||||||
* | Updated Travis CI configuration. | Philip Arndt | 2013-07-15 | 1 | -7/+2 | |
| | ||||||
* | Merge pull request #339 from ↵ | Uģis Ozols | 2013-07-13 | 13 | -47/+117 | |
|\ | | | | | | | | | refinery/revert_f906ef024ee39c31148edb49c6511f007735ce5a Revert f906ef0 but maintain table name improvements | |||||
| * | Use proper namespace for Refinery::Blog::Categorization. | Uģis Ozols | 2013-07-13 | 1 | -4/+4 | |
| | | ||||||
| * | Revert f906ef0 but maintain table name improvements | Philip Arndt | 2013-07-14 | 13 | -47/+117 | |
|/ | ||||||
* | Cast user_class as string inside the initializer template. | Philip Arndt | 2013-07-14 | 1 | -1/+1 | |
| | ||||||
* | Merge pull request #338 from snowsunny/master | Uģis Ozols | 2013-07-12 | 1 | -1/+14 | |
|\ | | | | | Added missing japanese translations | |||||
| * | added missing japanese translations | snowsunny | 2013-07-12 | 1 | -1/+14 | |
|/ | ||||||
* | Remove view which is not used. | Uģis Ozols | 2013-07-01 | 1 | -0/+0 | |
| | | | | | Was added in 46877fbc5335fc60b96b218cbfd787387bf7d94e probably by mistake. | |||||
* | Update specs due to recent Capybara/FactoryGirl upgrade. | Uģis Ozols | 2013-06-27 | 10 | -57/+62 | |
| | ||||||
* | Need to call html_safe on unsafe string before concatenating it to safe string. | Uģis Ozols | 2013-06-21 | 1 | -6/+6 | |
| | | | | | | | | Read explanation at https://github.com/refinery/refinerycms-blog/issues/325#issuecomment-198 07945. Closes #325. | |||||
* | Move down "Additional Features" section in readme. | Uģis Ozols | 2013-06-21 | 1 | -5/+5 | |
| | ||||||
* | Tiny code comment changes. | Uģis Ozols | 2013-06-17 | 2 | -4/+3 | |
| | ||||||
* | Merge pull request #333 from dougbradbury/master | Uģis Ozols | 2013-06-17 | 3 | -2/+35 | |
|\ | | | | | Limit rss feed length with query param |