Commit Graph

812 Commits

Author SHA1 Message Date
Fu Matthew 91afad23ba Merge branch 'new_widget_setting_interface' 2013-01-15 12:03:56 +08:00
Fu Matthew 8413e31048 add i18n 2013-01-15 10:25:55 +08:00
unknown 504f5027cc member role edit 2013-01-14 19:00:08 +08:00
Rueshyna da283e136b correct personal journal language, but now hava no language config 2013-01-14 17:54:53 +08:00
Rueshyna 1b6bfdb80f modularize personal journal and pull relational setting in desktop/index.rb 2013-01-14 17:54:52 +08:00
Rueshyna 68e14a7898 move js file to relational module but have js require problem 2013-01-14 17:54:52 +08:00
Rueshyna 919f951981 restore js,journal_pages.js, 2013-01-14 17:54:52 +08:00
Rueshyna a183ac6041 fixed journal type page 2013-01-14 17:54:52 +08:00
Rueshyna bf31d0c3dd modularized personal journal 2013-01-14 17:54:52 +08:00
Rueshyna 758cab5ecd move journal code to persional_journal modulaar 2013-01-14 17:53:59 +08:00
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 41dff814fb Change icons 2013-01-09 21:17:50 +08:00
Fu Matthew 614b6fde71 fix wrong html structure for announcement frontend 2013-01-09 12:13:55 +08:00
chris fac4faad6c Change date picker 2013-01-09 05:18:16 +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
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 7e045959b6 Gallery i18n 2013-01-04 12:01:32 +08:00
Rueshyna 8815533075 correct pic file format 2013-01-03 18:32:32 +08:00
Fu Matthew 5d6279a9ea fix calendar broken 2013-01-03 10:58:52 +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 8a6f92b87b fixed announcement controller syntax error 2013-01-02 10:19:56 +08:00
chris 9937b4ac9b Fix deleting links and files in bulletin 2012-12-31 18:03:13 +08:00
chris 2d8400d1cc Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu 2012-12-28 15:34:24 +08:00
chris 61b0f94c04 Remove I18n.locale for announcement front-end
Fix counter in back-end edit
2012-12-28 15:34:04 +08:00
Fu Matthew 5587e83419 Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu 2012-12-28 15:31:32 +08:00
Fu Matthew baf1240b76 gallery options 2012-12-28 15:30:46 +08:00
chris e8e7c38221 Changes for announcement widget style 1 and categories 2012-12-28 14:01:04 +08:00
chris 455a27437d Changes for announcement widget style 2 2012-12-28 13:47:30 +08:00
chris 17d93409b3 Remove extra double quote in sub_menu
Fix web link widget pagination
2012-12-28 11:10:33 +08:00
Rueshyna c219792a13 fixed delete function of archive file 2012-12-28 10:02:16 +08:00
chris 751d3b1220 Announcement widget: remove I18n.locale
Add part_id in url
2012-12-27 16:52:58 +08:00
chris e9815c3d9b Fix css bug when precompiling assets 2012-12-20 14:34:02 +08:00
Rueshyna b4633a2ccb .not_guest_user 2012-12-19 19:48:13 +08:00
chris fcbba6660b Only one parser for front end
Separate site map for i18n
2012-12-19 17:15:31 +08:00
OrbitServer fbed496034 Harry's changes in i18n 2012-12-06 23:08:13 +08:00
Rueshyna 4a8878132e add content for announcement rss 2012-12-06 07:59:42 +08:00
chris 2983b181e6 Fix some translations 2012-12-04 01:03:28 +08:00
Rueshyna eb97d417bd if coauthor not in coauthor db then it will be add in db 2012-12-04 00:31:06 +08:00
chris dc3be3c9a1 Translation changes 2012-12-03 23:00:04 +08:00
chris 390da0e49a Change icons 2012-11-29 00:49:53 +08:00
Rueshyna 114ca5493a replace rss format with json in announcement 2012-11-28 13:43:48 +08:00
chris 6a12aec67c Fix album images display 2012-11-22 20:01:10 +08:00
chris 475642d375 Remove news and fix default_url in ImageUploader 2012-11-22 09:30:25 +08:00
devin 25a9987f13 calendar js minor update 2012-11-21 19:02:54 +08:00
chris 2d0e8b37b2 Fix:
- Widgets for announcement
  - Facebook link
  - AdBanner nav
2012-11-21 18:42:14 +08:00