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
555ec86403
Timeline commit
2012-06-26 15:59:28 +08:00
7488341836
Commit for app window..
2012-05-25 15:41:07 +08:00
9ead6cafda
Ray's changes
2012-05-09 04:15:02 +08:00
ffcfda912e
Patch from ldap: Calendar sync done,need Ray's JS change
2012-05-08 20:44:17 +08:00
2083e0bf4f
widget structure improvised…
2012-05-07 19:00:50 +08:00
f427c3803f
clean up useless flash msgs. add i18n vars for app auth and object auth
2012-05-04 15:40:43 +08:00
05ded8de03
Fix for NCCU 0430 all functions ok with two submanagers but different behavors
2012-05-04 15:38:18 +08:00
d6cbbff9de
connection page working now..
2012-05-03 14:40:54 +08:00
769a67f026
the group more structured and also demo connecting with gmail account..
2012-04-30 21:17:20 +08:00
aacd9da9fb
auto login encryption done…
2012-04-30 14:29:42 +08:00
5aca3db95f
Ray's changes for structure and web_links
2012-04-27 11:02:56 +08:00
c158375d02
with connection and some save settings…
2012-04-26 21:30:13 +08:00
c2ac682787
updates for connections
2012-04-26 17:23:47 +08:00
64be61d61b
with gmail widget..
2012-04-26 14:47:49 +08:00
c3eef6eaa6
ok this is final hahaha…
2012-04-19 17:06:19 +08:00
95a1e266ae
Custom thème done and theme id done…
2012-04-17 21:15:40 +08:00
02c6933d0b
Tiles position saved in db and also change them from section manager
2012-04-17 16:33:41 +08:00
193cee2df7
new icons and widgets
2012-04-12 22:18:58 +08:00
67d1f7ad08
lots of change
2012-04-12 14:19:53 +08:00
5a6541a592
Setting page update
2012-04-11 17:26:25 +08:00
c55cd5c9bb
Last commit
2012-04-11 15:50:27 +08:00
68803c0c97
Lets see
2012-04-11 15:36:32 +08:00
4875b339f8
Fetching desktop from db
2012-04-11 15:31:10 +08:00
0219c3df28
various update
2012-04-11 15:04:00 +08:00
ee85380ab2
little update
2012-04-10 18:09:29 +08:00
360e5228b7
custom theme settings
2012-04-10 17:44:36 +08:00
35567c2139
Widgets Loading dynamically and semi structured
2012-04-06 23:48:03 +08:00
7309d9c446
Dock change and getting values from db
2012-04-06 17:49:22 +08:00
7f2f444dba
add icons
2012-04-06 17:47:04 +08:00
cd3e04c55c
add tinyscrollbar
2012-04-06 17:47:04 +08:00
2646c3fe33
update icons
2012-04-06 17:47:04 +08:00
79f005c88e
new icons
2012-04-06 17:47:03 +08:00
6158799a47
Stupid theme
2012-04-06 17:47:03 +08:00
6a30b0a1e4
Add RSS event
2012-02-28 18:29:13 +08:00
680b28023a
Fix ad_banner loading
2012-02-27 18:50:56 +08:00
cf038183b9
Ika's changes in modules
2012-02-20 08:48:27 +08:00
9cd3cbc478
Modifications for design, pages, page_parts…
...
Move orbit_bar out of kernel.js
2012-02-17 02:09:32 +08:00
5da75161c4
announcemenet & web_resource widget
2012-02-16 17:52:49 +08:00
55ae7de01c
Orbit-bar in front-end and back-end, side-bar and drop-down menu
2012-02-15 00:34:22 +08:00
8ef2d4b02e
include ad_banner query code. cleaned up parser
2012-02-15 00:34:21 +08:00
62aaf79491
Merge with sub_roles
2011-12-23 18:34:21 +08:00
26b49dcf02
Remove js from html
2011-12-05 10:36:25 +08:00
e99affbddd
Merge with Matt's code
2011-11-20 01:26:24 +08:00
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
f387139ae1
rails 3.1 and designs (with bug)
2011-07-12 16:00:57 +08:00
a695b9ad29
Items UI changes
2011-06-10 13:57:42 +08:00
2522cde2f5
Edition of page part for multiple languages.
2011-05-27 11:27:54 +08:00
0969f6b6cc
CKEditor.
...
The error came from some script in Application.js
2011-05-26 13:48:09 +08:00
964440fa86
Remove CKEditor due to conflicts with the jQuery library
2011-05-26 11:23:46 +08:00
Christophe Vilayphiou
Harry Bomrah
Christophe Vilayphiou
Matthew K. Fu JuYuan
devin
unknown
unknown
Matthew Kaito Juyuan Fu
Matthew Fu