a2d2e7cc3f
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
app/assets/javascripts/orbit-1.0.js
config/locales/en.yml
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
2012-02-15 00:42:29 +08:00
3e70634add
Announcement modifications and tags
2012-02-15 00:34:22 +08:00
f57e9f19f7
Changes for multiple i18n_variable in bulletin
2012-02-15 00:34:22 +08:00
1f7dae9bee
Gemfile and bugs in js for orbit-bar
2012-02-15 00:34:22 +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
dcc6a53430
brief starting for dashboard,adds i18n vars
2012-02-15 00:34:21 +08:00
8ef2d4b02e
include ad_banner query code. cleaned up parser
2012-02-15 00:34:21 +08:00
436f039c1b
build interface to work with object auth. Go to panel/new_blog/back_end/posts/ ,click New Auth link
2012-02-15 00:34:21 +08:00
e20739e32b
Object Auth. Now object can be included with "include OrbitCoreLib::ObjectAuthable" to use kernel method,such as
...
1.Object.authed_for_user(user,title_of_object_auth). title_of_object_auth is optional
2.object.authed_users(user,title_of_object_auth) . title_of_object_auth is optional
if title_of_object_auth is not given,then it will return calculation across all possiblity.
2012-02-15 00:34:21 +08:00
3ed9b81df9
first commit for object auth,will take new_blog for experiment
2012-02-15 00:34:21 +08:00
c3e57f8bde
Put back therubyracer
2012-02-13 17:22:13 +08:00
da2c64170f
Merge branch 'new_announcement_dev' of github.com:Rulingcom/orbit into new_announcement_dev
2012-02-13 17:11:02 +08:00
70c97bc065
edit announcement widget
2012-02-13 17:09:38 +08:00
088bbe1853
Change announcement route
2012-02-13 17:09:37 +08:00
964d7b6054
announcement path error
2012-02-13 17:09:37 +08:00
c6048ada82
Include therubyracer in Gemfile
2012-02-13 17:09:37 +08:00
dea9783b93
edit announcement widget
2012-02-13 16:57:56 +08:00
3f9a041d44
Gemfile and bugs in js for orbit-bar
2012-02-13 13:28:42 +08:00
23796396e9
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
2012-02-13 13:04:29 +08:00
60556c5be9
Orbit-bar in front-end and back-end, side-bar and drop-down menu
2012-02-13 13:03:53 +08:00
98b74e5cf4
brief starting for dashboard,adds i18n vars
2012-02-13 13:03:52 +08:00
ad34d5b8a6
include ad_banner query code. cleaned up parser
2012-02-13 13:03:52 +08:00
3496a37a71
Merge branch 'obj_auth'
2012-02-13 02:24:52 +08:00
bc34ad323e
Merge branch 'new_announcement_dev'
2012-02-13 02:23:16 +08:00
50d3aba1a0
brief starting for dashboard,adds i18n vars
2012-02-10 16:43:58 +08:00
3e37f72730
Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
2012-02-10 10:51:32 +08:00
79ae598c4f
include ad_banner query code. cleaned up parser
2012-02-10 10:50:03 +08:00
32159564cd
build interface to work with object auth. Go to panel/new_blog/back_end/posts/ ,click New Auth link
2012-02-09 19:04:06 +08:00
31d7cd5b38
Object Auth. Now object can be included with "include OrbitCoreLib::ObjectAuthable" to use kernel method,such as
...
1.Object.authed_for_user(user,title_of_object_auth). title_of_object_auth is optional
2.object.authed_users(user,title_of_object_auth) . title_of_object_auth is optional
if title_of_object_auth is not given,then it will return calculation across all possiblity.
2012-02-09 17:48:51 +08:00
e638c1c7c3
Change announcement route
2012-02-09 15:07:43 +08:00
338d18e909
announcement path error
2012-02-09 14:58:59 +08:00
3a8dbd6af4
first commit for object auth,will take new_blog for experiment
2012-02-07 16:16:48 +08:00
e26c5529df
Include therubyracer in Gemfile
2012-02-07 11:18:54 +08:00
872a00b6a2
Forgot to change title in key in pages_controller
2012-02-06 22:09:33 +08:00
8f885e8bb7
Use key not title for module_app in parser.
...
Modify announcement routes.
2012-02-06 16:58:19 +08:00
e02c675595
Put back exception notifications
2012-02-06 16:25:33 +08:00
819a896a4b
Merge branch 'new_announcement_dev' of github.com:Rulingcom/orbit into new_announcement_dev
2012-02-06 16:21:32 +08:00
f097f83f2b
announcement_category edit
2012-02-06 16:20:51 +08:00
65901edf6f
Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
2012-02-06 16:18:15 +08:00
8b3b71ca58
fix js bugs,partial bugs
2012-02-06 16:17:07 +08:00
e0409c2c8e
Merge branch 'new_announcement_dev' of https://github.com/Rulingcom/orbit into new_announcement_dev
2012-02-06 15:46:17 +08:00
ca735e43ce
announcement_category edit
2012-02-06 15:23:27 +08:00
fff918cd78
Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
2012-02-04 10:35:40 +08:00
ac0b681779
fix js bugs,partial bugs
2012-02-04 10:32:24 +08:00
dec2359c3f
Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
2012-02-04 09:40:58 +08:00
0af37c0688
Add rake task for ad_banner. Will have ad_banner at dev:build
2012-02-04 09:37:23 +08:00
394099c388
Ad banner close complete,need validation
2012-02-04 09:37:23 +08:00
68cea1ea49
AdBanner is now working
2012-02-04 09:37:23 +08:00
2b2b057583
Add rake task for ad_banner. Will have ad_banner at dev:build
2012-02-03 18:02:27 +08:00
d107d54a82
Ad banner close complete,need validation
2012-02-03 15:14:42 +08:00
Christophe Vilayphiou
Christophe Vilayphiou
Matthew Kaito Juyuan Fu
unknown