Harry Bomrah
|
d92451d079
|
alert removed
|
2012-04-13 17:05:47 +08:00 |
|
Harry Bomrah
|
7479a64c95
|
width changes in section page
|
2012-04-13 17:01:11 +08:00 |
Christophe Vilayphiou
|
957d4eaebb
|
Merge branch 'master' into desktop_harry
|
2012-04-13 16:03:43 +08:00 |
|
Christophe Vilayphiou
|
ca0fc4c767
|
Comment out code that bugged upload image in ad_banner
|
2012-04-13 15:53:25 +08:00 |
|
Christophe Vilayphiou
|
f54dba8b0b
|
Merge branch 'master' into desktop_harry
|
2012-04-13 13:39:00 +08:00 |
|
Harry Bomrah
|
64a9579b92
|
final on 13 april 00:00
|
2012-04-13 00:00:24 +08:00 |
|
Harry Bomrah
|
193cee2df7
|
new icons and widgets
|
2012-04-12 22:18:58 +08:00 |
Christophe Vilayphiou
|
f8873267a2
|
Ray's fix for announcement list
|
2012-04-12 18:41:14 +08:00 |
|
Harry Bomrah
|
92427e8831
|
section page done…
|
2012-04-12 16:25:06 +08:00 |
|
Harry Bomrah
|
7b423877bf
|
new updates
|
2012-04-12 14:50:45 +08:00 |
|
Harry Bomrah
|
48323ac1af
|
lot of changes in fetching
|
2012-04-12 14:44:08 +08:00 |
devin
|
67d1f7ad08
|
lots of change
|
2012-04-12 14:19:53 +08:00 |
Matthew K. Fu JuYuan
|
83b4443910
|
add pic and js for permission checkbox and filter
|
2012-04-12 07:14:06 +08:00 |
|
Matthew K. Fu JuYuan
|
57402b8602
|
add permission-checkbox js
|
2012-04-12 07:14:06 +08:00 |
|
Matthew K. Fu JuYuan
|
e4c41ab54c
|
A filter UI for permission select. with Harry's JS
|
2012-04-12 07:14:06 +08:00 |
|
Christophe Vilayphiou
|
486845460c
|
Filter and delete for bulletins
|
2012-04-12 06:50:36 +08:00 |
|
Harry Bomrah
|
25ca29403c
|
section page added
|
2012-04-11 17:58:52 +08:00 |
|
Harry Bomrah
|
5a6541a592
|
Setting page update
|
2012-04-11 17:26:25 +08:00 |
|
Harry Bomrah
|
c55cd5c9bb
|
Last commit
|
2012-04-11 15:50:27 +08:00 |
|
Harry Bomrah
|
68803c0c97
|
Lets see
|
2012-04-11 15:36:32 +08:00 |
|
Harry Bomrah
|
edf6089e0c
|
Devin complete
|
2012-04-11 15:34:19 +08:00 |
|
Harry Bomrah
|
4875b339f8
|
Fetching desktop from db
|
2012-04-11 15:31:10 +08:00 |
|
devin
|
1fabe3d8f7
|
theme setting update
|
2012-04-11 15:22:05 +08:00 |
|
devin
|
0219c3df28
|
various update
|
2012-04-11 15:04:00 +08:00 |
|
devin
|
42f45aa137
|
theme setting update
|
2012-04-11 13:46:32 +08:00 |
|
devin
|
ee85380ab2
|
little update
|
2012-04-10 18:09:29 +08:00 |
|
devin
|
360e5228b7
|
custom theme settings
|
2012-04-10 17:44:36 +08:00 |
|
devin
|
6006f1b3c6
|
start editing setting page
some relevant stuff updated
|
2012-04-10 01:06:29 +08:00 |
|
Harry Bomrah
|
32a1be624b
|
Fully updated..
|
2012-04-09 17:55:03 +08:00 |
|
Harry Bomrah
|
f807cd026d
|
app section modified…
|
2012-04-09 17:40:03 +08:00 |
|
Christophe Vilayphiou
|
963a0cb604
|
Change filter to js with history for bulletins
|
2012-04-07 00:20:52 +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 |
|
Harry Bomrah
|
94816ce224
|
js change
|
2012-04-06 15:18:39 +08:00 |
|
devin
|
74f083b226
|
details changed
orbitdesktop.js, orbitdesktopAPI.js update!
|
2012-04-06 04:42:20 +08:00 |
|
Harry Bomrah
|
39e1bc8948
|
new setting page
|
2012-04-05 20:09:11 +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 |
|
Christophe Vilayphiou
|
1259d62249
|
Fix mainTablePosition in js -> remove the notable class
|
2012-04-05 14:55:41 +08:00 |
|
Harry Bomrah
|
e0f5583f43
|
route fixed.
|
2012-04-05 13:58:58 +08:00 |
|
Harry Bomrah
|
07dadbef70
|
commit temp
|
2012-04-05 13:54:49 +08:00 |
|
devin
|
a7d84e8583
|
add tinyscrollbar
|
2012-04-05 02:31:32 +08:00 |
|
devin
|
c4b9a9e275
|
dock effect
|
2012-04-04 05:53:49 +08:00 |
|
unknown
|
11d3906951
|
new icons
|
2012-04-03 18:06:16 +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 |
|
Harry Bomrah
|
bbd2c23b3d
|
Themes fixed…
|
2012-03-30 18:06:06 +08:00 |
|
Harry Bomrah
|
aa3997f7cf
|
with notifications and other changes
|
2012-03-29 19:50:23 +08:00 |
|
Harry Bomrah
|
176597f5af
|
Stupid theme
|
2012-03-29 15:23:48 +08:00 |
|
Harry Bomrah
|
2e283a039d
|
Desktop Commit
|
2012-03-28 18:53:30 +08:00 |
|
Harry Bomrah
|
4798cd43c1
|
Desktop commit
|
2012-03-28 18:53:06 +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
|
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
|
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 |
|
Christophe Vilayphiou
|
ba4d71a026
|
Changes in orbit_bar and js in announcements
|
2012-02-23 15:51:33 +08:00 |
|
Christophe Vilayphiou
|
a3f152b200
|
Changes for jquery 1.7 (.live -> .on), create module_layout
|
2012-02-20 03:24:05 +08:00 |
|
Christophe Vilayphiou
|
44a346ffe9
|
Changes for orbit bar, login
|
2012-02-19 16:33:22 +08:00 |
|
Christophe Vilayphiou
|
9cd3cbc478
|
Modifications for design, pages, page_parts…
Move orbit_bar out of kernel.js
|
2012-02-17 02:09:32 +08:00 |
|
Christophe Vilayphiou
|
e0accbecaa
|
Changes into page_part edition.
Can choose between 'text', 'public_r_tag' and 'widget'
|
2012-02-16 13:09:09 +08:00 |
|
Christophe Vilayphiou
|
1913f0aca8
|
Add tinymce
|
2012-02-15 10:02:05 +08:00 |
|
Christophe Vilayphiou
|
3e70634add
|
Announcement modifications and tags
|
2012-02-15 00:34:22 +08:00 |
|
Christophe Vilayphiou
|
55ae7de01c
|
Orbit-bar in front-end and back-end, side-bar and drop-down menu
|
2012-02-15 00:34:22 +08:00 |
|
unknown
|
f097f83f2b
|
announcement_category edit
|
2012-02-06 16:20:51 +08:00 |
Matthew Kaito Juyuan Fu
|
8b3b71ca58
|
fix js bugs,partial bugs
|
2012-02-06 16:17:07 +08:00 |
|
Matthew Kaito Juyuan Fu
|
394099c388
|
Ad banner close complete,need validation
|
2012-02-04 09:37:23 +08:00 |
|
Matthew Kaito Juyuan Fu
|
f530eb7112
|
Revert "mistake commit"
This reverts commit 2608b72d65.
|
2012-02-03 14:39:15 +08:00 |