 chris2tof
|
0edad4f8c0
|
New rss.js from Harry and fix html form for assets
|
2011-12-29 19:45:21 +08:00 |
|
|
chris2tof
|
7ebfe3a7f9
|
Add missing id in site_editor.html.erb and comment out in parser_back_end.rb because of a loading bug
|
2011-12-29 18:08:08 +08:00 |
|
|
chris2tof
|
d85f29e65c
|
Fix missing modification for "panel_main" to "back_main"
|
2011-12-29 17:49:48 +08:00 |
|
|
chris2tof
|
b298aef031
|
Delete tmp files
|
2011-12-29 17:41:20 +08:00 |
|
|
chris2tof
|
c1238a7043
|
Prefix ids with "back_" in back-end layout to avoid conflict with site's ids
|
2011-12-29 15:35:13 +08:00 |
|
|
chris2tof
|
ea19f11fe2
|
Integrate Harry's modifications to reload pop-up content
|
2011-12-29 14:09:06 +08:00 |
|
|
chris2tof
|
b002c411ce
|
Merge branch 'design_team'
|
2011-12-28 21:03:35 +08:00 |
|
|
chris2tof
|
a57dd62281
|
Merge branch 'js_pop_up'
|
2011-12-28 20:52:33 +08:00 |
|
|
chris2tof
|
090493fd51
|
Re-commit
|
2011-12-28 20:51:52 +08:00 |
|
|
chris2tof
|
245def9cb6
|
Integration of pop-up and generic js.erb
|
2011-12-28 20:49:53 +08:00 |
|
|
chris2tof
|
210a7fde48
|
Delete useless files
|
2011-12-28 15:11:07 +08:00 |
|
|
chris2tof
|
62aaf79491
|
Merge with sub_roles
|
2011-12-23 18:34:21 +08:00 |
|
|
chris2tof
|
b77282c643
|
Test redmine service-hook
|
2011-12-05 19:28:06 +08:00 |
|
|
chris2tof
|
4a56e78271
|
Change .rvmrc
|
2011-12-05 16:35:48 +08:00 |
|
|
chris2tof
|
227ca0d43a
|
Update gems
|
2011-12-05 16:29:22 +08:00 |
|
|
chris2tof
|
69a8fce64a
|
Fix double loading bug
On an html load, the page was reload by the js "popstate"
|
2011-12-05 11:22:32 +08:00 |
|
|
chris2tof
|
77842ab37d
|
Remove calendar
|
2011-12-05 10:44:10 +08:00 |
|
|
chris2tof
|
26b49dcf02
|
Remove js from html
|
2011-12-05 10:36:25 +08:00 |
|
|
chris2tof
|
962bf03af2
|
Remove snippet
|
2011-12-05 10:27:22 +08:00 |
|
|
chris2tof
|
f3f405c1b4
|
Remove useless files in items
|
2011-12-05 09:56:26 +08:00 |
|
|
chris2tof
|
75a3c4d5b1
|
Modify assets
Each layout has a manifest for css and js
|
2011-12-05 09:54:41 +08:00 |
|
|
chris2tof
|
a0ec38ca99
|
Merge with branch november_presentation
|
2011-12-01 13:50:49 +08:00 |
|
|
chris2tof
|
b68f5e11e5
|
Final modifications for the presentation
|
2011-11-22 18:54:10 +08:00 |
|
|
chris2tof
|
1fcacbb4af
|
Matt's code for NewBlog interface
|
2011-11-20 12:59:04 +08:00 |
|
|
chris2tof
|
66bc0ce560
|
Modified dev.rake
|
2011-11-20 03:16:35 +08:00 |
|
|
chris2tof
|
a03e9bada8
|
Add missing translations
|
2011-11-20 02:14:51 +08:00 |
|
|
chris2tof
|
c9137737e3
|
Resolve conflicts
|
2011-11-20 01:35:28 +08:00 |
|
|
chris2tof
|
e99affbddd
|
Merge with Matt's code
|
2011-11-20 01:26:24 +08:00 |
|
|
chris2tof
|
2754f49fe9
|
Missing code in parser for displaying image in the fornt-end
|
2011-11-19 23:11:49 +08:00 |
|
|
chris2tof
|
ad9f9bbf5c
|
Final Ray's modifications
|
2011-11-19 21:47:18 +08:00 |
|
|
chris2tof
|
dac6348402
|
Integration of module_app workflow
|
2011-11-19 14:33:26 +08:00 |
|
|
chris2tof
|
65349796d0
|
Ray's modifications
|
2011-11-18 16:43:14 +08:00 |
|
|
chris2tof
|
861237d65b
|
Integration of Ray' modifications
|
2011-11-17 20:02:58 +08:00 |
|
|
chris2tof
|
c4810274ec
|
Rescue nil values for attribute_values in User
|
2011-11-16 18:41:09 +08:00 |
|
|
chris2tof
|
bcf487f264
|
Merge branch 'november_presentation' of github.com:Rulingcom/orbit into november_presentation
|
2011-11-16 18:37:29 +08:00 |
|
|
chris2tof
|
0556dc9297
|
ika's modification to the backend
|
2011-11-16 18:34:54 +08:00 |
|
|
chris2tof
|
c1d77fa6d6
|
Changes for purchases - handle different type of purchases
|
2011-11-14 10:22:31 +08:00 |
|
|
chris2tof
|
d9d7099da6
|
Fix bug: users can now be saved
|
2011-11-12 17:54:45 +08:00 |
|
|
chris2tof
|
64c68fcdeb
|
Merge with new_blog
|
2011-10-18 11:36:01 +08:00 |
|
|
chris2tof
|
2e86d8081f
|
Modifications for images in html code
|
2011-10-18 11:21:24 +08:00 |
|
|
chris2tof
|
b9fdf5de04
|
Revert "please delete..."
This reverts commit dd5934c81e.
|
2011-10-13 15:45:02 +08:00 |
|
|
chris2tof
|
0ca354cfd0
|
Clean code and new image uploader
|
2011-09-14 15:11:50 +08:00 |
|
|
chris2tof
|
f2e3cb00db
|
Fix bug when editing a page, the theme wasn't including blank
|
2011-09-13 14:03:03 +08:00 |
|
|
chris2tof
|
4db88282a1
|
Modification in Design structure_css -> default_css
|
2011-09-13 11:57:20 +08:00 |
|
|
chris2tof
|
07ccacb7d7
|
Modifications of the JS in Design
|
2011-09-09 15:40:13 +08:00 |
|
|
chris2tof
|
77b8fcdd1d
|
Fix previous workaround for the uploaded Design
|
2011-09-09 13:44:43 +08:00 |
|
|
chris2tof
|
a571d1dcff
|
Clean code and workaround mongoid embedded with carrierwave
|
2011-09-08 18:12:04 +08:00 |
|
|
chris2tof
|
a1391493a3
|
Revert change in layout/admin.html.erb
|
2011-09-07 14:03:53 +08:00 |
|
|
chris2tof
|
0956e9784a
|
Fix bug in layout, parser and change lib/fraisier
|
2011-09-07 11:53:16 +08:00 |
|
|
chris2tof
|
4ce0bda00b
|
Fix links in the menu when in edit or normal render
|
2011-09-05 16:29:44 +08:00 |
|
|
chris2tof
|
22c9ca4c74
|
Handle "reset.css" and add link in the generated menu
|
2011-09-05 16:06:17 +08:00 |
|
|
chris2tof
|
151f005815
|
structure.css -> default.css
Themes are optional, a theme overrides style in default.css
|
2011-09-05 15:18:36 +08:00 |
|
|
chris2tof
|
f4b1d1e182
|
Modifications in Layout
In the layout file we can have "contents" (for editable content) and
"layout_parts" (for when the layout is created from scratch)
|
2011-09-05 01:14:49 +08:00 |
|
|
chris2tof
|
b2c0047d0f
|
Modification in parse_urls in both layout.rb and theme.rb
|
2011-09-02 19:19:34 +08:00 |
|
|
chris2tof
|
25355e9c7f
|
Force encoding and stip filename in Theme::parse_urls
|
2011-09-01 19:14:34 +08:00 |
|
|
chris2tof
|
9101a2921e
|
Modifications for image urls
Find and replace the urls by the file urls in DB, in the theme files and
layout.html file. Save a copy of those files under "file_orig".
|
2011-09-01 19:08:45 +08:00 |
|
|
chris2tof
|
f78400c274
|
Clean code
Moved the unzip_design method as protected
|
2011-09-01 19:06:49 +08:00 |
|
|
chris2tof
|
a570be1811
|
Skip callbacks
|
2011-09-01 18:28:04 +08:00 |
|
|
chris2tof
|
88397d2708
|
Modification of parser.rb for page rendering
|
2011-09-01 13:30:01 +08:00 |
|
|
chris2tof
|
492f691469
|
Modifications for menu in Design
|
2011-09-01 09:12:49 +08:00 |
|
|
chris2tof
|
98d6c3fa15
|
Fix blog module
|
2011-08-25 19:02:20 +08:00 |
|
|
chris2tof
|
294e06d630
|
Change "RulingSite" into "Orbit"
|
2011-08-25 17:59:49 +08:00 |
|
|
chris2tof
|
983c86e653
|
Merge branch 'rails_3_1' of github.com:Rulingcom/orbit into rails_3_1
|
2011-08-25 16:04:47 +08:00 |
|
|
chris2tof
|
f99321c279
|
production mode
|
2011-08-25 15:59:20 +08:00 |
|
|
chris2tof
|
8b576cac48
|
Fix bug when selecting theme
|
2011-08-25 15:44:52 +08:00 |
|
|
chris2tof
|
230842d26a
|
Ika fix bug
|
2011-08-25 15:44:51 +08:00 |
|
|
chris2tof
|
32849f1d1b
|
Set default design to first design
|
2011-08-25 15:08:42 +08:00 |
|
|
chris2tof
|
c248b729db
|
CSS problem for page
|
2011-08-25 15:08:23 +08:00 |
|
|
chris2tof
|
f898a29fdf
|
Add site link in menu
|
2011-08-25 08:56:01 +08:00 |
|
|
chris2tof
|
2afe961416
|
Modify check if site is up-to-date
|
2011-08-25 08:30:18 +08:00 |
|
|
chris2tof
|
4540f23a3f
|
Merge branch 'rails_3_1' of github.com:Rulingcom/orbit into rails_3_1
|
2011-08-25 08:18:22 +08:00 |
|
|
chris2tof
|
c427e2af14
|
Page form with drop down. Modifications for Designs
|
2011-08-25 08:13:38 +08:00 |
|
|
chris2tof
|
c678545160
|
Merge branch 'rails_3_1' of github.com:Rulingcom/orbit into rails_3_1
|
2011-08-25 08:08:09 +08:00 |
|
|
chris2tof
|
4cd9854706
|
Ika's changes
|
2011-08-25 08:07:18 +08:00 |
|
|
chris2tof
|
27d47215e9
|
Modify edit page. Still need to handle "form" with drop down lists
|
2011-08-24 02:34:24 +08:00 |
|
|
chris2tof
|
1d214bedec
|
Revert "Revert "Clean code and add 'name' in theme.rb""
This reverts commit 00813c9060.
|
2011-08-24 02:06:27 +08:00 |
|
|
chris2tof
|
00813c9060
|
Revert "Clean code and add 'name' in theme.rb"
This reverts commit 608180646b.
|
2011-08-24 02:04:54 +08:00 |
|
|
chris2tof
|
608180646b
|
Clean code and add 'name' in theme.rb
|
2011-08-24 01:39:28 +08:00 |
|
|
chris2tof
|
118455aa81
|
Check if site is up-to-date
|
2011-08-23 19:40:49 +08:00 |
|
|
chris2tof
|
090b1fdd7f
|
rails 3.1.rc4 -> rails 3.1.rc6
|
2011-08-23 19:04:45 +08:00 |
|
|
chris2tof
|
e0e14ddfac
|
Modify purchases list
|
2011-08-23 16:33:01 +08:00 |
|
|
chris2tof
|
09cdb9a852
|
CSS modifications for design team
|
2011-08-23 15:59:07 +08:00 |
|
|
chris2tof
|
2842001a3b
|
Update source: pull from git
|
2011-08-23 15:01:22 +08:00 |
|
|
chris2tof
|
4f38074932
|
content.css -> content.css.erb
|
2011-08-23 10:05:16 +08:00 |
|
|
chris2tof
|
2cdb5a756d
|
Set store_ip in config.yml
|
2011-08-22 14:01:51 +08:00 |
|
|
chris2tof
|
7a4ad240a8
|
Clean code for layout and modifications in dev.rake
|
2011-08-22 13:45:21 +08:00 |
|
|
chris2tof
|
e74f2931b1
|
Modifications asset pipeline
|
2011-08-20 22:54:07 +08:00 |
|
|
chris2tof
|
20afb23a5f
|
Embed layout_parts in layout and correct typo
|
2011-08-18 16:27:04 +08:00 |
|
|
chris2tof
|
86443661e9
|
Merge server and rails_3_1
|
2011-08-18 13:43:33 +08:00 |
|
|
chris2tof
|
278938a52d
|
Fixed: layout.file is saved when the design is created
|
2011-08-08 17:51:37 +08:00 |
|
|
chris2tof
|
9898bd9df7
|
Modification in JS to upload more than 2 files
|
2011-07-21 11:22:31 +08:00 |
|
|
chris2tof
|
c3ada90365
|
CarrierWave workaround: the files have to be saved manually
|
2011-07-14 08:48:42 +08:00 |
|
|
chris2tof
|
842dc9ee7a
|
Merge branch 'master' of https://github.com/Rulingcom/orbit
|
2011-06-14 15:20:58 +08:00 |
|
|
chris2tof
|
96a43f023e
|
Edit code (HTML response)
|
2011-06-10 15:02:34 +08:00 |
|
|
chris2tof
|
a695b9ad29
|
Items UI changes
|
2011-06-10 13:57:42 +08:00 |
|
|
chris2tof
|
247b8ec4dc
|
HTML code can be modify (paser: update)
|
2011-06-10 10:31:50 +08:00 |
|
|
chris2tof
|
dda4b30d67
|
Set editable parts
|
2011-06-01 15:49:55 +08:00 |
|
|
chris2tof
|
c7fc7084d5
|
Tag 'link'
|
2011-06-01 15:49:21 +08:00 |
|
|
chris2tof
|
7b5ea870a0
|
Delete page.
|
2011-06-01 12:00:41 +08:00 |
|
|
chris2tof
|
ddc7c74436
|
Create page.
|
2011-06-01 10:24:14 +08:00 |
|