Matthew K. Fu JuYuan
|
49e6c33b57
|
Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config
Conflicts:
app/controllers/admin/object_auths_new_interface_controller.rb
app/views/layouts/_side_bar_content.html.erb
config/locales/zh_tw.yml
config/routes.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/init.rb
vendor/built_in_modules/archive/init.rb
vendor/built_in_modules/miss_module/config/locales/zh_tw.yml
|
2012-12-25 11:01:36 +08:00 |
Matthew K. Fu JuYuan
|
062ebecae3
|
fix serval bugs on sidebar.
|
2012-12-24 16:39:53 +08:00 |
Matthew K. Fu JuYuan
|
2c69590c36
|
rename of GPRS
now it's named location
|
2012-12-24 16:39:53 +08:00 |
Matthew K. Fu JuYuan
|
397729d3a1
|
Remove GPRS
|
2012-12-24 16:39:53 +08:00 |
Matthew K. Fu JuYuan
|
53afb6ea0c
|
sidebar rewrited
|
2012-12-24 16:39:53 +08:00 |
Matthew K. Fu JuYuan
|
5f712622ad
|
default widgets and sidebar.
|
2012-12-24 16:38:35 +08:00 |
Matthew K. Fu JuYuan
|
6995bb1622
|
put module app json into init,making orbit app work with module app.
|
2012-12-24 16:23:16 +08:00 |
Matthew K. Fu JuYuan
|
36f6a6fdd6
|
first version of confined sidebar render
|
2012-12-24 16:17:00 +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 |
Matthew K. Fu JuYuan
|
858e942da2
|
fix serval bugs on sidebar.
|
2012-12-07 12:40:47 +08:00 |
Matthew K. Fu JuYuan
|
bd743a0ca5
|
rename of GPRS
now it's named location
|
2012-12-07 12:40:21 +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 |
Matthew K. Fu JuYuan
|
e07fb7d434
|
Remove GPRS
|
2012-12-07 12:36:25 +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 |
Rueshyna
|
39b5959de7
|
fixed bug about co-author-relation
|
2012-12-07 04:21:26 +08:00 |
devin
|
89e25fe7a2
|
view update
|
2012-12-07 04:21:26 +08:00 |
chris
|
af381e75de
|
Add images to store
|
2012-12-07 02:37:05 +08:00 |
chris
|
6f1748d2b3
|
- template list/show is loaded from central server
- buy a template downloads and creates it in DB
- changes in designs index
|
2012-12-06 23:20:27 +08:00 |
OrbitServer
|
b1f2749000
|
Devin's changes to integrate the store
|
2012-12-06 23:11:23 +08:00 |
OrbitServer
|
fbed496034
|
Harry's changes in i18n
|
2012-12-06 23:08:13 +08:00 |
devin
|
5d76600154
|
view update
|
2012-12-06 07:59:44 +08:00 |
devin
|
756bfa563b
|
view update
|
2012-12-06 07:59:44 +08:00 |
devin
|
22c0eabca5
|
view update
|
2012-12-06 07:59:44 +08:00 |
Harry Bomrah
|
3d1fb48489
|
edit coauthor relation done
|
2012-12-06 07:59:44 +08:00 |
Rueshyna
|
4681f0ee36
|
sort co_author name
|
2012-12-06 07:59:44 +08:00 |
Rueshyna
|
6d08ca996f
|
add back buton in relation page
|
2012-12-06 07:59:44 +08:00 |
Rueshyna
|
b4a99e58cf
|
sort author email
|
2012-12-06 07:59:44 +08:00 |
devin
|
59c0cdd761
|
view update
not finish all required pages yet
|
2012-12-06 07:59:43 +08:00 |
Rueshyna
|
b89e371393
|
can update co-author relation
|
2012-12-06 07:59:43 +08:00 |
devin
|
a0cce2ae0d
|
view update
|
2012-12-06 07:59:43 +08:00 |
Rueshyna
|
e7fdac1d23
|
make coauthor relation can be edit
|
2012-12-06 07:59:43 +08:00 |
devin
|
8d110cce91
|
view update
|
2012-12-06 07:59:43 +08:00 |
devin
|
d413f705a4
|
view update
|
2012-12-06 07:59:43 +08:00 |
devin
|
363ccdde4d
|
view update
|
2012-12-06 07:59:43 +08:00 |