did
|
fb0e87c64d
|
done (for now) with the my account screen
|
2011-12-02 01:43:49 +01:00 |
|
did
|
5d271239b7
|
the screen for editing site has been refactored
|
2011-11-29 14:58:19 +01:00 |
|
did
|
35012ca2b2
|
polishing the current site editing screen (wip)
|
2011-11-29 02:24:02 +01:00 |
|
did
|
71d48fe726
|
refactor the current site editing screen (screen)
|
2011-11-27 08:22:54 -08:00 |
|
did
|
47625dfa17
|
refactor code (wip) + fix bugs (wip) + tweak ui + save an existing page in ajax (HTML5 + FormData) + create a new page in ajax (wip)
|
2011-11-25 02:04:42 +01:00 |
|
did
|
b2a5e1de85
|
new file input behaviour (for now just on editable_file)
|
2011-11-21 03:12:06 -08:00 |
|
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
|
72c2cb2059
|
rename asset to content_asset + clean the locomotive_media plugin for tinyMCE (wip)
|
2011-11-19 15:47:56 +01:00 |
|
did
|
5ea81930b4
|
tinymce integration (wip) + polish the jquery dialog window (wip)
|
2011-11-19 00:20:37 +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
|
b383086242
|
wip
|
2011-11-06 12:18:34 +01: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
|
8979957d43
|
convert stylesheets in sass (wip) + fix the installation module + customize devise (wip)
|
2011-11-03 14:01:08 +01:00 |
|
did
|
851a255301
|
fixing assets (wip)
|
2011-11-01 01:58:44 +01:00 |
|
did
|
99e442673c
|
namespace controllers, models, ...etc (wip)
|
2011-10-31 00:02:41 +01:00 |
|
did
|
34cd6f464e
|
change database settings for this branch
|
2011-10-30 13:20:20 +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
|
786d2d9693
|
Added will paginate to liquid.
|
2011-10-24 23:44:35 +08: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 |
|
Sharagoz
|
a843f16be0
|
norwegian locale
|
2011-09-19 17:43:23 +02:00 |
|
Sharagoz
|
c6ab499664
|
added norwegian locale
|
2011-09-19 15:48:43 +02:00 |
|
Mario Visic
|
4c55401728
|
Merge pull request #209 from GarPit/master
Liquid syntax mistake
|
2011-09-16 19:02:03 -07:00 |
|
PitOn
|
6945bed820
|
liquid syntax translated mistake
|
2011-09-16 11:23:03 +04:00 |
|
Mario Visic
|
8dbd51734a
|
Visiting /edit when not authenticated now sends users to the login page.
|
2011-09-04 01:15:43 +08:00 |
|
did
|
6a2f0f17dd
|
complete the Russian version of the engine (#188): add the Russian flag + translate the Russian word in all the other locales
|
2011-08-31 23:43:52 +02:00 |
|
Didier Lafforgue
|
4a82935b46
|
Merge pull request #188 from GarPit/master
Russian translation
|
2011-08-31 14:21:47 -07:00 |
|
did
|
cd5f3b9712
|
a couple of Dutch translation keys were missing (issue #181)
|
2011-08-30 23:39:45 +02:00 |
|
GarPit
|
1e5e151be6
|
russian translation
|
2011-08-29 16:54:21 +04:00 |
|
PitOn
|
367b0aab4f
|
formtastic.ru.yml finished
|
2011-08-30 00:35:56 +04:00 |
|
PitOn
|
db5cb0950d
|
devise.ru.tml finished
|
2011-08-30 00:03:47 +04:00 |
|
PitOn
|
a1d976ace1
|
default.ru.yml finished
|
2011-08-29 23:52:42 +04:00 |
|
PitOn
|
a46019da40
|
admin_ui.ru.yml finished
|
2011-08-29 23:48:33 +04:00 |
|
PitOn
|
ef75d4acef
|
devise transaltions
|
2011-08-27 06:33:33 +04:00 |
|
PitOn
|
d9dafd2222
|
default.yml translations
|
2011-08-27 06:27:14 +04:00 |
|
PitOn
|
e8bea2844b
|
more translations
|
2011-08-27 00:45:25 +04:00 |
|
did
|
bb48552b51
|
Ruby MRI 1.9.3 Compatability Fixes
|
2011-08-25 23:28:56 +02:00 |
|
GarPit
|
75e6f2cd08
|
more translations
|
2011-08-17 18:28:49 +04:00 |
|
did
|
b3a8916565
|
upgrade to will_paginate 3.0 (issue #166)
|
2011-08-15 15:32:21 -07:00 |
|
did
|
4543e597ed
|
complete issue #162
|
2011-08-14 12:51:11 -07:00 |
|
Enrique García Cota
|
cab52f8f7b
|
added/corrected entries in admin_ui.es.yml
|
2011-08-12 14:13:44 +02:00 |
|
GarPit
|
09689a0cc9
|
initial ru translation
|
2011-08-12 15:32:37 +04:00 |
|
did
|
161878f57e
|
add information to set up carrierwave for local filesystems
|
2011-08-11 14:47:12 -07:00 |
|
Didier Lafforgue
|
7a4253a7e4
|
Merge pull request #152 from frisoft/master
Bugfix: import and italian localization update.
|
2011-08-11 14:00:48 -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 |
|
Andrea Frigido
|
3966c7bdae
|
Italian localization update.
|
2011-08-01 16:21:15 +02:00 |
|
did
|
6d66275def
|
merge pull request #148
|
2011-07-28 15:03:13 +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 |
|
did
|
d5111d2a4f
|
fix a minor bug about the contents menu + new devise_bushido_authenticatable gem
|
2011-07-26 21:38:27 +02:00 |
|