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
|
4d965d754b
|
Fix urls in tinymce source editor
|
2012-12-28 15:03:02 +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
|
974a190eaf
|
Fix orbit_front parser
|
2012-12-28 11:51:56 +08:00 |
|
chris
|
0a0298aaad
|
Fix counter front-end
|
2012-12-28 11:44:33 +08:00 |
|
chris
|
37309a452d
|
Fix site map and menu order
|
2012-12-28 11:37:37 +08:00 |
|
chris
|
17d93409b3
|
Remove extra double quote in sub_menu
Fix web link widget pagination
|
2012-12-28 11:10:33 +08:00 |
|
chris
|
bab8328029
|
Put back old tags (don't use the class ProtoTag)
|
2012-12-28 10:43:48 +08:00 |
|
chris
|
ec96a2e0e7
|
Add page counter
|
2012-12-28 10:36:18 +08:00 |
Rueshyna
|
1c07224694
|
fixed page_parts submit button
|
2012-12-28 10:12:17 +08:00 |
|
Rueshyna
|
c219792a13
|
fixed delete function of archive file
|
2012-12-28 10:02:16 +08:00 |
 Harry Bomrah
|
37f8c1637a
|
new desktop framework updates
|
2012-12-27 18:25:54 +08:00 |
|
Rueshyna
|
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 |
|
Rueshyna
|
a7cf6dd694
|
reverse structure order
|
2012-12-27 17:54:52 +08:00 |
|
chris
|
751d3b1220
|
Announcement widget: remove I18n.locale
Add part_id in url
|
2012-12-27 16:52:58 +08:00 |
|
Rueshyna
|
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 |
|
chris
|
269e5b033f
|
Fix for page_part and widget back-end
|
2012-12-27 16:20:40 +08:00 |
|
Fu Matthew
|
2d6b70b97f
|
regenerate pageparts
|
2012-12-27 15:50:05 +08:00 |
|
Rueshyna
|
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
|
2901b8e30c
|
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
|
2012-12-27 15:06:19 +08:00 |
|
Fu Matthew
|
2dd0f9a9d2
|
fix disappear widget inter block
|
2012-12-27 15:06:01 +08:00 |
|
Fu Matthew
|
0655baab19
|
make longer devise timeout
|
2012-12-27 15:05:53 +08:00 |
|
Rueshyna
|
9e07794cbc
|
soft structure order
|
2012-12-27 14:37:29 +08:00 |
|
Rueshyna
|
34ed8ae39c
|
Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu
* 'ntu' of https://github.com/Rulingcom/orbit:
Preventing site default design being deleted.
|
2012-12-27 12:22:19 +08:00 |
|
Rueshyna
|
177a409508
|
fixed search_bar placeholder
|
2012-12-27 12:20:42 +08:00 |
|
Rueshyna
|
81b0e3c38f
|
change ActiveSupport::SecureRandom to SecureRandom in orbit core
|
2012-12-27 12:19:42 +08:00 |
|
Fu Matthew
|
cfb65dd056
|
Preventing site default design being deleted.
|
2012-12-27 10:26:27 +08:00 |
Matthew K. Fu JuYuan
|
71fc85c24e
|
fix widget.
|
2012-12-26 19:01:17 +08:00 |
|
Matthew K. Fu JuYuan
|
194b42c1e4
|
fix widget from post method
|
2012-12-24 15:22:26 +08:00 |
|
Matthew K. Fu JuYuan
|
b89cd80800
|
fix widget bug
|
2012-12-24 14:04:32 +08:00 |
|
chris
|
8381941d51
|
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
|
2012-12-21 18:36:01 +08:00 |
|
chris
|
e1a3201830
|
Fix multiple pop-ups in structure delete
|
2012-12-21 18:34:13 +08:00 |
|
chris
|
507191426e
|
Fix submenu error
|
2012-12-21 14:56:12 +08:00 |
nccu
|
68266e17ed
|
Update Gemfile for rails 3.2
|
2012-12-20 20:18:33 +08:00 |
|
chris
|
3c79200c2f
|
Fix wrong deletion in parser for gallery
|
2012-12-20 16:02:03 +08:00 |
|
chris
|
e9815c3d9b
|
Fix css bug when precompiling assets
|
2012-12-20 14:34:02 +08:00 |
|
chris
|
fc076a28bd
|
Remove useless css
|
2012-12-20 13:53:28 +08:00 |
|
chris
|
d827fbc852
|
Comment out desktop links
|
2012-12-19 21:32:55 +08:00 |
|
chris
|
cf91139b84
|
Merge branch 'member_data' of github.com:Rulingcom/orbit into member_data
|
2012-12-19 20:22:25 +08:00 |
|
Rueshyna
|
b4633a2ccb
|
.not_guest_user
|
2012-12-19 19:48:13 +08:00 |
|
Rueshyna
|
3d39c2c3c3
|
hidden guest user
|
2012-12-19 19:48:13 +08:00 |
|
Rueshyna
|
ec1fad9729
|
fixed empty name of member list
|
2012-12-19 19:48:13 +08:00 |
|
Rueshyna
|
1372f51e75
|
.not_guest_user
|
2012-12-19 18:51:17 +08:00 |
|
chris
|
83fb5230a4
|
Changes for site map front end indentation
|
2012-12-19 17:26:38 +08:00 |
|
chris
|
fcbba6660b
|
Only one parser for front end
Separate site map for i18n
|
2012-12-19 17:15:31 +08:00 |
|
Rueshyna
|
6035428422
|
hidden guest user
|
2012-12-19 16:46:01 +08:00 |