saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,491 Commits 5 Branches 0 Tags 52 MiB
Commit Graph

2491 Commits

Author SHA1 Message Date
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
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
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
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
Fu Matthew 1856d2395d complete page error handler logic 2013-01-03 15:35:14 +08:00
Rueshyna 8e33313b13 Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu 
* 'ntu' of https://github.com/Rulingcom/orbit:
  show error message when trying to show a not existed page
 2013-01-03 14:47:18 +08:00
Rueshyna cb3a9ea98b change sub_menu to header in site setting 2013-01-03 14:46:02 +08:00
Fu Matthew 6da528ef98 show error message when trying to show a not existed page 2013-01-03 13:50:27 +08:00
Rueshyna 80f545966e Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu 
* 'ntu' of https://github.com/Rulingcom/orbit:
  fix calendar broken
 2013-01-03 12:25:50 +08:00
Fu Matthew 5d6279a9ea fix calendar broken 2013-01-03 10:58:52 +08:00
Rueshyna d44ac6617a Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu 
* 'ntu' of https://github.com/Rulingcom/orbit:
  fix preview filed after ad_banner created.
 2013-01-03 09:41:54 +08:00
Fu Matthew 10473af154 Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu 2013-01-02 17:53:00 +08:00
Fu Matthew 2c632551e5 fix preview filed after ad_banner created. 2013-01-02 17:51:53 +08:00
Rueshyna f67664df29 custom icon for msoffice 2013-01-02 17:35:21 +08:00
Rueshyna 5f7453c3fb generalization file type 2013-01-02 16:58:48 +08:00
Rueshyna f4692182c0 when mouse move to button of announcement file : image => preview pic, file => type 2013-01-02 16:34:38 +08:00
Rueshyna 506770bf33 Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu 
* 'ntu' of https://github.com/Rulingcom/orbit:
  fix NTU album module_app data
  fix object auth. show error message if user try to do object auth in a wrong way.
 2013-01-02 16:34:09 +08:00
Fu Matthew 641b5310b0 fix NTU album module_app data 2013-01-02 16:04:11 +08:00
Fu Matthew b179668a9c Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu 2013-01-02 14:35:34 +08:00
Fu Matthew 32c6f17613 fix object auth. show error message if user try to do object auth in a wrong way. 2013-01-02 14:34:34 +08:00
Rueshyna 8a6f92b87b fixed announcement controller syntax error 2013-01-02 10:19:56 +08:00
Rueshyna 3875e8e79e Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu 
* 'ntu' of https://github.com/Rulingcom/orbit:
  Fix deleting links and files in bulletin
  Add lost file for widget option
 2013-01-02 10:10:53 +08:00
chris 9937b4ac9b Fix deleting links and files in bulletin 2012-12-31 18:03:13 +08:00
Fu Matthew ded1d9f44c Add lost file for widget option 2012-12-28 17:58:35 +08:00
Rueshyna 30f9295010 Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu 
* 'ntu' of https://github.com/Rulingcom/orbit:
  Remove I18n.locale for announcement front-end Fix counter in back-end edit
  gallery options
  Fix urls in tinymce source editor
  Changes for announcement widget style 1 and categories
  Changes for announcement widget style 2
  Fix orbit_front parser
  Fix counter front-end
  Fix site map and menu order
  Remove extra double quote in sub_menu Fix web link widget pagination
  Put back old tags (don't use the class ProtoTag)
  Add page counter
 2012-12-28 16:06:22 +08:00
chris 2d8400d1cc Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu 2012-12-28 15:34:24 +08:00