developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,939 Commits 86 Branches 21 Tags 58 MiB
Commit Graph

2939 Commits

Author SHA1 Message Date
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
chris 37740adb24 Add mobile but remove news in it 2013-01-07 03:03:38 +08:00
chris 9745bcf7f1 Remove mysql 2013-01-07 03:02:16 +08:00
chris c6111460f5 Fix album widget options 2013-01-07 00:40:43 +08:00
chris be00cec4d7 Fix link for ad_banner 
Add missing helper for web_link_category
Show design's js in front-end
 2013-01-07 00:36:48 +08:00
Fu Matthew 5efbe07fbe default widget link. 
make sure to run
rake migrate:make_default_widget_work_config
for changing announcement module app
 2013-01-04 18:42:25 +08:00
chris 736bda0679 Add link to default widget (temporary) 2013-01-04 12:33:37 +08:00
chris 529197eb8c Merge branch 'default_widget' of github.com:Rulingcom/orbit into default_widget 2013-01-04 12:31:32 +08:00
nccu ac6da1340a Ika's fix for width 2013-01-04 12:31:12 +08:00
nccu de2e57f681 Ika's fix for width 2013-01-04 12:19:24 +08:00
chris 7e045959b6 Gallery i18n 2013-01-04 12:01:32 +08:00
chris b6f723d42d Merge branch 'default_widget' of github.com:Rulingcom/orbit into default_widget 2013-01-04 11:56:09 +08:00
nccu ea2d38b23b Ika's changes for css default widgets 2013-01-04 11:54:58 +08:00
nccu d4c470f76f Ika's changes for css default widgets 2013-01-04 11:43:03 +08:00
Rueshyna 3e8b029c5f change bulletin object to bulletin title 2013-01-04 10:50:08 +08:00
Rueshyna a0868a05ac Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu 
* 'ntu' of https://github.com/Rulingcom/orbit:
  fixing default widget error when needs image
  make default widget works without init
  Fix order in structure
  Fix old tags
 2013-01-04 09:43:38 +08:00
Fu Matthew 49e289e0fd fixing default widget error when needs image 2013-01-03 20:07:05 +08:00
Fu Matthew 39f715319b Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu 
Conflicts:
	lib/tasks/migrate.rake
 2013-01-03 19:41:52 +08:00
Fu Matthew a70110f787 make default widget works without init 2013-01-03 19:38:14 +08:00
chris fa83dbf791 Fix order in structure 2013-01-03 19:15:08 +08:00
chris 5b289bc1d2 Fix old tags 2013-01-03 19:15:08 +08:00
Rueshyna fd2b176798 Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu 
* 'ntu' of https://github.com/Rulingcom/orbit:
  complete page error handler logic
 2013-01-03 18:40:41 +08:00
Rueshyna 8815533075 correct pic file format 2013-01-03 18:32:32 +08:00