Christophe Vilayphiou
9cd3cbc478
Modifications for design, pages, page_parts…
...
Move orbit_bar out of kernel.js
2012-02-17 02:09:32 +08:00
unknown
5da75161c4
announcemenet & web_resource widget
2012-02-16 17:52:49 +08:00
Matthew Kaito Juyuan Fu
9305c2045c
add "all_user" for app&object auth
2012-02-16 14:59:26 +08:00
Matthew Kaito Juyuan Fu
d2689bc59c
fix bugs with token
2012-02-16 13:57:28 +08:00
Christophe Vilayphiou
e61aa6b210
Modify dev.rake to create the ModuleApp object for web_recsource
2012-02-16 13:28:51 +08:00
Christophe Vilayphiou
4389f0cf28
Add new created files to previous commit
2012-02-16 13:09:09 +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
unknown
7ea1745f73
items error
2012-02-16 11:30:54 +08:00
Matthew Kaito Juyuan Fu
5640e07733
First version for App and Object auth.Taking Announcement as experiment
2012-02-15 18:20:44 +08:00
Christophe Vilayphiou
4d361857cb
Fix tags in web_resource
2012-02-15 15:47:05 +08:00
unknown
edf236c1c7
edit tags
2012-02-15 15:38:27 +08:00
Christophe Vilayphiou
af3a2547e1
Change ModuleAppTag into "Module name"Tag.
2012-02-15 15:18:11 +08:00
Christophe Vilayphiou
d0c2856a3a
Fix relations error in tags
2012-02-15 11:42:19 +08:00
unknown
778a85ca2b
add tags
2012-02-15 10:37:07 +08:00
Christophe Vilayphiou
6b551defce
Remove therubyracer, it's already a dependency of execjs
2012-02-15 10:07:41 +08:00
Christophe Vilayphiou
1913f0aca8
Add tinymce
2012-02-15 10:02:05 +08:00
Christophe Vilayphiou
a0f58b543b
Remove ckeditor
2012-02-15 01:05:24 +08:00
Christophe Vilayphiou
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
Christophe Vilayphiou
3e70634add
Announcement modifications and tags
2012-02-15 00:34:22 +08:00
Christophe Vilayphiou
f57e9f19f7
Changes for multiple i18n_variable in bulletin
2012-02-15 00:34:22 +08:00
Christophe Vilayphiou
1f7dae9bee
Gemfile and bugs in js for orbit-bar
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
Matthew Kaito Juyuan Fu
dcc6a53430
brief starting for dashboard,adds i18n vars
2012-02-15 00:34:21 +08:00
Matthew Kaito Juyuan Fu
8ef2d4b02e
include ad_banner query code. cleaned up parser
2012-02-15 00:34:21 +08:00
Matthew Kaito Juyuan Fu
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
Matthew Kaito Juyuan Fu
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
Matthew Kaito Juyuan Fu
3ed9b81df9
first commit for object auth,will take new_blog for experiment
2012-02-15 00:34:21 +08:00
Matthew Kaito Juyuan Fu
17caa7cb1b
Exp with object_auth
2012-02-13 17:33:48 +08:00
Christophe Vilayphiou
c3e57f8bde
Put back therubyracer
2012-02-13 17:22:13 +08:00
Christophe Vilayphiou
da2c64170f
Merge branch 'new_announcement_dev' of github.com:Rulingcom/orbit into new_announcement_dev
2012-02-13 17:11:02 +08:00
unknown
70c97bc065
edit announcement widget
2012-02-13 17:09:38 +08:00
Christophe Vilayphiou
088bbe1853
Change announcement route
2012-02-13 17:09:37 +08:00
unknown
964d7b6054
announcement path error
2012-02-13 17:09:37 +08:00
Christophe Vilayphiou
c6048ada82
Include therubyracer in Gemfile
2012-02-13 17:09:37 +08:00
unknown
dea9783b93
edit announcement widget
2012-02-13 16:57:56 +08:00
Christophe Vilayphiou
3f9a041d44
Gemfile and bugs in js for orbit-bar
2012-02-13 13:28:42 +08:00
Christophe Vilayphiou
23796396e9
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
2012-02-13 13:04:29 +08:00
Christophe Vilayphiou
60556c5be9
Orbit-bar in front-end and back-end, side-bar and drop-down menu
2012-02-13 13:03:53 +08:00
Matthew Kaito Juyuan Fu
98b74e5cf4
brief starting for dashboard,adds i18n vars
2012-02-13 13:03:52 +08:00
Matthew Kaito Juyuan Fu
ad34d5b8a6
include ad_banner query code. cleaned up parser
2012-02-13 13:03:52 +08:00
Christophe Vilayphiou
3496a37a71
Merge branch 'obj_auth'
2012-02-13 02:24:52 +08:00
Christophe Vilayphiou
bc34ad323e
Merge branch 'new_announcement_dev'
2012-02-13 02:23:16 +08:00
Matthew Kaito Juyuan Fu
c88e1c8419
Merge branch 'obj_auth' into announcement_dev_view_and_auth
2012-02-12 23:24:50 +08:00
Matthew Kaito Juyuan Fu
50d3aba1a0
brief starting for dashboard,adds i18n vars
2012-02-10 16:43:58 +08:00
Matthew Kaito Juyuan Fu
3e37f72730
Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
2012-02-10 10:51:32 +08:00
Matthew Kaito Juyuan Fu
79ae598c4f
include ad_banner query code. cleaned up parser
2012-02-10 10:50:03 +08:00
Matthew Kaito Juyuan Fu
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
Matthew Kaito Juyuan Fu
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
Christophe Vilayphiou
e638c1c7c3
Change announcement route
2012-02-09 15:07:43 +08:00
unknown
338d18e909
announcement path error
2012-02-09 14:58:59 +08:00