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
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
8815533075
correct pic file format
2013-01-03 18:32:32 +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
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
5d6279a9ea
fix calendar broken
2013-01-03 10:58:52 +08:00
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
10473af154
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
2013-01-02 17:53:00 +08:00
2c632551e5
fix preview filed after ad_banner created.
2013-01-02 17:51:53 +08:00
f67664df29
custom icon for msoffice
2013-01-02 17:35:21 +08:00
5f7453c3fb
generalization file type
2013-01-02 16:58:48 +08:00
f4692182c0
when mouse move to button of announcement file : image => preview pic, file => type
2013-01-02 16:34:38 +08:00
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
641b5310b0
fix NTU album module_app data
2013-01-02 16:04:11 +08:00
b179668a9c
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
2013-01-02 14:35:34 +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
8a6f92b87b
fixed announcement controller syntax error
2013-01-02 10:19:56 +08:00
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
9937b4ac9b
Fix deleting links and files in bulletin
2012-12-31 18:03:13 +08:00
ded1d9f44c
Add lost file for widget option
2012-12-28 17:58:35 +08:00
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
2d8400d1cc
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
2012-12-28 15:34:24 +08:00
61b0f94c04
Remove I18n.locale for announcement front-end
...
Fix counter in back-end edit
2012-12-28 15:34:04 +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
e8e7c38221
Changes for announcement widget style 1 and categories
2012-12-28 14:01:04 +08:00
455a27437d
Changes for announcement widget style 2
2012-12-28 13:47:30 +08:00
974a190eaf
Fix orbit_front parser
2012-12-28 11:51:56 +08:00
0a0298aaad
Fix counter front-end
2012-12-28 11:44:33 +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
c219792a13
fixed delete function of archive file
2012-12-28 10:02:16 +08:00
2a122c7f5c
Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu
...
* 'ntu' of https://github.com/Rulingcom/orbit :
Announcement widget: remove I18n.locale Add part_id in url
2012-12-27 17:55:19 +08:00
a7cf6dd694
reverse structure order
2012-12-27 17:54:52 +08:00
751d3b1220
Announcement widget: remove I18n.locale
...
Add part_id in url
2012-12-27 16:52:58 +08:00
3346f83923
Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu
...
* 'ntu' of https://github.com/Rulingcom/orbit :
Fix for page_part and widget back-end
regenerate pageparts
2012-12-27 16:49:50 +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
4db057e971
Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu
...
* 'ntu' of https://github.com/Rulingcom/orbit :
fix disappear widget inter block
make longer devise timeout
2012-12-27 15:28:01 +08:00
Fu Matthew
chris
Rueshyna