Commit Graph

253 Commits

Author SHA1 Message Date
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
Christophe Vilayphiou 75c9851dbc Ray's back-end modifications for sub-roles 2011-12-28 20:57:18 +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
Christophe Vilayphiou fc591ee308 Ray's back_end modification before sub_roles 2011-12-23 18:02:45 +08:00
Christophe Vilayphiou f774084e9a Back-end standardization 2011-12-10 18:03:32 +08:00
chris2tof b77282c643 Test redmine service-hook 2011-12-05 19:28:06 +08:00
Christophe Vilayphiou c0fbb999e7 Modification of Gemfile for linux 2011-12-05 19:19:05 +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
Matthew Fu e4dc5bd107 App block is working with full design now 2011-11-20 00:03:02 +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
Matthew Fu e594242dba Revert "Update NewBlog package with screenshots"
This reverts commit bcd5564c31.
2011-11-18 10:27:25 +08:00
Matthew Fu bcd5564c31 Update NewBlog package with screenshots 2011-11-18 09:56:20 +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
Matthew Fu 5c3ae104f0 Add log info for asking restart after app module installed 2011-11-16 17:01:44 +08:00
Matthew Fu 84ebc8306b APP zip package placed in lib now can be unzip into vendor
APP zip package placed in lib now can be unzip into vendor,however
server can not restart
2011-11-16 15:21:31 +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
Matthew Kaito Juyuan Fu 0a6efeb0a2 put dymanic loading related kernel code and query kernel code into public/static
put dymanic loading related kernel code and query kernel code into
public/static.
everything in JS need be loaded at frontend from ruling com should be
placed here.
2011-10-21 14:11:41 +08:00
Matthew Kaito Juyuan Fu a0f1220b63 changed filename for complete asset pipeline 2011-10-21 10:38:51 +08:00
Matthew Kaito Juyuan Fu d47db8e395 Remove production.css 2011-10-20 17:19:35 +08:00
Matthew Kaito Juyuan Fu 0e252cf93c APP fronted showing 2011-10-20 15:29:54 +08:00