chris
423e2ac54e
Update bootstrap version 2.2.2
2013-01-07 17:25:32 +08:00
Fu Matthew
7594e1b9a6
fix member has no module_app
2013-01-07 17:20:37 +08:00
Fu Matthew
b71ebb3982
clean default widget
2013-01-07 17:20:37 +08:00
Fu Matthew
5793f0fe5d
default widget link.
...
make sure to run
rake migrate:make_default_widget_work_config
for changing announcement module app
2013-01-07 17:20:37 +08:00
Rueshyna
a34da20e48
Merge branch 'master' into desktop
...
* master: (57 commits)
Add translations
Add mobile version in site settings
Add mobile but remove news in it
Remove mysql
Fix album widget options
Fix link for ad_banner Add missing helper for web_link_category Show design's js in front-end
Add link to default widget (temporary)
Ika's fix for width
Ika's fix for width
Gallery i18n
Ika's changes for css default widgets
Ika's changes for css default widgets
change bulletin object to bulletin title
fixing default widget error when needs image
make default widget works without init
Fix order in structure
Fix old tags
correct pic file format
complete page error handler logic
change sub_menu to header in site setting
...
2013-01-07 16:44:05 +08:00
Rueshyna
35e0011111
Merge remote-tracking branch 'remotes/origin/publication' into desktop
...
* remotes/origin/publication:
new desktop framework updates
2013-01-07 12:44:30 +08:00
chris
6c6bda988d
Add mobile version in site settings
2013-01-07 03:57:36 +08:00
chris
37740adb24
Add mobile but remove news in it
2013-01-07 03:03:38 +08:00
chris
c6111460f5
Fix album widget options
2013-01-07 00:40:43 +08:00
chris
be00cec4d7
Fix link for ad_banner
...
Add missing helper for web_link_category
Show design's js in front-end
2013-01-07 00:36:48 +08:00
chris
736bda0679
Add link to default widget (temporary)
2013-01-04 12:33:37 +08:00
nccu
ac6da1340a
Ika's fix for width
2013-01-04 12:31:12 +08:00
nccu
ea2d38b23b
Ika's changes for css default widgets
2013-01-04 11:54:58 +08:00
Rueshyna
3e8b029c5f
change bulletin object to bulletin title
2013-01-04 10:50:08 +08:00
Fu Matthew
49e289e0fd
fixing default widget error when needs image
2013-01-03 20:07:05 +08:00
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
Harry Bomrah
37f8c1637a
new desktop framework updates
2012-12-27 18:25:54 +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
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
7ac6958690
Fix css bug when precompiling assets
2012-12-20 14:32:06 +08:00
chris
fc076a28bd
Remove useless css
2012-12-20 13:53:28 +08:00
chris
30268ab3bc
Remove useless css
2012-12-20 13:52:23 +08:00
chris
3a9106c10d
Add mobile but remove news in it
2012-12-20 03:21:50 +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
Harry Bomrah
ad8273d638
fixed fileview in english mode
2012-12-07 11:19:40 +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
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
Rueshyna
633a68675a
make factory girl file clean
2012-12-06 22:37:42 +08:00
Harry Bomrah
c2285a34f6
stupid fix
2012-12-06 18:50:24 +08:00
Harry Bomrah
8094ddc967
section fixed and some other fixes
2012-12-06 17:43:19 +08:00
Rueshyna
7430a05782
try to fix problem
2012-12-06 16:24:40 +08:00
Harry Bomrah
df4a9a5dff
scroll fixed...
2012-12-06 15:44:16 +08:00
Rueshyna
54de86eeb4
fixed bug about co-author-relation
2012-12-06 15:20:06 +08:00
devin
6a47fc8d62
view update
2012-12-06 11:43:40 +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
Harry Bomrah
79dc99d431
br fixed
2012-12-06 07:59:43 +08:00
devin
936101358c
journal update
2012-12-06 07:59:43 +08:00
devin
2aa077bc85
journal list
2012-12-06 07:59:43 +08:00
devin
d03f5dc1ff
view update
2012-12-06 07:59:43 +08:00
Rueshyna
4ae7ac8388
clean route table about desktop
2012-12-06 07:59:42 +08:00
Rueshyna
6c33d353ba
make journal list easy to read
2012-12-06 07:59:42 +08:00
Rueshyna
05027afa63
make journal list easy to read
2012-12-06 07:59:42 +08:00
Rueshyna
4f31b1362b
fixed new co-author relation bug....
2012-12-06 07:59:42 +08:00
Rueshyna
1289ad9f9d
fixed co-author relation bug....
2012-12-06 07:59:42 +08:00
Rueshyna
afd8e7e380
when delete co-author relation, the co-author will be reset nil
2012-12-06 07:59:42 +08:00
Rueshyna
09c59c4e03
midify button type
2012-12-06 07:59:42 +08:00
Rueshyna
21b1432f7f
change settings table default display
2012-12-06 07:59:42 +08:00
Rueshyna
e0e1c30f68
delete onside widget in db
2012-12-06 07:59:42 +08:00
unknown
7d3c535e01
add info field
2012-12-06 07:58:39 +08:00
Matthew K. Fu JuYuan
99f28a0cba
sidebar rewrited
2012-12-05 18:35:58 +08:00
chris
e68c52bc00
Changes for store back-end
2012-12-05 13:46:10 +08:00
Matthew K. Fu JuYuan
ca290f3519
Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config
...
Conflicts:
app/views/layouts/_side_bar_content.html.erb
config/locales/zh_tw.yml
config/mongoid.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/init.rb
2012-12-05 11:36:32 +08:00
chris
9a79e432dd
Fix typo
2012-12-04 01:12:15 +08:00
chris
2983b181e6
Fix some translations
2012-12-04 01:03:28 +08:00
Harry Bomrah
c6e0b56012
stupid bug fixed
2012-12-04 00:31:46 +08:00
Rueshyna
58e71c29b3
uniq relation
2012-12-04 00:31:46 +08:00
Rueshyna
9759a32394
can display relation between author
2012-12-04 00:31:46 +08:00
Rueshyna
f89a6194c4
add back button
2012-12-04 00:31:46 +08:00
Harry Bomrah
49d1ca6997
new type fixed
2012-12-04 00:31:46 +08:00
Rueshyna
5d6dd8cded
separate relation list from index page and render it
2012-12-04 00:31:46 +08:00
Rueshyna
e143f9a345
can select relection from relation db
2012-12-04 00:31:46 +08:00
Harry Bomrah
0e6c75e677
form for coauthor - fixed
2012-12-04 00:31:07 +08:00
Rueshyna
0affc73370
modify delete co-author message
2012-12-04 00:31:07 +08:00
Harry Bomrah
a6a50227eb
new type fixed
2012-12-04 00:31:07 +08:00
Harry Bomrah
f7f55850fe
coauthor edit and destroy fixed
2012-12-04 00:31:07 +08:00
Rueshyna
7822ffc33d
can add relation between co-author
2012-12-04 00:31:06 +08:00
Rueshyna
5dabfe9319
refine co-authro page
2012-12-04 00:31:06 +08:00
Rueshyna
5986817e16
add journal_list. now, those pair, (journal_title, journal_levels), is uniq
2012-12-04 00:31:06 +08:00
Rueshyna
b1ddc9950a
adjust update password textfield position
2012-12-04 00:31:06 +08:00
Rueshyna
184f903b1c
correct user passwd and sent json to front-end
2012-12-04 00:31:06 +08:00
Rueshyna
8a7ae3f061
correct user passwd and sent json to front-end
2012-12-04 00:31:06 +08:00
Rueshyna
eb97d417bd
if coauthor not in coauthor db then it will be add in db
2012-12-04 00:31:06 +08:00
Rueshyna
7f7b33f310
fixed journal update method
2012-12-04 00:31:06 +08:00
Harry Bomrah
ee830f148e
jumping menus updated..
2012-12-04 00:30:10 +08:00
Rueshyna
6426fb74d9
remove edit page cancel buttom
2012-12-04 00:25:58 +08:00
Harry Bomrah
d70ef4666b
delete fixed..
2012-12-04 00:25:58 +08:00
Harry Bomrah
43a9f231a6
multiple file fixed
2012-12-04 00:25:58 +08:00
Rueshyna
d806e8cf82
have done multiple file
2012-12-04 00:25:58 +08:00
Rueshyna
4a0cc61852
can add multiple file
2012-12-04 00:25:58 +08:00
Rueshyna
5a9d9151d9
add journal list template
2012-12-04 00:25:58 +08:00
chris
dc3be3c9a1
Translation changes
2012-12-03 23:00:04 +08:00
chris
9c6c622a49
Add missing icons and css for icons in layout
2012-12-03 22:31:00 +08:00
chris
9254b9960d
Add timeout to user
2012-12-03 21:45:00 +08:00
Matthew K. Fu JuYuan
4bc80f2bd3
default widgets and sidebar.
2012-12-03 18:52:36 +08:00
chris
4f9aa63045
Remove extra end
2012-12-03 18:45:32 +08:00
chris
5c7f1aa164
Fix saving of page_part after layout change
2012-12-03 18:42:50 +08:00
chris
2757044c32
Forgot to save the page_parts
2012-12-03 17:49:26 +08:00
chris
bdcfb46294
Fix previous commit
2012-12-03 17:38:55 +08:00
chris
6543491a53
Save pages to generate page_parts when a layout is updated
2012-12-03 17:25:27 +08:00
Matthew K. Fu JuYuan
f9bcb27efc
put module app json into init,making orbit app work with module app.
2012-11-29 14:21:46 +08:00
chris
036d7bbb0e
Module store
2012-11-29 02:02:37 +08:00
chris
06335f9bd1
Joshua's html
2012-11-29 00:59:46 +08:00
chris
390da0e49a
Change icons
2012-11-29 00:49:53 +08:00
Rueshyna
9e2d6cfcdd
add quick link to change user password, but it's not work
2012-11-28 23:44:43 +08:00
Rueshyna
6ed1dd0cc6
change template
2012-11-28 23:43:39 +08:00
Rueshyna
7853aec886
Merge branch 'publication' into multiple_file_upload
...
* publication:
url fixed and edit form fixed for tinyscrollbar
2012-11-28 18:19:06 +08:00
Rueshyna
6d159a3a9e
add templete
2012-11-28 18:12:37 +08:00
Rueshyna
254a81fa5d
add templete
2012-11-28 18:12:21 +08:00
Harry Bomrah
2f67a96532
url fixed and edit form fixed for tinyscrollbar
2012-11-28 18:12:00 +08:00
Rueshyna
25324809bb
add account link
2012-11-28 14:42:15 +08:00
Harry Bomrah
9cc518b456
autocomplete done
2012-11-27 15:55:32 +08:00
Matthew K. Fu JuYuan
3d573680b2
Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config
...
Conflicts:
app/models/user/attribute_value.rb
app/views/layouts/_side_bar_content.html.erb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-11-26 17:55:53 +08:00
Rueshyna
c9e3d5271a
remove '"' candidate list
2012-11-26 16:06:22 +08:00
Rueshyna
0125010a05
modified error msgs and cancle button, but those two have bug...
2012-11-26 15:45:51 +08:00
Rueshyna
065d38c797
add autocomplete js
2012-11-26 14:44:35 +08:00
unknown
8a79d7ff2e
member selects
2012-11-26 10:25:34 +08:00
Rueshyna
9061448c5f
add paper status textfield
2012-11-26 10:23:50 +08:00
Matthew K. Fu JuYuan
9a684f54b4
fix for showing subroles
2012-11-26 10:22:36 +08:00
chris
1e89c30150
Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP
2012-11-26 05:02:58 +08:00
Harry Bomrah
3933c048b0
delete fixed
2012-11-23 13:22:01 +08:00
Rueshyna
8009c6aa34
fixed delete function
2012-11-23 12:28:36 +08:00
Rueshyna
e06495d4ad
Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP
...
* 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit :
delete update
2012-11-23 10:50:10 +08:00
Harry Bomrah
f38f32ac8b
delete update
2012-11-23 10:46:42 +08:00
Rueshyna
996a69f595
add co-author json
2012-11-23 10:44:48 +08:00
Matthew K. Fu JuYuan
5b39d10ac6
user roles starts
2012-11-22 21:10:35 +08:00
Matthew K. Fu JuYuan
77386f0284
disable data transform when switching attribute field type. new member stable
2012-11-22 21:10:35 +08:00
Rueshyna
f6d3b4a9e9
correct 'edit' button of journal list
2012-11-22 21:06:31 +08:00
Harry Bomrah
868d1c2201
fix for json and some other bugs
2012-11-22 21:06:30 +08:00
Rueshyna
e29583ed1f
add delete link
2012-11-22 21:06:30 +08:00
Rueshyna
78500e0661
fixed add journal and co-author curd problem, but have redirect problem...
2012-11-22 21:06:30 +08:00
Rueshyna
c281ae9447
hidden file field, and fixed updated function
2012-11-22 21:06:30 +08:00
Rueshyna
9189ebffee
correct 'edit' button of journal list
2012-11-22 18:15:07 +08:00
Harry Bomrah
90fd9de5a8
fix for json and some other bugs
2012-11-22 16:31:52 +08:00
Rueshyna
e453cfce9c
add delete link
2012-11-22 15:21:43 +08:00
Rueshyna
c0ac69fc84
Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP
...
* 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit :
calendar js minor update
Fix: - Widgets for announcement - Facebook link - AdBanner nav
visitor now can browse gallery
routes fixed
small fix for journal_pages desktop
new file created for journal pages
tmp
add co-author db and curd page, but it can't destory it...
add co-author page and new it, but can't destory it...
visitor now can browse gallery
done add journals function
fix and hide for visitors,except for album
album and gallery is now opened
fixed sutpid bug for calendar
back button fix for frontend
fix and hide for visitors,except for album
calendar js minor update
minor update for gallery and calendar backend
2012-11-22 10:51:30 +08:00
Rueshyna
9e400e6e6a
fixed add journal and co-author curd problem, but have redirect problem...
2012-11-22 10:49:54 +08:00
chris
39adbb35c1
Remove before_filter for sub_manager in users
2012-11-22 09:37:31 +08:00
chris
475642d375
Remove news and fix default_url in ImageUploader
2012-11-22 09:30:25 +08:00
Rueshyna
bb69a059e8
hidden file field, and fixed updated function
2012-11-22 02:37:56 +08:00
chris
2d0e8b37b2
Fix:
...
- Widgets for announcement
- Facebook link
- AdBanner nav
2012-11-21 18:42:14 +08:00
chris
6ca52226ba
Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP
...
Conflicts:
app/views/desktop/journal_p.html.erb
2012-11-21 18:38:28 +08:00
Harry Bomrah
73e76f2477
routes fixed
2012-11-21 18:36:56 +08:00
Harry Bomrah
c53581c999
small fix for journal_pages desktop
2012-11-21 18:36:56 +08:00
Harry Bomrah
0b9af044ba
new file created for journal pages
2012-11-21 18:36:56 +08:00
Rueshyna
b47be52309
tmp
2012-11-21 18:36:56 +08:00
Rueshyna
d502f561ef
add co-author db and curd page, but it can't destory it...
2012-11-21 18:36:32 +08:00
Rueshyna
6a9426c9c8
add co-author page and new it, but can't destory it...
2012-11-21 18:36:32 +08:00
Rueshyna
5006cd2f61
done add journals function
2012-11-21 18:34:03 +08:00
Matthew K. Fu JuYuan
1279af0c11
fix and hide for visitors,except for album
2012-11-21 18:31:57 +08:00
Harry Bomrah
91005bb00a
routes fixed
2012-11-21 17:39:01 +08:00
Harry Bomrah
c94940214c
small fix for journal_pages desktop
2012-11-21 17:11:18 +08:00
Harry Bomrah
b571373c8f
new file created for journal pages
2012-11-21 15:35:23 +08:00
Rueshyna
5c0b137c6d
tmp
2012-11-21 14:52:26 +08:00
Rueshyna
da1b871481
merge
2012-11-21 10:46:33 +08:00
Harry Bomrah
8f65284932
Desktop updates various
2012-11-21 07:37:44 +08:00
Rueshyna
b359d5d566
some bugs
2012-11-21 07:37:44 +08:00
Rueshyna
703324063e
change journal list json link
2012-11-21 07:37:44 +08:00
Rueshyna
d7599f1ccf
add edit function
2012-11-21 07:37:43 +08:00
Rueshyna
a3edebce6a
midify checkbox value
2012-11-21 07:37:43 +08:00
Rueshyna
5eb8cc4063
finished some method of list and journal
2012-11-21 07:37:43 +08:00
Rueshyna
7e9b60a527
split form from add.html.erb
2012-11-21 07:37:43 +08:00
Rueshyna
fe373fad92
add.html convert to add.html.erb done
2012-11-21 07:37:43 +08:00
Rueshyna
ae10a2b8a2
convert html template to html.erb
2012-11-21 07:37:43 +08:00
Rueshyna
1c6badfb10
add more fake data
2012-11-21 07:37:43 +08:00
Rueshyna
b6004958c9
make it real
2012-11-21 07:37:43 +08:00
Rueshyna
bf4c75fcdc
add new function
2012-11-21 07:37:43 +08:00
Rueshyna
f93d019ba0
check file type
2012-11-21 07:37:42 +08:00
Rueshyna
61c0c4b542
modified file of view bug
2012-11-21 07:37:42 +08:00
Harry Bomrah
97ffb5ff18
file view update
2012-11-21 07:37:42 +08:00
Rueshyna
02643c12bf
modified getjournals format
2012-11-21 07:37:41 +08:00
Rueshyna
5643b0a528
delete demo db of journal and paper
2012-11-21 07:37:41 +08:00
Rueshyna
4ce10d2fd9
make a json format for view of journal_p
2012-11-21 07:37:41 +08:00
Rueshyna
95fc5676bf
add co-author db and curd page, but it can't destory it...
2012-11-21 01:56:30 +08:00
Rueshyna
ccfecb8243
add co-author page and new it, but can't destory it...
2012-11-21 01:54:06 +08:00
Matthew K. Fu JuYuan
96fe482d50
for openness
2012-11-20 20:20:59 +08:00
Matthew K. Fu JuYuan
c6894be962
first version of confined sidebar render
2012-11-20 15:56:52 +08:00
chris
6273300c28
Fix for ad_image
2012-11-20 15:47:07 +08:00
Rueshyna
95a3831dce
done add journals function
2012-11-20 14:58:15 +08:00
chris
7416020161
Add force_order_for_user for ad_images
2012-11-20 14:24:49 +08:00
chris
c8bbb28d42
Fix wrong alias in design.rb for themes
2012-11-20 12:46:50 +08:00
chris
84c284fa71
Fix wrong naming in theme.rb
2012-11-20 12:42:53 +08:00
chris
dcd781b36b
Restore "force_order_for_user" for ad_banner
2012-11-20 12:38:35 +08:00
chris
d61621e198
Remove some pry and add address code
2012-11-20 10:05:38 +08:00
chris
6789d44431
Fix design edit
2012-11-20 10:04:50 +08:00
Matthew K. Fu JuYuan
2aa9a19deb
complete address field. still have javascript issue for fill back and display address ext fields in modal.
2012-11-20 09:53:37 +08:00
Matthew K. Fu JuYuan
17988f2fb2
address field and text field convert
2012-11-20 09:53:37 +08:00
Matthew K. Fu JuYuan
a85e5fcc0d
address field. js and style is broken
2012-11-20 09:53:36 +08:00
Matthew K. Fu JuYuan
be448d42c9
add_more ok
2012-11-20 09:52:50 +08:00
Rueshyna
398432d0fc
some bugs
2012-11-19 16:28:05 +08:00
Rueshyna
db3797694b
change journal list json link
2012-11-19 12:13:05 +08:00
Rueshyna
8abb20b4c8
add edit function
2012-11-19 12:07:24 +08:00
Rueshyna
9501bf2df3
midify checkbox value
2012-11-18 14:15:00 +08:00
Rueshyna
26436395f5
finished some method of list and journal
2012-11-18 03:07:50 +08:00
Rueshyna
024b331cf3
split form from add.html.erb
2012-11-16 16:02:17 +08:00
Matthew K. Fu JuYuan
b4a2737407
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
...
Conflicts:
app/helpers/attribute_fields_helper.rb
app/views/admin/infos/_form.html.erb
config/locales/zh_tw.yml
2012-11-16 15:42:39 +08:00
Matthew K. Fu JuYuan
3034e53423
complete address field. still have javascript issue for fill back and display address ext fields in modal.
2012-11-16 15:36:08 +08:00
Rueshyna
e60480a4be
add.html convert to add.html.erb done
2012-11-16 15:33:31 +08:00
Rueshyna
b51397d2e2
convert html template to html.erb
2012-11-16 12:54:21 +08:00
Rueshyna
c85b15e425
rm binding.pre ...
2012-11-16 09:44:57 +08:00
Rueshyna
34f0eea1ff
add more fake data
2012-11-16 09:13:51 +08:00
Rueshyna
b998b8f346
make it real
2012-11-16 01:54:10 +08:00
Rueshyna
bf5a48ef4c
add new function
2012-11-16 01:53:45 +08:00
Rueshyna
3144b84d10
check file type
2012-11-15 22:39:01 +08:00
chris
69bf552fa7
Fix: remove i18n_variable from reload_frontend_pages.js.erb
2012-11-15 18:11:01 +08:00
chris
fb74d74c72
Fix:
...
- page_part not including items_helper
- categories for bulletins front-end
2012-11-15 18:01:49 +08:00
Matthew K. Fu JuYuan
995bdbc86c
address field and text field convert
2012-11-15 17:23:39 +08:00
chris
9b1ada0af9
Fix these bugs:
...
1.結構部份
a.原選單,點選編輯,無動作反應
b.新增選單後,左邊灰色架構部份不會更新
2.檔案室
a.無法編輯分類
2012-11-15 15:51:44 +08:00
Rueshyna
c627376fbe
modified file of view bug
2012-11-15 11:18:55 +08:00
Harry Bomrah
351767cd98
file view update
2012-11-14 21:12:10 +08:00
Rueshyna
529e2110d7
modified getjournals format
2012-11-14 17:27:36 +08:00
Rueshyna
11b602a1bf
delete demo db of journal and paper
2012-11-13 17:22:25 +08:00
Rueshyna
bfdd155c1e
make a json format for view of journal_p
2012-11-13 17:21:23 +08:00
Harry Bomrah
e498be9753
desktopAPI update.
2012-11-12 15:11:36 +08:00
Harry Bomrah
a56d80698f
desktop api update..
2012-11-12 15:11:36 +08:00
Matthew K. Fu JuYuan
39612b879c
address field. js and style is broken
2012-11-12 10:41:41 +08:00
Matthew K. Fu JuYuan
dafe28ffb5
add_more ok
2012-11-08 18:59:19 +08:00
chris
43d969a72b
Fix attribute_field_helper and comment admin in I18n
2012-11-06 17:51:42 +08:00
chris
23e86bfe31
Fix bug due to change of structure for stylesheet
2012-11-06 12:33:00 +08:00
chris
b40d4702d5
Merge branch 'master' into various_bugs
...
Conflicts:
config/locales/en.yml
config/locales/zh_tw.yml
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
2012-11-06 11:44:00 +08:00
Harry Bomrah
da5e7f670e
Desktop Widgtes updates..
2012-11-06 10:36:34 +08:00
Harry Bomrah
ca3e06c58b
update for desktop widgets
2012-11-05 11:40:11 +08:00
Harry Bomrah
2e809c5c19
Calander view updated...
2012-11-05 11:40:11 +08:00
chris
58d4554b0b
Fixing bugs
2012-11-05 11:30:15 +08:00
Matthew K. Fu JuYuan
e47465d4b7
add new member with role interface. add more not usable.
...
role management new attribute is ok. delete is ok.
2012-11-04 05:56:29 +08:00
chris
451d73897b
Fix bugs:
...
Page content: after edit and redirect to index, there's a gap between the headers and the first row
TinyMCE: the size of the textarea change depending on the language
2012-11-01 09:30:12 +08:00
chris
bc9082a858
Fix bug: Fix the bug due to not finding the ModuleApp
2012-10-30 17:10:59 +08:00
chris
cc5e238576
Fix after merge from NCCU, the translations still need to be cleaned
2012-10-30 11:08:26 +08:00
Matthew K. Fu JuYuan
664c6d2f61
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
...
Conflicts:
vendor/built_in_modules/personal_patent/app - %BDƻs/assets/images/personal_patent/.gitkeep
vendor/built_in_modules/personal_patent/app - %BDƻs/assets/javascripts/personal_patent/.gitkeep
vendor/built_in_modules/personal_patent/app - %BDƻs/assets/stylesheets/personal_patent/.gitkeep
vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/.gitkeep
vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/application_controller.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/tags_controller.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patent_categorys_controller.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patents_controller.00.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patents_controller.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/plugin/writing_patents_controller.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/helpers/.gitkeep
vendor/built_in_modules/personal_patent/app - %BDƻs/mailers/.gitkeep
vendor/built_in_modules/personal_patent/app - %BDƻs/models/.gitkeep
vendor/built_in_modules/personal_patent/app - %BDƻs/models/personal_patent_tag.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent_category.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent_file.rb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/.gitkeep
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/_form.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/_writing_patent_category.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/create.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/destroy.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/edit.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/index.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/new.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/update.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_filter.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form_file.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_list_writing_patent_category.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_sort_headers.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_writing_patent.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_writing_patent_category_qe.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/create_writing_patent_setting.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/destroy.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/edit.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/index.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/index.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/new.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/show.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/toggle_enable.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/update_writing_patent_setting.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_category_quick_add.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_category_quick_edit.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_setting.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_filter.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form_file.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_sort_headers.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_writing_patent.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/destroy.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/edit.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/index.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/index.js.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/new.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/show.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/toggle_enable.js.erb
2012-10-30 10:11:51 +08:00
chris
65ac6980c4
Merge branch 'various_bugs' into nccu_master
...
Conflicts:
Gemfile.lock
app/assets/javascripts/ajax_form.js.erb
app/assets/stylesheets/style.css.erb
app/controllers/application_controller.rb
app/controllers/sessions_controller.rb
app/helpers/admin/web_link_helper.rb
app/views/admin/attributes/_attribute_field.html.erb
app/views/admin/designs/_form.html.erb
app/views/admin/pages/_form.html.erb
app/views/admin/sites/_side_bar.html.erb
app/views/layouts/_orbit_bar.html.erb
app/views/layouts/_side_bar.html.erb
config/locales/en.yml
config/locales/zh_tw.yml
config/mongoid.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
2012-10-29 16:10:07 +08:00
chris
9b5f4e4775
Fix bug: User cannot connect using the orbit button (Devise configuration)
2012-10-26 17:42:14 +08:00
Matthew K. Fu JuYuan
bd0d975014
for user new interface, member role is working.
2012-10-26 11:27:37 +08:00
chris
b301f6522a
Merge branch 'design_update' of github.com:Rulingcom/orbit into design_update
2012-10-26 11:20:26 +08:00
chris
d7fd61ce55
Edit uploaded package
2012-10-26 11:19:57 +08:00
Matthew K. Fu JuYuan
0a1a9d2c2e
member for THU
2012-10-26 11:19:56 +08:00
chris
68bc4c1874
Fix page_part creation when design is changed
2012-10-26 11:19:56 +08:00
chris
cbfa659928
Changes for side_bar
2012-10-26 11:19:56 +08:00
Matthew K. Fu JuYuan
f4f07c7206
fix sub role attribute fields
...
run: Role.any_in(:key=>['department_admin','administrator']).destroy_all
for deleting old role data to complete this code.
2012-10-26 11:19:56 +08:00
Matthew K. Fu JuYuan
9c16da4f46
fixed html for add link. form html
2012-10-26 11:19:56 +08:00
Matthew K. Fu JuYuan
03b608593d
can add member
2012-10-26 11:19:56 +08:00
Matthew K. Fu JuYuan
0a56c555bb
new code for attribute fields and values for new member interface
2012-10-26 11:19:56 +08:00
Matthew K. Fu JuYuan
8b9cffd4f2
new code for attribute fields and values for new member interface
2012-10-26 11:19:55 +08:00
Harry Bomrah
a5722af315
Calendar updates for day view
2012-10-26 11:15:37 +08:00
chris
2b2dd53218
Edit uploaded package
2012-10-24 18:40:38 +08:00
Matthew K. Fu JuYuan
1b876d4305
for user new interface, member role is working.
2012-10-24 14:46:25 +08:00
chris
d1797ac8e3
Fix page_part creation when design is changed
2012-10-18 18:50:46 +08:00
Matthew K. Fu JuYuan
13ae2602cd
member for THU
2012-10-18 18:36:21 +08:00
Matthew K. Fu JuYuan
a50ccdafb2
consolidate_object_auth for 171 production
2012-10-16 15:08:02 +08:00
Matthew K. Fu JuYuan
b3a9a7ab07
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-10-16 14:24:01 +08:00
Matthew K. Fu JuYuan
6dfe10040b
fix object auth without app_auth
2012-10-16 14:23:44 +08:00
chris
afff128e9c
Fix page_part creation when design is changed
2012-10-16 14:15:33 +08:00
chris
f7f0b48707
Merge branch 'master' of github.com:Rulingcom/NCCU
...
Conflicts:
config/initializers/resque.rb
2012-10-16 14:14:56 +08:00
chris
0babd5f302
Changes for side_bar
2012-10-15 15:30:48 +08:00
chris
fe183c316f
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
2012-10-15 14:46:13 +08:00
Matthew K. Fu JuYuan
84929f9b4c
fix sub role attribute fields
...
run: Role.any_in(:key=>['department_admin','administrator']).destroy_all
for deleting old role data to complete this code.
2012-10-15 14:44:48 +08:00
chris
5913f73850
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
2012-10-15 14:09:58 +08:00
Matthew K. Fu JuYuan
31b583228d
fixed html for add link. form html
2012-10-15 14:07:53 +08:00
chris
334e5b464c
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
2012-10-15 13:56:16 +08:00
Matthew K. Fu JuYuan
7901de7b31
can add member
2012-10-15 13:54:29 +08:00
chris
c511600cad
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
2012-10-15 12:35:27 +08:00
Matthew K. Fu JuYuan
9027562450
new code for attribute fields and values for new member interface
2012-10-15 12:35:07 +08:00
Matthew K. Fu JuYuan
b5571dbc43
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
...
Conflicts:
app/controllers/admin/users_new_interface_controller.rb
app/views/admin/users_new_interface/show.html.erb
2012-10-12 18:17:05 +08:00
Matthew K. Fu JuYuan
1ce7f00084
new code for attribute fields and values for new member interface
2012-10-12 18:09:02 +08:00
chris
189fa553c5
Changes for helpers, not including all by default
2012-10-09 14:47:16 +08:00
OrbitServer
9e2bc7e1c1
Ray's changes in css and js
2012-10-09 07:48:05 +08:00
Harry Bomrah
d2fea92969
GPRS and CALENDAR
2012-10-09 06:42:00 +08:00
Matthew K. Fu JuYuan
9f825de288
user new interface 70%
2012-10-09 06:40:18 +08:00
Matthew K. Fu JuYuan
1aacf5e2ce
user status method. Now the sub_role shall be sat with it's status in order to record sub_role status into user object.
...
Sub_role can be removed normally and the method check_status_record will make sure data is being saved as it should be.
Also unnecessary role will be removed if no sub role exists.
2012-10-09 06:40:18 +08:00
Matthew K. Fu JuYuan
e16a27601d
user new interface 70%
2012-10-08 16:58:33 +08:00
Matthew K. Fu JuYuan
67bd68d492
harry's js fix
2012-10-08 10:11:45 +08:00
Matthew K. Fu JuYuan
e67ca84282
object_auth change to reload
2012-10-04 18:20:21 +08:00
Matt
962bae9a82
merge
2012-10-01 21:09:09 +08:00
Matthew K. Fu JuYuan
7919750d4f
171 doesn't have bug with javascript remove log script
2012-10-01 19:05:23 +08:00
Matthew K. Fu JuYuan
3dc4dc2316
debug commit
2012-10-01 17:56:55 +08:00
Matthew K. Fu JuYuan
506fa179a1
fix announcement
2012-10-01 17:48:51 +08:00
Matt
b65d785834
harry's fix, announcement still broken
2012-10-01 17:21:23 +08:00
Matthew K. Fu JuYuan
5ac04ea07d
devin's css for tinymce
2012-09-28 09:58:28 +08:00
Matthew K. Fu JuYuan
aa5d0bb1ad
Merge branch 'master' of github.com:Rulingcom/NCCU
...
Conflicts:
config/locales/zh_tw.yml
2012-09-28 09:49:22 +08:00
Matthew K. Fu JuYuan
cfc80340b8
add setting for tinymce config
2012-09-28 09:45:50 +08:00
Harry Bomrah
9a4c8137fe
Fix for images
2012-09-27 15:33:37 +08:00
Fu Matthew
dc8ca7e575
fix i18n.file upload failed
2012-09-27 13:34:40 +08:00
Fu Matthew
87904f8b8d
fix i18n
2012-09-27 11:03:08 +08:00
Matthew K. Fu JuYuan
54b874b2c9
fix nccu login
2012-09-25 15:07:07 +08:00
Matthew K. Fu JuYuan
fb3364b28e
Merge commit '975523c8b2d886805a3622e3ef23b2f398722d45' into app_config
2012-09-24 14:14:13 +08:00
unknown
975523c8b2
demo site plugin
2012-09-24 14:10:44 +08:00
Matthew K. Fu JuYuan
3a65f599e6
first version app config for Spen durning Chris's leave.
2012-09-24 11:43:48 +08:00
Christophe Vilayphiou
c846a102ff
Page by page changes for i18n yml
2012-09-24 09:06:44 +08:00
Christophe Vilayphiou
4fb35b00f2
Add missing translations
2012-09-24 09:02:46 +08:00
Christophe Vilayphiou
2ca7e1b548
Fix typos after i18n yml
2012-09-24 09:02:45 +08:00
Christophe Vilayphiou
bdd5a1a047
Changes for i18n yml
2012-09-24 09:02:45 +08:00
Harry Bomrah
b6c06c6d4f
tiny mce fix
2012-09-19 17:59:17 +08:00
Matthew K. Fu JuYuan
12db3118b4
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-09-19 15:09:56 +08:00
Matthew K. Fu JuYuan
8b68387199
fix share loading failed
2012-09-19 15:09:08 +08:00
Matt
79006201cd
ad_image date picker fixed
2012-09-19 12:23:05 +08:00
Matthew K. Fu JuYuan
6fd2dac4d5
fix ad_banner data picker not working when on 180
2012-09-19 12:15:03 +08:00
Matthew K. Fu JuYuan
d480a10661
fix for object_auth update
2012-09-19 11:12:22 +08:00
Matthew K. Fu JuYuan
959b6aee12
fix for listing object error
2012-09-19 10:45:03 +08:00
Matthew K. Fu JuYuan
1240064e23
add url generate
2012-09-18 17:37:52 +08:00
Matthew K. Fu JuYuan
5de433d219
user status method. Now the sub_role shall be sat with it's status in order to record sub_role status into user object.
...
Sub_role can be removed normally and the method check_status_record will make sure data is being saved as it should be.
Also unnecessary role will be removed if no sub role exists.
2012-09-18 16:22:56 +08:00
Matthew K. Fu JuYuan
0907324a2f
add member link to orbit menu
2012-09-17 14:18:27 +08:00
Christophe Vilayphiou
228fa0fca3
Remove setting from side bar
2012-09-17 13:40:14 +08:00
Matthew K. Fu JuYuan
19db9d0037
basic function
2012-09-17 13:32:52 +08:00
unknown
9eed9ec7b6
demo site plugin
2012-09-17 13:32:52 +08:00
Harry Bomrah
b09b1cf2f5
commit for calendar
2012-09-14 21:59:20 +08:00
devin
af19f11668
calendar update
...
- delete unwanted style in bootstrap-responsive.css
- yet start repeat panel
- please just refer how google works (functionality)
2012-09-14 15:57:44 +08:00
Harry Bomrah
0e507d549d
some more changes
2012-09-14 15:32:15 +08:00
Harry Bomrah
3d9fb548e1
calendar fixed
2012-09-14 15:20:01 +08:00
OrbitServer
ee51240102
Ray's changes for new backend
2012-09-14 02:38:56 +08:00
Christophe Vilayphiou
194773f064
Fix bugs after merge
2012-09-14 02:27:49 +08:00
unknown
42d50ae534
Plugins
2012-09-14 00:05:31 +08:00
Christophe Vilayphiou
03b5827392
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
...
Conflicts:
app/controllers/application_controller.rb
app/views/layouts/_side_bar.html.erb
2012-09-14 00:03:52 +08:00
Matthew K. Fu JuYuan
5fb94f644d
break down Ray's HTML
2012-09-14 00:02:22 +08:00
Matthew K. Fu JuYuan
3e5978c8fd
users new interface controller
2012-09-14 00:02:21 +08:00
Matthew K. Fu JuYuan
4818e3f444
first version for new member html
2012-09-14 00:02:21 +08:00
Harry Bomrah
29ea95b4c6
event_calendar testing
2012-09-13 23:57:47 +08:00
Matthew K. Fu JuYuan
9bfd1d2b0c
break down Ray's HTML
2012-09-13 18:39:27 +08:00
Christophe Vilayphiou
2e9af5d1a8
fix commit bugs
2012-09-13 15:53:36 +08:00
Harry Bomrah
f88176ee1f
Merge branch 'gallery_orbit' of https://github.com/Rulingcom/orbit into gallery_orbit
2012-09-12 16:48:33 +08:00
Christophe Vilayphiou
3432d1359b
Fix bug in show_from_link
2012-09-12 16:46:03 +08:00
Matthew K. Fu JuYuan
17195a9a23
fix for admin has no orbit menu
2012-09-12 16:20:15 +08:00
Matthew K. Fu JuYuan
98e8f5f607
complete visitor dashbroad
2012-09-12 16:20:15 +08:00
Matthew K. Fu JuYuan
803f83b239
fix for no login window for backend
2012-09-12 16:20:15 +08:00
Matthew K. Fu JuYuan
45ef7fd302
guest user
2012-09-12 16:20:15 +08:00
Harry Bomrah
17f3104c8d
Merge branch 'gallery_orbit' into desktop_devin
2012-09-12 16:18:13 +08:00
devin
e96ebefe9c
calendar update
2012-09-12 16:16:01 +08:00
OrbitServer
905541aa38
Ray's tp CSS changes
2012-09-12 03:50:20 +08:00
Christophe Vilayphiou
816b542ca6
Change side bar to use key instead of title for ModuleApps
2012-09-12 03:07:25 +08:00
Christophe Vilayphiou
e88b09cf72
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
...
Conflicts:
app/controllers/pages_controller.rb
app/views/layouts/_side_bar.html.erb
lib/parsers/parser_common.rb
vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
vendor/built_in_modules/gallery/config/locales/en.yml
vendor/built_in_modules/gallery/config/locales/zh_tw.yml
2012-09-12 02:21:18 +08:00
Harry Bomrah
4ea0c0ec9c
minor fix for sidebar
2012-09-12 02:14:50 +08:00
Harry Bomrah
8a71bd530f
page added...
2012-09-12 02:14:50 +08:00
Harry Bomrah
8dd69a140f
frontend commits
2012-09-12 02:12:15 +08:00
Harry Bomrah
3749e919cb
front ends updates
2012-09-12 02:12:15 +08:00
Harry Bomrah
7ae1dcd8e0
Calendar Module
2012-09-12 02:06:22 +08:00
devin
789c2df7fd
gallery frontend update
2012-09-12 02:05:10 +08:00
Harry Bomrah
6a23e29f33
Ruby structure implementation
2012-09-12 02:05:09 +08:00
Harry Bomrah
04877b9945
design update
2012-09-12 01:58:23 +08:00
Harry Bomrah
c84b6a626e
minor fix for sidebar
2012-09-11 16:50:42 +08:00
Matthew K. Fu JuYuan
01a8a9b5b6
users new interface controller
2012-09-11 10:53:05 +08:00
Matthew K. Fu JuYuan
42cfe5ac91
first version for new member html
2012-09-11 10:52:27 +08:00
Matt
71021b8c69
Changes for empty file and link in create and edit for news and announcement + partially fix tinymce
2012-09-11 00:41:52 +08:00
Harry Bomrah
7bab8bf8ad
page added...
2012-09-10 14:44:21 +08:00
Matthew K. Fu JuYuan
3db2664c14
add missing file
2012-09-10 14:23:45 +08:00
Matthew K. Fu JuYuan
e12701b34b
preview for association object
2012-09-10 14:19:39 +08:00
Matthew K. Fu JuYuan
768f907f66
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-09-10 11:54:20 +08:00
Matthew K. Fu JuYuan
a20db344f1
preview for update
2012-09-10 11:53:59 +08:00
Matt
9d21a86f53
Ray's CSS changes for NCCU email
2012-09-07 18:16:34 +08:00
Fu Matthew
6044857fea
complete preview for both new and announcement
2012-09-07 17:55:59 +08:00
Fu Matthew
8bd5481b3f
fix object_auth security problem
2012-09-07 17:53:43 +08:00
Harry Bomrah
8295286c6e
frontend commits
2012-09-05 19:08:48 +08:00
Harry Bomrah
b726c10857
front ends updates
2012-09-04 21:30:17 +08:00
Matthew K. Fu JuYuan
671f86b612
First version of new preview. Only plain text
2012-09-04 12:31:27 +08:00
Matthew K. Fu JuYuan
ae1595a008
view for preview
2012-09-04 09:24:12 +08:00
Matthew K. Fu JuYuan
fc4e2ceba5
fix for 403 for new interface
2012-08-31 18:56:26 +08:00
Matthew K. Fu JuYuan
26f99c296f
fix page blank for 403 forbidden.
2012-08-31 18:33:18 +08:00
Matthew K. Fu JuYuan
6b904a37ad
let all signed in users at NCCU upload files
2012-08-31 17:54:25 +08:00
chris
dcdd730a01
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
app/assets/javascripts/bulletin_form.js.erb
app/views/layouts/_side_bar.html.erb
vendor/built_in_modules/archive/app/models/archive_file.rb
vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
2012-08-31 14:31:54 +08:00
unknown
0cb573946e
update item page
2012-08-30 15:17:39 +08:00
unknown
a1560ebcf5
update archive
2012-08-30 15:17:39 +08:00
Christophe Vilayphiou
3ebe7378b9
Delete duplicate side_bar code
2012-08-30 14:49:31 +08:00
unknown
bc5235aa9f
archive checkbox
2012-08-30 14:49:31 +08:00
unknown
e281262b6d
new archive
2012-08-30 14:49:31 +08:00
unknown
2a4c737cdd
archive checkbox
2012-08-30 14:48:42 +08:00
unknown
7ce4a51b73
new archive
2012-08-30 14:45:28 +08:00
unknown
eb7e73b393
new archive
2012-08-30 14:44:55 +08:00
Christophe Vilayphiou
becf88bc20
Delete duplicate side_bar code
2012-08-30 14:39:48 +08:00
unknown
c74ebb91b8
archive checkbox
2012-08-30 14:37:56 +08:00
unknown
57717eef33
new archive
2012-08-30 14:36:48 +08:00
unknown
8a5519073b
new archive
2012-08-30 14:32:32 +08:00
unknown
29bcfa3139
archive checkbox
2012-08-30 14:19:51 +08:00
unknown
c5c7b0ca7c
new archive
2012-08-30 14:18:16 +08:00
unknown
d5cc9961e3
new archive
2012-08-30 14:14:53 +08:00
Harry Bomrah
9cd7aa81a6
Calendar Module
2012-08-29 20:13:41 +08:00
devin
e17bc400f1
gallery frontend update
2012-08-29 17:12:20 +08:00
Harry Bomrah
62abbf9417
Ruby structure implementation
2012-08-27 23:36:56 +08:00
Harry Bomrah
94ee16ae01
design update
2012-08-23 01:36:55 +08:00
chris
7d5531bf01
Merge branch 'nccu_master' into demo_site
...
Conflicts:
Gemfile
app/assets/javascripts/tinymce_orbit.js.erb
app/assets/stylesheets/style.css.erb
app/controllers/admin/assets_controller.rb
app/controllers/admin/module_apps_new_interface_controller.rb
app/controllers/admin/page_parts_controller.rb
app/jobs/sync_db.rb
app/models/page.rb
app/models/page_part.rb
app/models/user/user.rb
app/uploaders/image_uploader.rb
app/views/admin/assets/create.js.erb
app/views/admin/module_apps/reload_frontend_pages.js.erb
app/views/layouts/_orbit_bar.html.erb
app/views/layouts/_side_bar.html.erb
app/views/layouts/_users_checkbox_ary.html.erb
app/views/shared/_privilege_user.html.erb
config/mongoid.yml
lib/parsers/parser_common.rb
vendor/built_in_modules/announcement/announcement.json
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
2012-08-22 18:07:49 +08:00
unknown
1bfae05242
update item page
2012-08-21 17:37:25 +08:00
Harry Bomrah
2c0058e8c9
authorization
2012-08-20 23:18:50 +08:00
Harry Bomrah
faf2d914b6
Page added for desktop
2012-08-20 23:17:31 +08:00
Harry Bomrah
263cf130e2
tp
2012-08-20 23:16:54 +08:00
Harry Bomrah
aef1bfaba3
Button fixes
2012-08-20 23:16:54 +08:00
Harry Bomrah
69304fda43
UI modifications
2012-08-20 23:16:06 +08:00
devin
abd1a9ecbc
gallery update
2012-08-20 23:14:11 +08:00
Harry Bomrah
1ba87982ba
Multi language and side bar update
2012-08-20 23:14:11 +08:00
Harry Bomrah
587595f815
gallery translation supported
2012-08-20 23:14:11 +08:00
Harry Bomrah
0333f97bf3
Gallery update..
2012-08-20 23:14:10 +08:00
Harry Bomrah
797c9e57b8
Gallery update
2012-08-20 23:14:10 +08:00
Harry Bomrah
1daf405b3d
Gallery started.
2012-08-20 23:14:10 +08:00
devin
801c7cab0c
tinyscroll bar update
2012-08-20 23:11:32 +08:00
Harry Bomrah
1efb807246
tinyscrollbar extension
2012-08-20 23:11:32 +08:00
unknown
23a3a7eff6
update archive
2012-08-20 17:14:13 +08:00
chris
3c283d1a7a
Set default picture
...
Fix tags where not in params for index fronted (news and announcement)
Change backend index for news
Home banner link for images and main title
2012-08-16 17:24:12 +08:00
Christophe Vilayphiou
96fd89cca3
Fix js for ie in list
2012-08-16 01:09:45 +08:00
Christophe Vilayphiou
53c5f6a3b9
New css and images for rss
2012-08-15 18:00:55 +08:00
Christophe Vilayphiou
0d330edfa3
New css and images for rss
2012-08-15 17:42:45 +08:00
Christophe Vilayphiou
43bc704468
Error popup only shows on flash[:error]
2012-08-15 15:55:29 +08:00
Christophe Vilayphiou
a19a5415c1
Ray's changes for list.css
2012-08-15 12:13:58 +08:00
Christophe Vilayphiou
fb53ad524a
Add time to announcement quick edit
...
Fix picture for news quick edit
Fix tags not saving when empty
Hide role in quick edit
2012-08-14 14:38:21 +08:00
Christophe Vilayphiou
ab1c457a51
Add i18n for message in editor pop-up
2012-08-14 01:20:45 +08:00
Harry Bomrah
9ff60d2ba4
form validation again
2012-08-14 01:02:45 +08:00
Harry Bomrah
ffa49fd092
form validation
2012-08-14 01:02:45 +08:00
Christophe Vilayphiou
9196deb997
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-14 01:00:25 +08:00
Christophe Vilayphiou
c32b0dd4b4
Move delete checkboxes to js
2012-08-14 00:59:01 +08:00
Matthew K. Fu JuYuan
83569fac82
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-13 18:36:04 +08:00
Matthew K. Fu JuYuan
6cc470ede9
nccu fix
2012-08-13 18:35:47 +08:00
Christophe Vilayphiou
18e18a4add
Fix for banner on ie
2012-08-13 15:10:53 +08:00
Christophe Vilayphiou
c2f3f45196
Fix for link in nccu widget
2012-08-13 11:34:14 +08:00
Christophe Vilayphiou
92fc0c8c26
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-13 11:20:23 +08:00
Christophe Vilayphiou
2ea3193879
Fix for banner link
2012-08-13 11:03:11 +08:00
Matthew K. Fu JuYuan
080974b563
Merge branch 'new_rss'
...
Conflicts:
vendor/built_in_modules/announcement/app/models/bulletin.rb
2012-08-12 23:32:28 +08:00
Matthew K. Fu JuYuan
f1b4d9e204
Add authorization for rescue interface
...
Change logic for NCCU site for status panel.
2012-08-12 23:29:13 +08:00
Christophe Vilayphiou
33fc96ac7c
Changes for NCCU after email
2012-08-11 18:19:30 +08:00
Christophe Vilayphiou
5281464af4
Fix bug for sorting when there's only one category with elements
2012-08-11 16:56:28 +08:00
Christophe Vilayphiou
bebb8a1c1e
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
app/views/layouts/_side_bar.html.erb
vendor/built_in_modules/archive/app/models/archive_file.rb
vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
2012-08-10 15:30:33 +08:00
Christophe Vilayphiou
53cd39f180
Delete duplicate side_bar code
2012-08-10 15:26:34 +08:00
unknown
d8b0613147
archive checkbox
2012-08-10 15:26:34 +08:00
unknown
26931a7b9c
new archive
2012-08-10 15:23:56 +08:00
unknown
81fa2a7428
archive checkbox
2012-08-10 15:19:45 +08:00
unknown
2dd2abc8d2
new archive
2012-08-10 15:17:16 +08:00
unknown
e8cea9f0ab
new archive
2012-08-10 15:14:43 +08:00
Christophe Vilayphiou
2bd132cef9
Pass category and tag to search to redirect to the right page
...
Ray's change for mouseover (take out the black background)
2012-08-09 19:16:26 +08:00
Christophe Vilayphiou
e256440678
RSS first page
2012-08-09 17:04:08 +08:00
unknown
d5c55c9697
widget & frontend field
2012-08-09 15:25:30 +08:00
Matt
1aea8d91f4
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-08 18:16:38 +08:00
Christophe Vilayphiou
0645f04240
Ray's change in css
2012-08-08 18:11:18 +08:00
Matt
62ba8c9f18
Fix bugs on 172:180
2012-08-08 17:56:00 +08:00
Matthew K. Fu JuYuan
e8317e0a4b
1.Remove category column when category is specified
...
2.Showing category if not in category browsing
3.Redirect to home and show error if app page is not available for user language
4.Showing no context to display if object has no language for it.
5.Browse new and announcement by unit is now applicable.
2012-08-08 14:46:08 +08:00
Christophe Vilayphiou
b4c2dfe0ef
Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share
2012-08-08 11:53:47 +08:00
OrbitServer
3fdff9357c
Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share
2012-08-08 11:52:11 +08:00
OrbitServer
fbb53cca36
Ray's changes for sitemap backend
2012-08-08 11:51:20 +08:00
Christophe Vilayphiou
05e61b63bb
Fix fb share, redirect with js when the page is not requested by fb but by user
2012-08-08 11:04:19 +08:00
Christophe Vilayphiou
a03d1ad10b
Change for getting url from key
2012-08-08 11:04:19 +08:00
Christophe Vilayphiou
6cfdf0f25a
Change the way the orig_url is passed to fb
2012-08-08 11:04:19 +08:00
Christophe Vilayphiou
4bed925e0f
Try fb from override and generated page
2012-08-08 11:04:19 +08:00
Christophe Vilayphiou
acf4446523
Add meta to head for fb share
2012-08-08 11:04:19 +08:00
Matthew K. Fu JuYuan
85a556a4a2
first version of fb_share
2012-08-08 11:04:19 +08:00
Christophe Vilayphiou
c6c8187bda
Changes for design: menu, frontend news and announcement
2012-08-08 10:53:04 +08:00
Christophe Vilayphiou
9982fd880f
Update the path when name is changed in item.rb
2012-08-08 10:53:04 +08:00
Christophe Vilayphiou
c8dcc9734d
Change width for site map frontend, add link for more in announcement widget
2012-08-08 10:53:04 +08:00
Christophe Vilayphiou
292105bdf1
Remove remotipart (not working with ie9) the upload is working except that the pop-up does not disappear in ie
2012-08-08 10:53:04 +08:00
Christophe Vilayphiou
86a3d4a4b1
Remove console.log
2012-08-08 10:52:22 +08:00
Christophe Vilayphiou
ecc5c39840
Fix remote upload file for tinymce
2012-08-08 10:51:54 +08:00
Christophe Vilayphiou
e9de0e24b4
Fix fb share, redirect with js when the page is not requested by fb but by user
2012-08-08 10:12:21 +08:00
Christophe Vilayphiou
db16fdc7b5
Change for getting url from key
2012-08-08 07:46:10 +08:00
Christophe Vilayphiou
f7e6703d5f
Change the way the orig_url is passed to fb
2012-08-08 06:50:28 +08:00
Christophe Vilayphiou
fc560f4205
Try fb from override and generated page
2012-08-08 05:40:50 +08:00
Christophe Vilayphiou
3cb182ff8e
Add meta to head for fb share
2012-08-08 03:10:26 +08:00
Harry Bomrah
4660c26b7a
fix for ie8,9 for tinymce
2012-08-07 20:55:18 +08:00
Christophe Vilayphiou
8ea7bf75cd
Fix uploader, ie9 ok, not ie8
2012-08-07 17:32:15 +08:00
Matthew K. Fu JuYuan
1c62c1a799
first version of fb_share
2012-08-06 16:12:49 +08:00
Christophe Vilayphiou
5f88408dcb
Check for 'http' or 'https' before saving a link
2012-08-04 16:29:31 +08:00
Christophe Vilayphiou
6a94d4f550
Put back impressionist where it was commented out
2012-08-04 15:42:53 +08:00
Christophe Vilayphiou
50b313976e
Fix page: take category and tag at the same time
2012-08-03 17:12:54 +08:00
Christophe Vilayphiou
2d2e01115b
Fix page: take category and tag at the same time
...
With news and announcement views
2012-08-03 01:44:06 +08:00
Christophe Vilayphiou
4127d7f2eb
Fix tags
2012-08-03 01:35:41 +08:00
Matthew K. Fu JuYuan
1b29eb5de4
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-01 18:15:28 +08:00
Matthew K. Fu JuYuan
ee5ac0227e
change the algorithm of tag cloud.
2012-08-01 18:15:10 +08:00
Christophe Vilayphiou
df9a1e8057
Fix typo
2012-08-01 17:11:37 +08:00
Christophe Vilayphiou
f917adcdf3
Fix typo
2012-08-01 17:09:00 +08:00
Christophe Vilayphiou
0d048de33f
Fix link in sitemap
2012-08-01 17:08:07 +08:00
Christophe Vilayphiou
83acb78966
path instead of url
2012-08-01 17:05:34 +08:00
Christophe Vilayphiou
410dfe62e8
Fix typo
2012-08-01 17:03:39 +08:00
Christophe Vilayphiou
02ade108d0
Fix typo
2012-08-01 16:59:11 +08:00
Christophe Vilayphiou
4df4274629
Add links to frontend_sitemap
2012-08-01 16:38:07 +08:00
Christophe Vilayphiou
25a911b4f8
Change for page: take category and tag at the same time
2012-08-01 16:33:46 +08:00
Christophe Vilayphiou
0078c97b19
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-07-31 14:27:44 +08:00
Christophe Vilayphiou
9f859b903d
Add custom validator and fix .html_safe with rescue
2012-07-31 14:25:46 +08:00
Matthew K. Fu JuYuan
7e3b59c09a
finished tag clouds
2012-07-31 11:57:32 +08:00
Christophe Vilayphiou
ecb75fd085
Fix typo
2012-07-30 18:37:20 +08:00
Christophe Vilayphiou
39b63a970c
Fix .class to .class.to_s
2012-07-30 18:34:54 +08:00
Christophe Vilayphiou
f3ccbce5c8
Put back impressions for new and bulletin.
...
Add view_count field to tag.
2012-07-30 17:57:55 +08:00
Christophe Vilayphiou
7440727acd
Fix: "._type" to ".class"
2012-07-30 17:21:37 +08:00
Matthew K. Fu JuYuan
4e1a91ed90
Merge branch 'changing_tag'
...
Conflicts:
vendor/built_in_modules/news/app/models/news_tag.rb
2012-07-30 14:43:53 +08:00
Matthew K. Fu JuYuan
946ec9306f
first version of tag cloud.
2012-07-30 11:59:20 +08:00
Christophe Vilayphiou
a6a8fe3d64
Remove remaining 18n_variables
2012-07-27 19:37:25 +08:00
Matthew K. Fu JuYuan
a657a7d615
remove cache
2012-07-27 19:14:24 +08:00
Christophe Vilayphiou
a8cc581279
Sitemap done for backend and fronted
2012-07-27 19:13:40 +08:00
Christophe Vilayphiou
934b515914
Sitemap with main
2012-07-27 19:13:39 +08:00
Christophe Vilayphiou
38804bd118
Add disable for main title
2012-07-27 19:13:39 +08:00
Christophe Vilayphiou
db9c4c0e10
Partial sitemap
2012-07-27 19:13:39 +08:00
Christophe Vilayphiou
12f9f666eb
Fix bugs after i18n_variable removal
2012-07-27 19:13:39 +08:00
Christophe Vilayphiou
804695749d
Fix bugs after removal of i18n_variable
2012-07-27 19:13:39 +08:00
Christophe Vilayphiou
53cae0a9ee
Remove i18n_variable for views
2012-07-27 19:13:39 +08:00
Christophe Vilayphiou
49dd3a1770
Remove i18n_variable for controllers, helpers and models
2012-07-27 19:13:39 +08:00
Christophe Vilayphiou
e2ebd48b22
Remove i18n_variable for announcement
2012-07-27 19:12:58 +08:00
Matthew K. Fu JuYuan
de831f1f96
disable homepage cache for english page
2012-07-27 05:08:24 +08:00
unknown
c0cac812c5
demo site widget
2012-07-26 16:39:29 +08:00
Matthew K. Fu JuYuan
87549d4e1f
fix for nil value
2012-07-25 17:49:16 +08:00
Matthew K. Fu JuYuan
13ec25ed10
fix for orbit bar broken
2012-07-25 17:44:50 +08:00
Matthew K. Fu JuYuan
97b4eee798
full site search with google
2012-07-25 17:20:25 +08:00
Matthew K. Fu JuYuan
f9bdb4a327
New and Announcement search. Disabled impression.
2012-07-20 15:47:40 +08:00
OrbitServer
f223e4bb1e
Ika's changes for orbit bar
2012-07-20 15:41:27 +08:00
unknown
10731dc211
demo widget
2012-07-18 18:07:45 +08:00
Matthew K. Fu JuYuan
2ae6b54a45
fix for not working cache
2012-07-13 18:32:17 +08:00
Matthew K. Fu JuYuan
4daf36908c
working cache
2012-07-13 15:36:10 +08:00
Matthew K. Fu JuYuan
0e65e379b0
cache first commit
2012-07-12 11:47:24 +08:00
Matthew K. Fu JuYuan
773371e885
fix from messy search
2012-07-09 16:48:23 +08:00
Christophe Vilayphiou
e48735a4ac
Merge branch 'desktop_devin' of github.com:Rulingcom/orbit into desktop_devin
2012-07-09 16:39:58 +08:00
unknown
1d8e386bde
demo website widget
2012-07-09 16:28:03 +08:00
devin
68fd726ce1
little
2012-07-09 16:25:41 +08:00
devin
b6266284b4
dump
2012-07-09 16:21:02 +08:00
Harry Bomrah
222c0b9564
Merge branch 'desktop_harry' into desktop_devin
2012-07-09 16:12:45 +08:00
Harry Bomrah
4796de882f
Scroll down fixes
2012-07-09 16:11:31 +08:00
Matthew K. Fu JuYuan
09d46f2f75
NCCU 上傳版本 0709
...
Merge branch 'nccu0621'
Conflicts:
Gemfile
config/resque.god
vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb
2012-07-09 16:02:59 +08:00
devin
bfedf207c9
some changes
2012-07-09 15:37:47 +08:00
Matthew K. Fu JuYuan
49862e70f9
hide category at front end
2012-07-09 12:05:21 +08:00
devin
58d162d225
publication adjustment
2012-07-09 10:44:01 +08:00
Matthew K. Fu JuYuan
56caf4b34e
category disable for backend
2012-07-06 18:11:55 +08:00
Harry Bomrah
2e94c19019
Merge branch 'desktop_devin' into desktop_harry
2012-07-06 16:12:01 +08:00
Harry Bomrah
830eb8eb62
Timeline design and timescale update
2012-07-06 16:11:03 +08:00
devin
8948ccca25
little changes
2012-07-06 16:09:26 +08:00
devin
bfaed4deb4
timeline change
2012-07-05 16:49:03 +08:00
Harry Bomrah
312e63f242
New Timeline with books and seminar pages
2012-07-05 16:42:00 +08:00
Joshua Milton
bb75383ef0
Seminar Pages modified
2012-07-05 16:27:59 +08:00
Matthew K. Fu JuYuan
c5fdff764e
orbit disable object for categories
2012-07-05 16:00:45 +08:00
Harry Bomrah
6923b82284
Added seminar section
2012-07-04 19:12:02 +08:00
Harry Bomrah
f635f642fc
Merge for new timeline updates and font updates
2012-07-04 18:49:10 +08:00
Joshua Milton
441929eb74
Latest code by joshua
2012-07-04 18:39:28 +08:00
Joshua Milton
6b9926539d
Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua
...
Conflicts:
app/assets/javascripts/orbitdesktop.js
app/controllers/desktop_publications_controller.rb
config/routes.rb
2012-07-04 18:31:00 +08:00
Joshua Milton
3f42a22094
Books section added
2012-07-04 17:55:30 +08:00
Matthew K. Fu JuYuan
ae2cbb728e
archive for announcement
2012-07-04 17:36:51 +08:00
devin
e133673736
some change
2012-07-04 13:38:18 +08:00
Harry Bomrah
a0c09046a8
Timeline merge plus font update
2012-07-03 19:53:34 +08:00
Harry Bomrah
f20f36383e
Timeline ajax load fixed… a bit change in structure..
2012-07-03 19:45:47 +08:00
Matthew K. Fu JuYuan
f7107936d0
fix for checking @rulingcom.com
2012-07-03 18:21:48 +08:00
Matthew K. Fu JuYuan
9607b5bbfd
rulingcom帳號不透過LDAP認證
2012-07-03 18:12:44 +08:00
Matthew K. Fu JuYuan
d0632b2e4c
change name format
2012-07-03 16:05:19 +08:00
Matthew K. Fu JuYuan
56ecf9c69b
remove remember for nccu
2012-07-03 15:59:25 +08:00
Matthew K. Fu JuYuan
4014f8ee47
fix over queue at resque
2012-07-03 10:51:26 +08:00
Harry Bomrah
bacb1f1e63
Timeline ajax loading
2012-07-02 21:06:36 +08:00
devin
f34cb47618
font aweosme change
2012-07-02 16:23:14 +08:00
devin
08fd07b6aa
timeline and font update
2012-07-02 16:22:51 +08:00
devin
6533abf214
font awesome update
2012-07-02 11:10:01 +08:00
Christophe Vilayphiou
a1e74987dc
Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry
...
Conflicts:
Gemfile.lock
app/assets/javascripts/.DS_Store
app/assets/stylesheets/style.css.erb
app/views/layouts/_orbit_bar.html.erb
2012-06-29 16:10:29 +08:00
Harry Bomrah
7151102a86
new page add and timeline changes
2012-06-28 17:31:48 +08:00
Matthew K. Fu JuYuan
04a23db745
fix invalid invalid byte sequence in US-ASCII for js files
2012-06-27 14:27:27 +08:00
Matthew K. Fu JuYuan
55449efb35
fix 新聞與公告QA
...
1.優先處理-快速編輯中的檔案上傳無法新增,但可刪除
2.優先處理-編輯中的檔案列表,無法刪除
3.優先處理-刪除時應彈出警告視窗,請user確認一次,再將檔案刪除
2012-06-27 14:21:06 +08:00
Christophe Vilayphiou
4c4929c20a
Fix js for news quick_edit and edit for files
2012-06-27 11:36:18 +08:00
Matthew K. Fu JuYuan
6a4abc6c43
fix news error
2012-06-27 09:59:32 +08:00
Harry Bomrah
4aa155a44d
timeline updates major ones..
2012-06-26 21:09:33 +08:00
Matthew K. Fu JuYuan
818c58c1ee
fix for 新聞與公告QA
...
1.8.新聞或公告的「檔案室」上傳圖片後再行編輯時,圖片無法正常顯示(但是可以正常被編輯調整並於前台顯示)
2.add 上傳檔案大小限制: 3MB
3.公告的發佈單位為何是顯示單位代碼:M00?應顯示發布單位
2012-06-26 17:46:02 +08:00
Harry Bomrah
555ec86403
Timeline commit
2012-06-26 15:59:28 +08:00
Matthew K. Fu JuYuan
56b1bd9eaa
add translation
2012-06-26 10:57:51 +08:00
Matthew K. Fu JuYuan
ffd95ee1fd
fix
...
新聞與公告QA-權限設定--優先處理3.一般發佈新聞&公告人,應該只能看到自己發佈的新聞&公告,但是目前可以看到全部,而且可以刪除其他人的公告.至少要不能刪除別人的公告
新聞與公告QA-編輯問題-發佈新聞時,發佈單位預設為請選擇
新聞與公告QA-編輯問題-公告模組請移除 Subtitle 欄位
put rb-readline only in Linux
make app_manager destroy after user deletion. may need to run:
AppManager.all.collect{|am| am if am.user.nil? }.delete_if {|x| x == nil}.each{|am| am.destroy}
for clean up DB.
2012-06-25 16:23:16 +08:00
Matthew K. Fu JuYuan
a36f73bafc
fix 0621 Trello:"171 頁面管理不能使用"
2012-06-22 18:19:40 +08:00
Matthew K. Fu JuYuan
3f95fe4f13
tmp commit for search. start nccu0621 first
2012-06-22 11:34:10 +08:00
Matthew K. Fu JuYuan
cb17fe0825
Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working
2012-06-20 14:50:51 +08:00
Matthew K. Fu JuYuan
8dd1ab32c1
Add this toolbar, and nccu calendar fix
2012-06-04 16:51:29 +08:00
Matthew K. Fu JuYuan
11247ce84c
Clean up code , cache other auths. Fix sidebar
2012-05-29 17:17:26 +08:00
Matthew K. Fu JuYuan
4d288fb9d1
add script for cache user
2012-05-29 17:17:26 +08:00
Matthew K. Fu JuYuan
1f1868a75f
cache privilege user list.
2012-05-29 17:17:26 +08:00
Matthew K. Fu JuYuan
2f500ff460
For non-login user,show no drop down menu and return to home after press orbit button.
2012-05-29 16:33:38 +08:00
Matthew K. Fu JuYuan
4f484599b7
Clean up code , cache other auths. Fix sidebar
2012-05-29 15:23:50 +08:00
Matthew K. Fu JuYuan
ff620b41aa
add script for cache user
2012-05-29 15:23:50 +08:00
Matthew K. Fu JuYuan
6f0cf0e92e
cache privilege user list.
2012-05-29 15:23:50 +08:00
Harry Bomrah
7488341836
Commit for app window..
2012-05-25 15:41:07 +08:00
Matthew K. Fu JuYuan
3480fa2545
Fix login and label. Check sync jobs and update info function.
2012-05-24 17:01:00 +08:00
Christophe Vilayphiou
c062b43069
Merge branch 'design_team' into ldap
2012-05-23 12:11:38 +08:00
Christophe Vilayphiou
71d4241a2f
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-23 12:11:26 +08:00
Christophe Vilayphiou
006b84f6a1
Ray's fix for ie
2012-05-23 12:06:09 +08:00
Christophe Vilayphiou
7c44e94285
Order list by created_at desc
...
Add best image size in news new
2012-05-23 11:46:19 +08:00
Christophe Vilayphiou
f1c8bed29d
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
2012-05-22 20:33:07 +08:00
Christophe Vilayphiou
eab82269c1
Remove seconds from date display
2012-05-22 20:19:04 +08:00
Christophe Vilayphiou
d6b92fc604
Fixed bugs for nccu
2012-05-22 20:00:07 +08:00
Christophe Vilayphiou
11a371cbb9
Fix destroy in structure
...
Fix sorting
2012-05-22 17:55:45 +08:00
Christophe Vilayphiou
541aa5831e
JS changes to load drag and drop
2012-05-22 17:37:15 +08:00
Christophe Vilayphiou
874a89d99b
Ray's fix for structure side_bar
2012-05-22 16:48:57 +08:00
Christophe Vilayphiou
d0b030c47d
Put inc/ajax_setting in new_admin
...
Fix callback for link on save
2012-05-22 16:11:00 +08:00
Matthew K. Fu JuYuan
99bcdf6e1e
clean up unless code
2012-05-22 14:59:54 +08:00
Matthew K. Fu JuYuan
79f67208fa
js for preventing user do stupid things durning ajax
2012-05-22 14:59:54 +08:00
Christophe Vilayphiou
5e9836f371
Changes for structure
2012-05-22 14:45:49 +08:00
Christophe Vilayphiou
aa114568c4
Move design to site_settings side_bar
2012-05-21 18:20:39 +08:00
Christophe Vilayphiou
c4d7079059
Fix's Matt code for not showing bulletins in index
2012-05-21 18:10:03 +08:00
devin
6fedf7232a
app update
2012-05-21 15:45:15 +08:00
Harry Bomrah
81ff0f2c1c
Merge branch 'desktop_harry' into desktop_devin
2012-05-21 15:26:38 +08:00
devin
a78b72ebfc
app update
2012-05-21 15:25:18 +08:00
Harry Bomrah
dfe7ccf166
general commit
2012-05-21 15:24:47 +08:00
devin
ab7ae6dcee
app
2012-05-21 14:55:51 +08:00
Christophe Vilayphiou
815e6a8361
Fix matt's code and add it to filters
2012-05-19 03:19:55 +08:00
Christophe Vilayphiou
db410b9c50
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-18 19:44:18 +08:00
Christophe Vilayphiou
4d33c7a56d
Changes for dat and time format
...
Impression bug when some i18n missing in impressionable object
JS bug in ad_banner edit title
2012-05-18 19:42:36 +08:00
Matthew K. Fu JuYuan
661fcafe70
Merge branch 'design_team' of https://github.com/Rulingcom/orbit into design_team
...
Conflicts:
vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb
2012-05-18 18:50:10 +08:00
Matthew K. Fu JuYuan
6ce6577e83
fix news approve and preview
2012-05-18 18:47:18 +08:00
Matt
6a022c90da
Changes on nccu
2012-05-18 15:20:45 +08:00
Matthew K. Fu JuYuan
5f6696a358
fix view for different_user for ad_banner. add field 'best size' for ad_banner within form
2012-05-18 14:19:13 +08:00
Christophe Vilayphiou
7c6b807170
Change impression count to exclude when :referrer is nil
2012-05-18 14:13:11 +08:00
Christophe Vilayphiou
a4afd5c1d3
Merge branch 'design_team' into ldap
2012-05-18 10:36:32 +08:00
Christophe Vilayphiou
8ad7f70822
Proof i18n_variable for categories
2012-05-18 10:28:28 +08:00
Christophe Vilayphiou
17b6a70506
Merge branch 'design_team' into ldap
2012-05-17 23:36:24 +08:00
Matthew K. Fu JuYuan
16ada34585
fix ad_banner. new ad_image with best size from ad_banner. content editable at tab
2012-05-17 23:35:46 +08:00
Christophe Vilayphiou
5d5e798b1a
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-17 23:35:14 +08:00
Christophe Vilayphiou
a0ad1f59b6
Comment out filename in FIleAssetUploader
2012-05-17 23:34:15 +08:00
Harry Bomrah
1b1c2c0032
image title and description callback fixed…
2012-05-17 20:19:31 +08:00
Christophe Vilayphiou
60988f97fb
Merge branch 'design_team' into ldap
2012-05-17 19:41:24 +08:00
Christophe Vilayphiou
2f7d561310
Put back I18n for file_upload
2012-05-17 19:40:30 +08:00
Christophe Vilayphiou
25de941df7
Merge branch 'design_team' into ldap
2012-05-17 19:10:22 +08:00
Christophe Vilayphiou
606050627e
Remove I18n for file_upload html
2012-05-17 19:09:52 +08:00
Christophe Vilayphiou
698c750cd7
Merge branch 'design_team' into ldap
2012-05-17 18:37:56 +08:00
Christophe Vilayphiou
27fd2d0714
Hide assets links from side_bar
2012-05-17 18:37:46 +08:00
Christophe Vilayphiou
79f484300e
Merge branch 'design_team' into ldap
2012-05-17 18:32:06 +08:00
Christophe Vilayphiou
c9cbec4239
Asset changes, add description
2012-05-17 18:31:40 +08:00
Christophe Vilayphiou
5e93fe51a9
Merge branch 'design_team' into ldap
2012-05-17 16:41:11 +08:00
Christophe Vilayphiou
29c54e6480
Add mandatory fields to assets
2012-05-17 16:40:09 +08:00
Christophe Vilayphiou
1e2b146c21
Merge branch 'design_team' into ldap
2012-05-17 10:00:07 +08:00
Christophe Vilayphiou
4467bc5e48
Change Date to DateTime
...
Fix filename error
2012-05-17 09:59:49 +08:00
Christophe Vilayphiou
bfad553cc3
Merge branch 'design_team' into ldap
2012-05-17 09:31:02 +08:00
Christophe Vilayphiou
84dac1d250
Create FileAssetUploader
2012-05-17 09:30:21 +08:00
Christophe Vilayphiou
eba4671733
Merge branch 'design_team' into ldap
2012-05-17 06:46:29 +08:00
Christophe Vilayphiou
cd1640482a
Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509
...
Conflicts:
app/views/layouts/_side_bar.html.erb
2012-05-17 06:45:30 +08:00
Matthew K. Fu JuYuan
0f354b8ccc
fix ad_image size hints. fix orbit backend controller error when changing language.
2012-05-17 06:44:14 +08:00
Matthew K. Fu JuYuan
a3acd865d7
AdBanner reopen new banner and delete. Rename title with content editable tag.
2012-05-17 06:44:14 +08:00
Matthew K. Fu JuYuan
7f2564a81e
Fix sidebar and hide some links by roles
2012-05-17 06:43:39 +08:00
Matthew K. Fu JuYuan
82d78acbad
First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued
2012-05-17 06:43:39 +08:00
Matthew K. Fu JuYuan
03387d3c07
Object auth for ad_banner
2012-05-17 06:42:33 +08:00
Matthew K. Fu JuYuan
f663985a40
starting ad_banner auth
2012-05-17 06:42:33 +08:00
Christophe Vilayphiou
6b9c8eb15d
Merge branch 'design_team' into ldap
2012-05-17 06:31:57 +08:00
Christophe Vilayphiou
b05836835a
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-17 06:28:49 +08:00
Christophe Vilayphiou
26292f0dcc
Asset upload
2012-05-17 06:28:29 +08:00
Harry Bomrah
27a0984da1
tinymce loading fixed…
2012-05-16 18:51:37 +08:00
Christophe Vilayphiou
9129835f23
Add tags to assets
2012-05-16 18:19:41 +08:00
Matthew K. Fu JuYuan
0647698012
fix ad_image size hints. fix orbit backend controller error when changing language.
2012-05-16 17:16:48 +08:00
Matthew K. Fu JuYuan
befd3bcdec
AdBanner reopen new banner and delete. Rename title with content editable tag.
2012-05-16 16:42:43 +08:00
Harry Bomrah
617a683d00
image insertion completed..
2012-05-16 16:22:50 +08:00
Harry Bomrah
c380c4cad0
popup fixed
2012-05-16 15:34:23 +08:00
Harry Bomrah
30137b50b4
popup fix..
2012-05-16 15:33:54 +08:00
Matthew K. Fu JuYuan
a31a9c4792
Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509
...
Conflicts:
app/controllers/admin/object_auths_new_interface_controller.rb
app/helpers/application_helper.rb
app/models/ad_banner.rb
2012-05-16 12:13:07 +08:00
Matthew K. Fu JuYuan
88a26cc6a1
Fix sidebar and hide some links by roles
2012-05-16 12:10:16 +08:00
Harry Bomrah
75cbae049b
few experiments…
2012-05-16 11:18:54 +08:00
Christophe Vilayphiou
0b0916179f
Change assets
2012-05-16 11:07:11 +08:00
Christophe Vilayphiou
b31846f424
Delete duplicate side_bar code
2012-05-16 04:35:19 +08:00
Christophe Vilayphiou
ad9ac5f3f7
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb
vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
2012-05-16 01:31:16 +08:00
unknown
cc02ea511c
archive checkbox
2012-05-16 01:13:39 +08:00
unknown
cf5e6c1a96
new archive
2012-05-16 01:09:21 +08:00
unknown
4e9bb1b583
new archive
2012-05-16 01:06:26 +08:00
Christophe Vilayphiou
f950f77f36
Merge branch 'design_team' into ldap
...
Conflicts:
Gemfile
app/models/ad_banner.rb
2012-05-15 23:02:22 +08:00
Christophe Vilayphiou
80e84c10ba
Remove link from dashboard
2012-05-15 23:01:00 +08:00
Christophe Vilayphiou
e54f4409fb
Add impressionist
2012-05-15 21:26:09 +08:00