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
1d80b39dcb
Fix no responding when trying to access front end page
2013-01-09 11:23:18 +08:00
fac4faad6c
Change date picker
2013-01-09 05:18:16 +08:00
5b13c53ed9
Ika's changes in default_widget.css
2013-01-08 12:50:28 +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
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
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
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
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
736bda0679
Add link to default widget (temporary)
2013-01-04 12:33:37 +08:00
ac6da1340a
Ika's fix for width
2013-01-04 12:31:12 +08:00
ea2d38b23b
Ika's changes for css default widgets
2013-01-04 11:54:58 +08:00
3e8b029c5f
change bulletin object to bulletin title
2013-01-04 10:50:08 +08:00
49e289e0fd
fixing default widget error when needs image
2013-01-03 20:07:05 +08:00
39f715319b
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
...
Conflicts:
lib/tasks/migrate.rake
2013-01-03 19:41:52 +08:00
a70110f787
make default widget works without init
2013-01-03 19:38:14 +08:00
fa83dbf791
Fix order in structure
2013-01-03 19:15:08 +08:00
5b289bc1d2
Fix old tags
2013-01-03 19:15:08 +08:00
1856d2395d
complete page error handler logic
2013-01-03 15:35:14 +08:00
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
cb3a9ea98b
change sub_menu to header in site setting
2013-01-03 14:46:02 +08:00
6da528ef98
show error message when trying to show a not existed page
2013-01-03 13:50:27 +08:00
5d6279a9ea
fix calendar broken
2013-01-03 10:58:52 +08:00
2c632551e5
fix preview filed after ad_banner created.
2013-01-02 17:51:53 +08:00
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
ded1d9f44c
Add lost file for widget option
2012-12-28 17:58:35 +08:00
5587e83419
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
2012-12-28 15:31:32 +08:00
baf1240b76
gallery options
2012-12-28 15:30:46 +08:00
4d965d754b
Fix urls in tinymce source editor
2012-12-28 15:03:02 +08:00
455a27437d
Changes for announcement widget style 2
2012-12-28 13:47:30 +08:00
37309a452d
Fix site map and menu order
2012-12-28 11:37:37 +08:00
17d93409b3
Remove extra double quote in sub_menu
...
Fix web link widget pagination
2012-12-28 11:10:33 +08:00
bab8328029
Put back old tags (don't use the class ProtoTag)
2012-12-28 10:43:48 +08:00
ec96a2e0e7
Add page counter
2012-12-28 10:36:18 +08:00
1c07224694
fixed page_parts submit button
2012-12-28 10:12:17 +08:00
Harry Bomrah
37f8c1637a
new desktop framework updates
2012-12-27 18:25:54 +08:00
a7cf6dd694
reverse structure order
2012-12-27 17:54:52 +08:00
269e5b033f
Fix for page_part and widget back-end
2012-12-27 16:20:40 +08:00
2d6b70b97f
regenerate pageparts
2012-12-27 15:50:05 +08:00
chris
Fu Matthew
Rueshyna
nccu
Harry Bomrah