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
Rueshyna
0fa1b43f06
fixed empty name of member list
2012-12-19 15:28:49 +08:00
Rueshyna
fdae7e4a2c
Merge branch 'master' of https://github.com/Rulingcom/orbit
...
* 'master' of https://github.com/Rulingcom/orbit : (102 commits)
fixed fileview in english mode
all sections and sections megerd
Remove test
Change the design for the whole site form designs index
fixed fileview in english mode
all sections and sections megerd
Redirect to designs after buying template Randomise buy counts
fixed empty db bug
make factory girl file clean
stupid fix
section fixed and some other fixes
try to fix problem
fixed bug
scroll fixed...
fixed bug about co-author-relation
fixed bug about co-author-relation
fixed edit and new page of co-author
view update
current version
Add images to store
...
2012-12-19 15:06:57 +08:00
chris
f1c628f2d6
Merge branch 'publication'
2012-12-07 12:39:37 +08:00
chris
dc84023372
Merge branch 'publication' of github.com:Rulingcom/orbit into publication
2012-12-07 12:38:48 +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
acaf707900
Merge branch 'publication' of github.com:Rulingcom/orbit into publication
2012-12-07 11:22:06 +08:00
Harry Bomrah
ad8273d638
fixed fileview in english mode
2012-12-07 11:19:40 +08:00
chris
4d07b0753c
Merge branch 'publication' of github.com:Rulingcom/orbit into publication
2012-12-07 10:13:41 +08:00
Harry Bomrah
08b99011d0
all sections and sections megerd
2012-12-07 10:10:38 +08:00
chris
c74ead8318
Redirect to designs after buying template
...
Randomise buy counts
2012-12-07 09:07:49 +08:00
chris
a48690d4bf
Merge branches 'publication' and 'publication' of github.com:Rulingcom/orbit into publication
2012-12-07 04:21:41 +08:00
Rueshyna
1c7ddb4b29
fixed empty db bug
2012-12-07 04:21:27 +08:00