Commit Graph

3161 Commits

Author SHA1 Message Date
chris de39bce4ce Fix the tooltips 2013-01-11 12:13:16 +08:00
chris b90e8efb1f Fix filter not collapsing
Fix icon size for button
2013-01-11 11:37:11 +08:00
chris a7d1cdbb75 Fix for link in ad banner 2013-01-11 11:28:13 +08:00
Rueshyna c888d9cae4 modularize personal journal and pull relational setting in desktop/index.rb 2013-01-11 10:55:19 +08:00
Fu Matthew 92f3be3200 Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu 2013-01-10 18:18:02 +08:00
Fu Matthew b950ad64c0 fix for fronted editing not responding for announcement. 2013-01-10 18:17:27 +08:00
Fu Matthew ca51ebc08c apply view 2013-01-10 18:00:58 +08:00
chris e24f7a7880 Put back some field so ad_image can work 2013-01-10 11:08:57 +08:00
Rueshyna 08adb887c5 change *default* to *defulat* 2013-01-10 09:40:52 +08:00
chris c36f3152f5 Changes in css for structure icon and sidebar padding 2013-01-09 21:35:54 +08:00
chris 1c1839fc00 Remove useless code in de_image.rb 2013-01-09 21:17:50 +08:00
chris 02e5e52159 Translation typo
Remove test values in ad_image form
Remove NeedReset
2013-01-09 21:17:50 +08:00
chris 48ce2278d0 Update disable time when separated picker new or reset date 2013-01-09 21:17:50 +08:00
chris b49251afee Date picker separated: reset time when reset date 2013-01-09 21:17:50 +08:00
chris 1d405c3ffe Add "tag" icon to orbit bar 2013-01-09 21:17:50 +08:00
chris d8f6ebb153 Fix icons 2013-01-09 21:17:50 +08:00
chris 7434d36e9b Ray's changes for icon size 2013-01-09 21:17:50 +08:00
chris 933ac7b8fe Ray's changes for icon css 2013-01-09 21:17:50 +08:00
chris 41dff814fb Change icons 2013-01-09 21:17:50 +08:00
Fu Matthew d0f474c2ab fix wrong i18n 2013-01-09 17:13:25 +08:00
Fu Matthew 5ab4bbd367 add ad_banner inner page,pic title. 2013-01-09 16:54:33 +08:00
Rueshyna bc031f34f6 move js file to relational module but have js require problem 2013-01-09 16:16:47 +08:00
Rueshyna 97eb9e19f9 restore js,journal_pages.js, 2013-01-09 14:40:58 +08:00
Fu Matthew 614b6fde71 fix wrong html structure for announcement frontend 2013-01-09 12:13:55 +08:00
chris 1d80b39dcb Fix no responding when trying to access front end page 2013-01-09 11:23:18 +08:00
Rueshyna bc3cba5ebc fixed journal type page 2013-01-09 10:57:52 +08:00
chris fac4faad6c Change date picker 2013-01-09 05:18:16 +08:00
Rueshyna 4938198357 modularized personal journal 2013-01-08 18:34:18 +08:00
Rueshyna 96ef70aba4 move journal code to persional_journal modulaar 2013-01-08 18:34:18 +08:00
Rueshyna ded445aae3 amend file value to correct format 2013-01-08 18:25:30 +08:00
chris 9c8bf1ffab Change translation 2013-01-08 17:30:36 +08:00
unknown 9584d67b23 member roles edit 2013-01-08 16:58:01 +08:00
Fu Matthew 81d4481797 Merge commit '5b13c53ed99858f69d19bd03fe1a6bb74071a007' into sidebar_config 2013-01-08 14:18:04 +08:00
Fu Matthew 76296ab29b Merge branch 'sidebar_config' into ntu
Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/controllers/orbit_backend_controller.rb
	app/controllers/orbit_widget_controller.rb
	app/models/module_app.rb
	app/views/admin/page_parts/_module_widget.html.erb
	config/locales/zh_tw.yml
	lib/parsers/parser_common.rb
	lib/parsers/parser_front_end.rb
2013-01-08 14:17:21 +08:00
chris 5b13c53ed9 Ika's changes in default_widget.css 2013-01-08 12:50:28 +08:00
chris 66dafbb2a0 Put impressionist delayed job in a patch 2013-01-08 12:45:15 +08:00
chris e3d34263e3 Schedule job for tag_cloud 2013-01-08 12:36:50 +08:00
chris 423e2ac54e Update bootstrap version 2.2.2 2013-01-07 17:25:32 +08:00
chris 67136cf595 Merge branch 'ntu_default_widget' of github.com:Rulingcom/orbit into ntu_default_widget
Conflicts:
	app/views/default_widget/typeB.html.erb
	app/views/default_widget/typeC.html.erb
	lib/parsers/parser_common.rb
2013-01-07 17:22:01 +08:00
Fu Matthew 7594e1b9a6 fix member has no module_app 2013-01-07 17:20:37 +08:00
Fu Matthew b71ebb3982 clean default widget 2013-01-07 17:20:37 +08:00
Fu Matthew 5793f0fe5d default widget link.
make sure to run
rake migrate:make_default_widget_work_config
for changing announcement module app
2013-01-07 17:20:37 +08:00
Rueshyna a34da20e48 Merge branch 'master' into desktop
* master: (57 commits)
  Add translations
  Add mobile version in site settings
  Add mobile but remove news in it
  Remove mysql
  Fix album widget options
  Fix link for ad_banner Add missing helper for web_link_category Show design's js in front-end
  Add link to default widget (temporary)
  Ika's fix for width
  Ika's fix for width
  Gallery i18n
  Ika's changes for css default widgets
  Ika's changes for css default widgets
  change bulletin object to bulletin title
  fixing default widget error when needs image
  make default widget works without init
  Fix order in structure
  Fix old tags
  correct pic file format
  complete page error handler logic
  change sub_menu to header in site setting
  ...
2013-01-07 16:44:05 +08:00
Rueshyna ad5ee83c01 Merge branch 'master' of https://github.com/Rulingcom/orbit
* 'master' of https://github.com/Rulingcom/orbit: (57 commits)
  Add translations
  Add mobile version in site settings
  Add mobile but remove news in it
  Remove mysql
  Fix album widget options
  Fix link for ad_banner Add missing helper for web_link_category Show design's js in front-end
  Add link to default widget (temporary)
  Ika's fix for width
  Ika's fix for width
  Gallery i18n
  Ika's changes for css default widgets
  Ika's changes for css default widgets
  change bulletin object to bulletin title
  fixing default widget error when needs image
  make default widget works without init
  Fix order in structure
  Fix old tags
  correct pic file format
  complete page error handler logic
  change sub_menu to header in site setting
  ...
2013-01-07 16:43:35 +08:00
Rueshyna 4ee683aa9b fixed desktop route 2013-01-07 16:38:02 +08:00
Fu Matthew 137beabde9 fix member has no module_app 2013-01-07 14:04:14 +08:00
Rueshyna 35e0011111 Merge remote-tracking branch 'remotes/origin/publication' into desktop
* remotes/origin/publication:
  new desktop framework updates
2013-01-07 12:44:30 +08:00
Fu Matthew abbecfbe2f clean default widget 2013-01-07 12:09:36 +08:00
chris 83935aaa60 Add translations 2013-01-07 10:42:17 +08:00
chris 6c6bda988d Add mobile version in site settings 2013-01-07 03:57:36 +08:00