1c1839fc00
Remove useless code in de_image.rb
2013-01-09 21:17:50 +08:00
02e5e52159
Translation typo
...
Remove test values in ad_image form
Remove NeedReset
2013-01-09 21:17:50 +08:00
48ce2278d0
Update disable time when separated picker new or reset date
2013-01-09 21:17:50 +08:00
b49251afee
Date picker separated: reset time when reset date
2013-01-09 21:17:50 +08:00
1d405c3ffe
Add "tag" icon to orbit bar
2013-01-09 21:17:50 +08:00
d8f6ebb153
Fix icons
2013-01-09 21:17:50 +08:00
7434d36e9b
Ray's changes for icon size
2013-01-09 21:17:50 +08:00
933ac7b8fe
Ray's changes for icon css
2013-01-09 21:17:50 +08:00
41dff814fb
Change icons
2013-01-09 21:17:50 +08:00
d0f474c2ab
fix wrong i18n
2013-01-09 17:13:25 +08:00
5ab4bbd367
add ad_banner inner page,pic title.
2013-01-09 16:54:33 +08:00
bc031f34f6
move js file to relational module but have js require problem
2013-01-09 16:16:47 +08:00
97eb9e19f9
restore js,journal_pages.js,
2013-01-09 14:40:58 +08:00
614b6fde71
fix wrong html structure for announcement frontend
2013-01-09 12:13:55 +08:00
1d80b39dcb
Fix no responding when trying to access front end page
2013-01-09 11:23:18 +08:00
bc3cba5ebc
fixed journal type page
2013-01-09 10:57:52 +08:00
fac4faad6c
Change date picker
2013-01-09 05:18:16 +08:00
4938198357
modularized personal journal
2013-01-08 18:34:18 +08:00
96ef70aba4
move journal code to persional_journal modulaar
2013-01-08 18:34:18 +08:00
ded445aae3
amend file value to correct format
2013-01-08 18:25:30 +08:00
9c8bf1ffab
Change translation
2013-01-08 17:30:36 +08:00
9584d67b23
member roles edit
2013-01-08 16:58:01 +08:00
5b13c53ed9
Ika's changes in default_widget.css
2013-01-08 12:50:28 +08:00
66dafbb2a0
Put impressionist delayed job in a patch
2013-01-08 12:45:15 +08:00
e3d34263e3
Schedule job for tag_cloud
2013-01-08 12:36:50 +08:00
423e2ac54e
Update bootstrap version 2.2.2
2013-01-07 17:25:32 +08:00
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
7594e1b9a6
fix member has no module_app
2013-01-07 17:20:37 +08:00
b71ebb3982
clean default widget
2013-01-07 17:20:37 +08:00
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
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
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
4ee683aa9b
fixed desktop route
2013-01-07 16:38:02 +08:00
137beabde9
fix member has no module_app
2013-01-07 14:04:14 +08:00
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
abbecfbe2f
clean default widget
2013-01-07 12:09:36 +08:00
83935aaa60
Add translations
2013-01-07 10:42:17 +08:00
6c6bda988d
Add mobile version in site settings
2013-01-07 03:57:36 +08:00
37740adb24
Add mobile but remove news in it
2013-01-07 03:03:38 +08:00
9745bcf7f1
Remove mysql
2013-01-07 03:02:16 +08:00
c6111460f5
Fix album widget options
2013-01-07 00:40:43 +08:00
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
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
736bda0679
Add link to default widget (temporary)
2013-01-04 12:33:37 +08:00
529197eb8c
Merge branch 'default_widget' of github.com:Rulingcom/orbit into default_widget
2013-01-04 12:31:32 +08:00
ac6da1340a
Ika's fix for width
2013-01-04 12:31:12 +08:00
de2e57f681
Ika's fix for width
2013-01-04 12:19:24 +08:00
7e045959b6
Gallery i18n
2013-01-04 12:01:32 +08:00
b6f723d42d
Merge branch 'default_widget' of github.com:Rulingcom/orbit into default_widget
2013-01-04 11:56:09 +08:00
ea2d38b23b
Ika's changes for css default widgets
2013-01-04 11:54:58 +08:00
chris
Fu Matthew
Rueshyna
unknown
nccu