Christophe Vilayphiou a1e74987dc Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry ...

Conflicts:
	Gemfile.lock
	app/assets/javascripts/.DS_Store
	app/assets/stylesheets/style.css.erb
	app/views/layouts/_orbit_bar.html.erb

2012-06-29 16:10:29 +08:00

..

inc

clean up unless code

2012-05-22 14:59:54 +08:00

lib

Changes for dat and time format

2012-05-18 19:42:36 +08:00

ad_banner.js

fix js bugs,partial bugs

2012-02-06 16:17:07 +08:00

admin.js

Integration of pop-up and generic js.erb

2011-12-28 20:49:53 +08:00

ajax_form.js

image insertion completed..

2012-05-16 16:22:50 +08:00

application.js

Modify assets

2011-12-05 09:54:41 +08:00

attribute_form.js.erb

Merge with sub_roles

2011-12-23 18:34:21 +08:00

bootstrap.js

Ray's changes in announcenment back-end

2012-03-27 18:58:03 +08:00

bulletin_form.js.erb

DRY code for sorting

2012-04-30 06:30:52 +08:00

design.js

Modify assets

2011-12-05 09:54:41 +08:00

desktop.js

Timeline commit

2012-06-26 15:59:28 +08:00

desktopload.js.erb

Dock change and getting values from db

2012-04-06 17:49:22 +08:00

devise.js.erb

Changes for orbit bar, login

2012-02-19 16:33:22 +08:00

event.js

Ray's changes

2012-05-09 04:15:02 +08:00

html5.js

Changes for IE9 with html5

2012-03-21 15:51:55 +08:00

jquery.form.js

Integration of pop-up and generic js.erb

2011-12-28 20:49:53 +08:00

jquery.isotope.min.js

Add isotope, categories for announcement page, sort for announcement

2012-02-23 15:52:58 +08:00

jquery.miniColors.min.js

custom theme settings

2012-04-10 17:44:36 +08:00

jquery.tinyscrollbar.min.js

Ray's changes for structure and web_links

2012-04-27 11:02:56 +08:00

module.js.erb

Changes for widgets

2012-05-13 21:55:39 +08:00

new_admin.js

Put inc/ajax_setting in new_admin

2012-05-22 16:11:00 +08:00

news_bulletin_form.js

Add missing js

2012-04-30 08:32:54 +08:00

orbit_bar.js

Ray's changes

2012-05-04 19:11:28 +08:00

orbit-1.0.js

Ray's changes

2012-05-04 19:11:28 +08:00

orbit-bar-member.js

Ray's changes in tags, css and js

2012-04-02 02:55:36 +08:00

orbit-bar-search.js

Ray's changes

2012-05-04 19:11:28 +08:00

orbitdesktop.js

new page add and timeline changes

2012-06-28 17:31:48 +08:00

orbitdesktopAPI.js

timeline updates major ones..

2012-06-26 21:09:33 +08:00

orbitTimeline.js

new page add and timeline changes

2012-06-28 17:31:48 +08:00

page_edit.js.erb

JS changes to load drag and drop

2012-05-22 17:37:15 +08:00

plugin.js

Revert ff82391b7d0d17c17568ed21176b8b0112a34e31^..HEAD

2011-10-20 10:06:06 +08:00

rc.js

Ray's modification before redesign

2012-01-24 11:57:27 +08:00

rss.js

Ray's modification before redesign

2012-01-24 11:57:27 +08:00

side_bar_history.js

Changes for structure

2012-05-22 14:45:49 +08:00

site_editor.js

Add drag and drop to structure side_bar

2012-05-11 10:00:45 +08:00

sort_header.js

DRY code for sorting

2012-04-30 06:30:52 +08:00

tinymce_orbit.js.erb

image title and description callback fixed…

2012-05-17 20:19:31 +08:00

translation_page.js

Remove js from html

2011-12-05 10:36:25 +08:00

user_form.js

Merge with sub_roles

2011-12-23 18:34:21 +08:00