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 |
|
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
|
cf297fc424
|
Changed inherited controller in module_apps to OrbitBackendController
|
2012-03-27 18:58:04 +08:00 |
|
Christophe Vilayphiou
|
d02bbdbaa5
|
Nokogiri in parsers
|
2012-03-27 18:58:04 +08:00 |
Christophe Vilayphiou
|
55d12e50f2
|
Ray's changes in announcenment back-end
|
2012-03-27 18:58:03 +08:00 |
Matt Fu
|
3ba89ecbcf
|
Fact check program completed,Lin checked
|
2012-03-27 18:54:03 +08:00 |
|
Christophe Vilayphiou
|
f5fd3dec7a
|
Trying nokogiri
|
2012-03-27 18:42:22 +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
|
a126935d2c
|
Clean the parsers and introduce the metas
|
2012-03-21 18:30:12 +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 |
|
Christophe Vilayphiou
|
e953344965
|
Fix before_filter order for object_auth
|
2012-03-20 14:17:28 +08:00 |
|
Christophe Vilayphiou
|
7cc075e124
|
Change the monkey picture
|
2012-03-19 15:49:40 +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 |
|
Christophe Vilayphiou
|
f4fda08e86
|
Replace PrototypeR4 by Orbit.
Move session into mongoid_store.
Reset session when sing_in.
|
2012-03-16 14:58:32 +08:00 |
|
Christophe Vilayphiou
|
785ead5209
|
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
Conflicts:
app/views/layouts/_side_bar.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
|
2012-03-16 14:55:21 +08:00 |
|
unknown
|
6f6e84b015
|
fix dashboard & announcement
|
2012-03-16 14:44:57 +08:00 |
|
Christophe Vilayphiou
|
b6d49df145
|
Change Obit to Orbit
|
2012-03-16 11:54:31 +08:00 |
|
Matt Fu
|
13b6892f87
|
code for new fact check
|
2012-03-16 11:09:44 +08:00 |
|
unknown
|
00ab773942
|
fix dashboard & announcement
|
2012-03-14 20:05:03 +08:00 |
|
Christophe Vilayphiou
|
4dd9b7ffa4
|
Fix announcement pagination in front-end
|
2012-03-07 18:16:59 +08:00 |
|
Christophe Vilayphiou
|
0b1f83c042
|
Fix extra loaded js: the widgets only need to render layout when they need js.
|
2012-03-07 18:16:59 +08:00 |
|
Matt Fu
|
cceb785a8d
|
change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action.
|
2012-02-29 18:58:33 +08:00 |
Matthew Kaito Juyuan Fu
|
8932615f05
|
add "all_user" for app&object auth
|
2012-02-29 18:56:42 +08:00 |
|
Matthew Kaito Juyuan Fu
|
2e58c63ff7
|
fix bugs with token
|
2012-02-29 18:56:42 +08:00 |
|
Matthew Kaito Juyuan Fu
|
cc550c5745
|
First version for App and Object auth.Taking Announcement as experiment
|
2012-02-29 18:55:55 +08:00 |
|
Matthew Kaito Juyuan Fu
|
3bcd7ea349
|
Exp with object_auth
|
2012-02-29 18:50:23 +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 |
|
Matt Fu
|
ccb61fc2dd
|
change Search bar
|
2012-02-29 11:29:13 +08:00 |
|
Christophe Vilayphiou
|
0fa5c3ba9d
|
Fix bug in orbit-bar
|
2012-02-29 04:56:52 +08:00 |
|
Christophe Vilayphiou
|
344ec86c57
|
Remove class 'error' in devise forms
|
2012-02-29 04:56:32 +08:00 |
|
Christophe Vilayphiou
|
4b7b57bb3d
|
Add some missing translations
|
2012-02-29 04:48:21 +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
|
18617850e5
|
Add categories for all the widgets
|
2012-02-28 22:00:05 +08:00 |