Joshua Milton 6b9926539d Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua ...

Conflicts:
	app/assets/javascripts/orbitdesktop.js
	app/controllers/desktop_publications_controller.rb
	config/routes.rb

2012-07-04 18:31:00 +08:00

..

inc

add pic and js for permission checkbox and filter

2012-04-12 07:14:06 +08:00

lib

The new AdBanner.

2012-04-02 03:04:38 +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

Integration of pop-up and generic js.erb

2011-12-28 20:49:53 +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

Filter and delete for bulletins

2012-04-12 06:50:36 +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

Add RSS event

2012-02-28 18:29:13 +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

Orbit-bar in front-end and back-end, side-bar and drop-down menu

2012-02-15 00:34:22 +08:00

new_admin.js

Change filter to js with history for bulletins

2012-04-07 00:20:52 +08:00

orbit_bar.js

Changes for orbit bar, login

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

orbit-1.0.js

Ray's fix for announcement list

2012-04-12 18:41:14 +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 for orbit bar

2012-04-06 18:06:57 +08:00

orbitdesktop.js

Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua

2012-07-04 18:31:00 +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

Add isotope, categories for announcement page, sort for announcement

2012-02-23 15:52:58 +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

Comment out code that bugged upload image in ad_banner

2012-04-13 15:53:25 +08:00

site_editor.js

Fix bugs and changes for nccu

2012-02-27 18:50:56 +08:00

tinymce_orbit.js

Changes in tinymce bar

2012-04-05 17:28:21 +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