Fu Matthew
|
39f715319b
|
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
Conflicts:
lib/tasks/migrate.rake
|
2013-01-03 19:41:52 +08:00 |
|
Fu Matthew
|
a70110f787
|
make default widget works without init
|
2013-01-03 19:38:14 +08:00 |
chris
|
fa83dbf791
|
Fix order in structure
|
2013-01-03 19:15:08 +08:00 |
|
chris
|
5b289bc1d2
|
Fix old tags
|
2013-01-03 19:15:08 +08:00 |
|
Fu Matthew
|
1856d2395d
|
complete page error handler logic
|
2013-01-03 15:35:14 +08:00 |
Rueshyna
|
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 |
|
Rueshyna
|
cb3a9ea98b
|
change sub_menu to header in site setting
|
2013-01-03 14:46:02 +08:00 |
|
Fu Matthew
|
6da528ef98
|
show error message when trying to show a not existed page
|
2013-01-03 13:50:27 +08:00 |
|
Fu Matthew
|
5d6279a9ea
|
fix calendar broken
|
2013-01-03 10:58:52 +08:00 |
|
Fu Matthew
|
2c632551e5
|
fix preview filed after ad_banner created.
|
2013-01-02 17:51:53 +08:00 |
|
Fu Matthew
|
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 |
|
Fu Matthew
|
ded1d9f44c
|
Add lost file for widget option
|
2012-12-28 17:58:35 +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
|
455a27437d
|
Changes for announcement widget style 2
|
2012-12-28 13:47:30 +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
|
a7cf6dd694
|
reverse structure order
|
2012-12-27 17:54:52 +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 |
|
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 |
|
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 |
|
chris
|
507191426e
|
Fix submenu error
|
2012-12-21 14:56:12 +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 |
|
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 |
|
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 |
 Harry Bomrah
|
607a4f5acf
|
fixed fileview in english mode
|
2012-12-07 12:38:23 +08:00 |
|
Harry Bomrah
|
9dde79414d
|
all sections and sections megerd
|
2012-12-07 12:38:23 +08:00 |
|
chris
|
a1b1fc9d34
|
Remove test
|
2012-12-07 12:32:43 +08:00 |
|
chris
|
ff435a4af4
|
Change the design for the whole site form designs index
|
2012-12-07 12:14:31 +08:00 |
|
chris
|
c74ead8318
|
Redirect to designs after buying template
Randomise buy counts
|
2012-12-07 09:07:49 +08:00 |
|
Rueshyna
|
a84cb560a0
|
make factory girl file clean
|
2012-12-07 04:21:26 +08:00 |
|
Harry Bomrah
|
59c4080f0c
|
stupid fix
|
2012-12-07 04:21:26 +08:00 |
|
Harry Bomrah
|
da3f0b58f5
|
section fixed and some other fixes
|
2012-12-07 04:21:26 +08:00 |
|
Rueshyna
|
e87526d7bb
|
try to fix problem
|
2012-12-07 04:21:26 +08:00 |
|
Harry Bomrah
|
3d382fec6b
|
scroll fixed...
|
2012-12-07 04:21:26 +08:00 |