Christophe Vilayphiou
|
194773f064
|
Fix bugs after merge
|
2012-09-14 02:27:49 +08:00 |
|
Christophe Vilayphiou
|
f2a6739fa8
|
Merge branch 'new' of github.com:Rulingcom/orbit into new
Conflicts:
app/views/layouts/_side_bar.html.erb
|
2012-09-14 00:06:43 +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
|
df6c7afd68
|
add data_migration for rename field for attribute_field. not yet tested
|
2012-09-14 00:02:22 +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 |
|
Christophe Vilayphiou
|
969d8c8e57
|
Merge branch 'cal_test' of github.com:Rulingcom/orbit into cal_test
Conflicts:
.gitignore
vendor/built_in_modules/calendar/app/views/panel/orbitcalendar/back_end/calendar_categories/index.html.erb
vendor/built_in_modules/calendar/app/views/panel/orbitcalendar/back_end/cals/index.html.erb
|
2012-09-14 00:00:37 +08:00 |
Harry Bomrah
|
c21e204697
|
again minor shit update
|
2012-09-13 23:58:32 +08:00 |
|
Harry Bomrah
|
73d5074037
|
minor shit updates
|
2012-09-13 23:57:48 +08:00 |
|
Harry Bomrah
|
29ea95b4c6
|
event_calendar testing
|
2012-09-13 23:57:47 +08:00 |
|
Harry Bomrah
|
0f265e1534
|
again minor shit update
|
2012-09-13 19:02:48 +08:00 |
|
Harry Bomrah
|
bedde860a4
|
minor shit updates
|
2012-09-13 19:02:08 +08:00 |
|
Matthew K. Fu JuYuan
|
669220530d
|
add data_migration for rename field for attribute_field. not yet tested
|
2012-09-13 18:50:46 +08:00 |
|
Matthew K. Fu JuYuan
|
9bfd1d2b0c
|
break down Ray's HTML
|
2012-09-13 18:39:27 +08:00 |
|
unknown
|
5c8039e38d
|
Plugins
|
2012-09-13 18:13:34 +08:00 |
|
Christophe Vilayphiou
|
90ae361dc3
|
Class change for filter button
|
2012-09-13 17:37:17 +08:00 |
|
Christophe Vilayphiou
|
2e9af5d1a8
|
fix commit bugs
|
2012-09-13 15:53:36 +08:00 |
|
Christophe Vilayphiou
|
45ccc315c7
|
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
|
2012-09-12 17:53:47 +08:00 |
|
Christophe Vilayphiou
|
4dff15cffb
|
Add before_filter in gallery
|
2012-09-12 17:52:24 +08:00 |
|
Harry Bomrah
|
5443aba43e
|
with gallery json
|
2012-09-12 16:50:59 +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 |
|
Christophe Vilayphiou
|
46177000e0
|
Merge branch 'visitor_dsahbroad' of github.com:Rulingcom/orbit into visitor_dsahbroad
Conflicts:
Gemfile.lock
app/controllers/application_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb
vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
|
2012-09-12 16:32:40 +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 |
|
Harry Bomrah
|
2d053164e8
|
event_calendar testing
|
2012-09-12 14:20:32 +08:00 |
|
Matthew K. Fu JuYuan
|
02cebc242f
|
fix for admin has no orbit menu
|
2012-09-12 10:10:09 +08:00 |
|
Christophe Vilayphiou
|
7c57c947c7
|
Fix typo in mongoid.yml
|
2012-09-12 03:52:04 +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
|
a42a651f90
|
frontend updates
|
2012-09-12 02:08:02 +08:00 |
|
Harry Bomrah
|
199839a42a
|
frontend update
|
2012-09-12 02:08:02 +08:00 |
|
Harry Bomrah
|
3fc07b9ff1
|
one more modification
|
2012-09-12 02:07:40 +08:00 |
|
Harry Bomrah
|
2a66b89d33
|
Modifications in ruby
|
2012-09-12 02:07:40 +08:00 |
|
Harry Bomrah
|
7ae1dcd8e0
|
Calendar Module
|
2012-09-12 02:06:22 +08:00 |
|
devin
|
a05fff98ac
|
front update
|
2012-09-12 02:05:10 +08:00 |
|
devin
|
4e662c744a
|
backend update
|
2012-09-12 02:05:10 +08:00 |
|
Harry Bomrah
|
97923a4d31
|
resize thumbnails
|
2012-09-12 02:05:10 +08:00 |
|
Harry Bomrah
|
7903d2ae36
|
ruby update for form and edit tagging
|
2012-09-12 02:05:10 +08:00 |