Harry Bomrah
|
4875b339f8
|
Fetching desktop from db
|
2012-04-11 15:31:10 +08:00 |
|
Harry Bomrah
|
f807cd026d
|
app section modified…
|
2012-04-09 17:40:03 +08:00 |
|
Harry Bomrah
|
35567c2139
|
Widgets Loading dynamically and semi structured
|
2012-04-06 23:48:03 +08:00 |
|
Harry Bomrah
|
bb2375b15e
|
Temp Commit
|
2012-04-06 19:05:11 +08:00 |
Christophe Vilayphiou
|
f65bb9b323
|
Merge branch 'master' into desktop_harry
Conflicts:
app/assets/stylesheets/style.css.erb
|
2012-04-06 19:02:39 +08:00 |
Christophe Vilayphiou
|
253f4bcb54
|
Ray's changes for orbit bar
|
2012-04-06 18:06:57 +08:00 |
|
Harry Bomrah
|
e1ef2b28e7
|
theme changes
|
2012-04-06 17:49:22 +08:00 |
|
Harry Bomrah
|
7309d9c446
|
Dock change and getting values from db
|
2012-04-06 17:49:22 +08:00 |
|
Harry Bomrah
|
b2c9229099
|
route fixed.
|
2012-04-06 17:47:04 +08:00 |
|
Harry Bomrah
|
3acd8a86c7
|
commit temp
|
2012-04-06 17:47:04 +08:00 |
devin
|
cd3e04c55c
|
add tinyscrollbar
|
2012-04-06 17:47:04 +08:00 |
|
devin
|
293e084bea
|
dock effect
|
2012-04-06 17:47:04 +08:00 |
|
Harry Bomrah
|
f5c080efd4
|
Model commit
|
2012-04-06 17:47:04 +08:00 |
unknown
|
79f005c88e
|
new icons
|
2012-04-06 17:47:03 +08:00 |
|
Harry Bomrah
|
58b51f0d17
|
Themes fixed…
|
2012-04-06 17:47:03 +08:00 |
|
Harry Bomrah
|
ddf6a606a2
|
with notifications and other changes
|
2012-04-06 17:47:03 +08:00 |
|
Harry Bomrah
|
6158799a47
|
Stupid theme
|
2012-04-06 17:47:03 +08:00 |
|
Harry Bomrah
|
77b2919d8c
|
Desktop Commit
|
2012-04-06 17:47:02 +08:00 |
|
Harry Bomrah
|
da7b415ad8
|
Desktop commit
|
2012-04-06 17:47:01 +08:00 |
Matthew K. Fu JuYuan
|
01bda515a6
|
fact_check with Ray's permission check.
needs Ray's new css
|
2012-04-05 17:41:43 +08:00 |
|
Christophe Vilayphiou
|
ef8eb0450b
|
Changes in tinymce bar
|
2012-04-05 17:28:21 +08:00 |
unknown
|
d45725cf3b
|
fix announcement & add lang tab
|
2012-04-05 15:23:20 +08:00 |
|
Christophe Vilayphiou
|
1259d62249
|
Fix mainTablePosition in js -> remove the notable class
|
2012-04-05 14:55:41 +08:00 |
|
Matthew K. Fu JuYuan
|
8f28d45379
|
The new AdBanner.
|
2012-04-02 03:04:38 +08:00 |
|
Christophe Vilayphiou
|
503f71e554
|
Ray's changes in tags, css and js
|
2012-04-02 02:55:36 +08:00 |
|
Christophe Vilayphiou
|
6c50aa5243
|
Add pagination to bulletin index and remove ajax to make it simple
|
2012-04-02 02:55:36 +08:00 |
|
Christophe Vilayphiou
|
d6e4da6dad
|
Ray's fix for margin-top
|
2012-03-28 11:31:07 +08:00 |
|
Christophe Vilayphiou
|
55d12e50f2
|
Ray's changes in announcenment back-end
|
2012-03-27 18:58:03 +08:00 |
|
Christophe Vilayphiou
|
f9c5ee5d18
|
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
Conflicts:
app/assets/javascripts/bulletin_form.js.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
vendor/built_in_modules/announcement/config/routes.rb
|
2012-03-27 18:37:14 +08:00 |
|
unknown
|
e8d1352890
|
fix announcement
|
2012-03-27 14:29:11 +08:00 |
|
unknown
|
a30bc499c7
|
fix announcement & links
|
2012-03-27 14:19:58 +08:00 |
|
unknown
|
42519d9f78
|
fix announcement & links
|
2012-03-23 18:04:11 +08:00 |
|
Christophe Vilayphiou
|
61698f3f2c
|
Remove quick_edit on bulletin index load
|
2012-03-23 17:32:59 +08:00 |
|
Christophe Vilayphiou
|
472744fc87
|
Changes for IE9 with html5
|
2012-03-21 15:51:55 +08:00 |
|
Christophe Vilayphiou
|
3aa7c5120d
|
Put tinymce in its own js file.
To use on a text area just add the class "tinymce_textarea".
|
2012-03-21 12:41:32 +08:00 |
|
unknown
|
a755eb184b
|
fix announcement links & files
|
2012-03-16 16:49:25 +08:00 |
|
unknown
|
7d553acaec
|
fix announcement link & files
|
2012-03-16 15:53:57 +08:00 |
|
Christophe Vilayphiou
|
07edf44643
|
Merge branches 'design_team' and 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-03-16 15:13:06 +08:00 |
|
Christophe Vilayphiou
|
29ec36130e
|
css and js changes
|
2012-03-16 15:06:45 +08:00 |
|
unknown
|
6f6e84b015
|
fix dashboard & announcement
|
2012-03-16 14:44:57 +08:00 |
|
unknown
|
00ab773942
|
fix dashboard & announcement
|
2012-03-14 20:05:03 +08:00 |
|
Christophe Vilayphiou
|
6b2aeadde6
|
Changes for nccu
|
2012-02-29 16:01:50 +08:00 |
|
Christophe Vilayphiou
|
5223a7a3e9
|
Css and js changes
|
2012-02-29 12:45:47 +08:00 |
|
Christophe Vilayphiou
|
9aa4173933
|
Change orbit-bar for language but bug when user name is too long
|
2012-02-29 04:21:56 +08:00 |
|
Christophe Vilayphiou
|
6a30b0a1e4
|
Add RSS event
|
2012-02-28 18:29:13 +08:00 |
|
Christophe Vilayphiou
|
f13ebc6c46
|
Fix bugs and changes for nccu
|
2012-02-27 18:50:56 +08:00 |
|
Christophe Vilayphiou
|
f8d1d7242d
|
Merge branch 'design_team' into dashboard
|
2012-02-23 16:05:33 +08:00 |
|
Christophe Vilayphiou
|
1a6e497b3d
|
Ika's changes
|
2012-02-23 15:53:15 +08:00 |
|
Christophe Vilayphiou
|
63d7810b35
|
Add isotope, categories for announcement page, sort for announcement
|
2012-02-23 15:52:58 +08:00 |
|
Christophe Vilayphiou
|
22d9741ac8
|
Fix for orbit_bar
|
2012-02-23 15:51:33 +08:00 |