unknown
|
5bde2a9e81
|
demo site plugin
|
2012-09-17 11:02:11 +08:00 |
OrbitServer
|
ee51240102
|
Ray's changes for new backend
|
2012-09-14 02:38:56 +08:00 |
Christophe Vilayphiou
|
194773f064
|
Fix bugs after merge
|
2012-09-14 02:27:49 +08:00 |
|
unknown
|
42d50ae534
|
Plugins
|
2012-09-14 00:05:31 +08:00 |
|
Christophe Vilayphiou
|
03b5827392
|
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
Conflicts:
app/controllers/application_controller.rb
app/views/layouts/_side_bar.html.erb
|
2012-09-14 00:03:52 +08:00 |
Matthew K. Fu JuYuan
|
5fb94f644d
|
break down Ray's HTML
|
2012-09-14 00:02:22 +08:00 |
|
Matthew K. Fu JuYuan
|
3e5978c8fd
|
users new interface controller
|
2012-09-14 00:02:21 +08:00 |
|
Matthew K. Fu JuYuan
|
4818e3f444
|
first version for new member html
|
2012-09-14 00:02:21 +08:00 |
Harry Bomrah
|
29ea95b4c6
|
event_calendar testing
|
2012-09-13 23:57:47 +08:00 |
|
Matthew K. Fu JuYuan
|
9bfd1d2b0c
|
break down Ray's HTML
|
2012-09-13 18:39:27 +08:00 |
|
Christophe Vilayphiou
|
2e9af5d1a8
|
fix commit bugs
|
2012-09-13 15:53:36 +08:00 |
|
Harry Bomrah
|
f88176ee1f
|
Merge branch 'gallery_orbit' of https://github.com/Rulingcom/orbit into gallery_orbit
|
2012-09-12 16:48:33 +08:00 |
|
Christophe Vilayphiou
|
3432d1359b
|
Fix bug in show_from_link
|
2012-09-12 16:46:03 +08:00 |
|
Matthew K. Fu JuYuan
|
17195a9a23
|
fix for admin has no orbit menu
|
2012-09-12 16:20:15 +08:00 |
|
Matthew K. Fu JuYuan
|
98e8f5f607
|
complete visitor dashbroad
|
2012-09-12 16:20:15 +08:00 |
|
Matthew K. Fu JuYuan
|
803f83b239
|
fix for no login window for backend
|
2012-09-12 16:20:15 +08:00 |
|
Matthew K. Fu JuYuan
|
45ef7fd302
|
guest user
|
2012-09-12 16:20:15 +08:00 |
|
Harry Bomrah
|
17f3104c8d
|
Merge branch 'gallery_orbit' into desktop_devin
|
2012-09-12 16:18:13 +08:00 |
devin
|
e96ebefe9c
|
calendar update
|
2012-09-12 16:16:01 +08:00 |
|
OrbitServer
|
905541aa38
|
Ray's tp CSS changes
|
2012-09-12 03:50:20 +08:00 |
|
Christophe Vilayphiou
|
816b542ca6
|
Change side bar to use key instead of title for ModuleApps
|
2012-09-12 03:07:25 +08:00 |
|
Christophe Vilayphiou
|
e88b09cf72
|
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
Conflicts:
app/controllers/pages_controller.rb
app/views/layouts/_side_bar.html.erb
lib/parsers/parser_common.rb
vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
vendor/built_in_modules/gallery/config/locales/en.yml
vendor/built_in_modules/gallery/config/locales/zh_tw.yml
|
2012-09-12 02:21:18 +08:00 |
|
Harry Bomrah
|
4ea0c0ec9c
|
minor fix for sidebar
|
2012-09-12 02:14:50 +08:00 |
|
Harry Bomrah
|
8a71bd530f
|
page added...
|
2012-09-12 02:14:50 +08:00 |
|
Harry Bomrah
|
8dd69a140f
|
frontend commits
|
2012-09-12 02:12:15 +08:00 |
|
Harry Bomrah
|
3749e919cb
|
front ends updates
|
2012-09-12 02:12:15 +08:00 |
|
Harry Bomrah
|
7ae1dcd8e0
|
Calendar Module
|
2012-09-12 02:06:22 +08:00 |
|
devin
|
789c2df7fd
|
gallery frontend update
|
2012-09-12 02:05:10 +08:00 |
|
Harry Bomrah
|
6a23e29f33
|
Ruby structure implementation
|
2012-09-12 02:05:09 +08:00 |
|
Harry Bomrah
|
04877b9945
|
design update
|
2012-09-12 01:58:23 +08:00 |
|
Harry Bomrah
|
c84b6a626e
|
minor fix for sidebar
|
2012-09-11 16:50:42 +08:00 |
|
Matthew K. Fu JuYuan
|
01a8a9b5b6
|
users new interface controller
|
2012-09-11 10:53:05 +08:00 |
|
Matthew K. Fu JuYuan
|
42cfe5ac91
|
first version for new member html
|
2012-09-11 10:52:27 +08:00 |
|
Harry Bomrah
|
7bab8bf8ad
|
page added...
|
2012-09-10 14:44:21 +08:00 |
|
Harry Bomrah
|
8295286c6e
|
frontend commits
|
2012-09-05 19:08:48 +08:00 |
|
Harry Bomrah
|
b726c10857
|
front ends updates
|
2012-09-04 21:30:17 +08:00 |
|
chris
|
dcdd730a01
|
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
Conflicts:
app/assets/javascripts/bulletin_form.js.erb
app/views/layouts/_side_bar.html.erb
vendor/built_in_modules/archive/app/models/archive_file.rb
vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
|
2012-08-31 14:31:54 +08:00 |
|
unknown
|
0cb573946e
|
update item page
|
2012-08-30 15:17:39 +08:00 |
|
unknown
|
a1560ebcf5
|
update archive
|
2012-08-30 15:17:39 +08:00 |
|
Christophe Vilayphiou
|
3ebe7378b9
|
Delete duplicate side_bar code
|
2012-08-30 14:49:31 +08:00 |
|
unknown
|
bc5235aa9f
|
archive checkbox
|
2012-08-30 14:49:31 +08:00 |
|
unknown
|
e281262b6d
|
new archive
|
2012-08-30 14:49:31 +08:00 |
|
unknown
|
2a4c737cdd
|
archive checkbox
|
2012-08-30 14:48:42 +08:00 |
|
unknown
|
7ce4a51b73
|
new archive
|
2012-08-30 14:45:28 +08:00 |
|
unknown
|
eb7e73b393
|
new archive
|
2012-08-30 14:44:55 +08:00 |
|
Christophe Vilayphiou
|
becf88bc20
|
Delete duplicate side_bar code
|
2012-08-30 14:39:48 +08:00 |
|
unknown
|
c74ebb91b8
|
archive checkbox
|
2012-08-30 14:37:56 +08:00 |
|
unknown
|
57717eef33
|
new archive
|
2012-08-30 14:36:48 +08:00 |
|
unknown
|
8a5519073b
|
new archive
|
2012-08-30 14:32:32 +08:00 |
|
unknown
|
29bcfa3139
|
archive checkbox
|
2012-08-30 14:19:51 +08:00 |