did
|
9130544516
|
refactoring the creation of custom contents
|
2011-12-22 14:28:12 -08:00 |
did
|
d1bb45d7c8
|
polishing the UI for the content types, refactoring still in progress
|
2011-12-22 01:31:33 +01:00 |
|
did
|
00283993c0
|
minimal version of the new UI for content types
|
2011-12-21 15:24:39 +01:00 |
|
did
|
217000042a
|
refactoring the content types section (wip)
|
2011-12-19 14:15:11 +01:00 |
|
did
|
a25009824c
|
fix some bugs + refactor look and feel of the import screens (wip)
|
2011-12-08 07:47:17 -08:00 |
|
did
|
b60b1378f8
|
no more flash uploader only HTML5 goodness
|
2011-12-07 07:10:21 -08:00 |
Mario Visic
|
39ac60fffe
|
Merge branch 'master' into rails_3_1
Conflicts:
Gemfile
|
2011-11-27 21:42:58 +11:00 |
|
Mario Visic
|
867878a4f4
|
Test on ruby 1.9.3, removed the require for ruby-debug19 as it breaks on 1.9.3
|
2011-11-27 21:21:27 +11: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
|
9b049aa055
|
Bumped delayed job versions, fixes #249.
|
2011-11-27 19:44:06 +11:00 |
|
Mario Visic
|
9f1ce08136
|
Specs are now all running, 190 failures.
|
2011-11-26 16:33:57 +11:00 |
|
Mario Visic
|
1d1137fa36
|
Bumped the rails 3.1.3
|
2011-11-26 15:57:22 +11:00 |
|
did
|
b2a5e1de85
|
new file input behaviour (for now just on editable_file)
|
2011-11-21 03:12:06 -08:00 |
|
Mario Visic
|
a97978468f
|
Use a later custom fields version.
|
2011-11-20 21:52:22 +11:00 |
|
Mario Visic
|
51c0397531
|
Removed spork to get spec helper working. Will readd later if required.
|
2011-11-20 21:39:46 +11:00 |
|
Mario Visic
|
769cf7548c
|
Updated gemfile with kaminari again.
|
2011-11-20 21:36:10 +11:00 |
|
Mario Visic
|
e6c1d6e94e
|
changes to the gemfile to remove local gem dependencies.
|
2011-11-20 21:18:42 +11:00 |
|
did
|
5ea81930b4
|
tinymce integration (wip) + polish the jquery dialog window (wip)
|
2011-11-19 00:20:37 +01:00 |
|
did
|
2c18f401bb
|
adding the last refactored features on the pages section (wip) + clean code
|
2011-11-16 01:39:16 +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
|
fee5a5e98e
|
custom_fields from git
|
2011-11-08 01:29:12 +01:00 |
|
did
|
9169cb386e
|
waiting for the new devise gem (coming probably this week)
|
2011-11-08 00:16:23 +01:00 |
|
did
|
b383086242
|
wip
|
2011-11-06 12:18:34 +01:00 |
|
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
|
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
|
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
|
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
|
fcac15c6b1
|
Fixed a failing cucumber scenario, bumped cucumber-rails.
|
2011-10-18 23:55:21 +08:00 |
|
Mario Visic
|
dd118a7147
|
Only use autotest with MRI (doesnt work on rbx).
|
2011-10-16 13:21:12 +08:00 |
|
did
|
544e9e5c3c
|
fix issue #225 (bson_ext version)
|
2011-09-28 11:57:48 +02:00 |
|
did
|
13b82e66fe
|
fix httparty version to 0.7.8
|
2011-09-15 16:59:14 +02:00 |
|
Mario Visic
|
eb2d25e2f9
|
Ruby 1.9 require the correct debug.
|
2011-09-01 19:28:46 +08: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
|
d0566f917e
|
fix issue #179
|
2011-08-25 14:58:49 +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 |
|
Didier Lafforgue
|
b4bfea616a
|
Merge pull request #158 from colibri-software/add_admin_user
Added rake task to create new admin user
|
2011-08-14 12:27:03 -07:00 |
|
did
|
408ff098ba
|
Set up specs to use spork for faster test runs (#157)
|
2011-08-14 12:16:59 -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 |
Alex Sanford
|
c225a8d394
|
Added rake task to create new admin user
|
2011-08-04 13:19:39 -03:00 |
Sean Grove
|
2320aa6fb1
|
Bump to bushidogem 0.0.35
|
2011-07-27 10:59:32 -07:00 |
|
Sean Grove
|
2f2f410312
|
Bump the bushido gem version to 0.0.34
|
2011-07-26 17:26:49 -07:00 |
|
did
|
8a58a0cad1
|
using the last bushido gem (0.0.31)
|
2011-07-26 23:36:36 +02:00 |
|
did
|
abbc151ed2
|
new factory_girl gem + fix the require pb with the devise_bushido_authenticatable gem
|
2011-07-26 23:11:43 +02:00 |