Commit Graph

1712 Commits

Author SHA1 Message Date
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
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
devin 789c2df7fd gallery frontend update 2012-09-12 02:05:10 +08:00
Harry Bomrah 8259dee4a3 Ruby update 2012-09-12 02:05:10 +08:00
devin cc6986cb16 language fix 2012-09-12 02:05:10 +08:00
devin 0be494c62b front end added 2012-09-12 02:05:09 +08:00
Harry Bomrah 6a23e29f33 Ruby structure implementation 2012-09-12 02:05:09 +08:00
Harry Bomrah 26ff2af078 View only update 2012-09-12 02:04:36 +08:00
Harry Bomrah f62eba182e Commit for view only 2012-09-12 02:04:36 +08:00
Harry Bomrah f4dde67344 frontend fixes 2012-09-12 02:04:36 +08:00
Harry Bomrah 8caa798c08 frontend updates 2012-09-12 02:04:36 +08:00
devin 29c5126455 gallery update 2012-09-12 02:04:36 +08:00
devin 4b6eebba7c gallery update 2012-09-12 02:04:08 +08:00
devin b6f10951b8 gallery update
especially upload panel
2012-09-12 02:04:07 +08:00
Harry Bomrah 6e6d441b26 code merged … ui updated 2012-09-12 02:03:02 +08:00
devin 2274df4111 gallery update 2012-09-12 02:02:29 +08:00
devin 584d1eb0e0 gallery update 2012-09-12 02:02:01 +08:00
devin ede9727a18 gallery update 2012-09-12 02:02:00 +08:00
devin 0e5a305f39 gallery update 2012-09-12 01:58:23 +08:00
devin 0c624794d5 gallery update 2012-09-12 01:58:23 +08:00
devin 887b2d528d gallery update
especially upload panel
2012-09-12 01:58:23 +08:00
Harry Bomrah ad431b1d06 Minor update 2012-09-12 01:58:23 +08:00
Harry Bomrah 91d45b64da code merged … ui updated 2012-09-12 01:58:23 +08:00
Harry Bomrah 04877b9945 design update 2012-09-12 01:58:23 +08:00