529e2110d7
modified getjournals format
2012-11-14 17:27:36 +08:00
11b602a1bf
delete demo db of journal and paper
2012-11-13 17:22:25 +08:00
bfdd155c1e
make a json format for view of journal_p
2012-11-13 17:21:23 +08:00
e498be9753
desktopAPI update.
2012-11-12 15:11:36 +08:00
a56d80698f
desktop api update..
2012-11-12 15:11:36 +08:00
39612b879c
address field. js and style is broken
2012-11-12 10:41:41 +08:00
dafe28ffb5
add_more ok
2012-11-08 18:59:19 +08:00
43d969a72b
Fix attribute_field_helper and comment admin in I18n
2012-11-06 17:51:42 +08:00
23e86bfe31
Fix bug due to change of structure for stylesheet
2012-11-06 12:33:00 +08:00
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
da5e7f670e
Desktop Widgtes updates..
2012-11-06 10:36:34 +08:00
ca3e06c58b
update for desktop widgets
2012-11-05 11:40:11 +08:00
2e809c5c19
Calander view updated...
2012-11-05 11:40:11 +08:00
58d4554b0b
Fixing bugs
2012-11-05 11:30:15 +08:00
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
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
bc9082a858
Fix bug: Fix the bug due to not finding the ModuleApp
2012-10-30 17:10:59 +08:00
cc5e238576
Fix after merge from NCCU, the translations still need to be cleaned
2012-10-30 11:08:26 +08:00
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
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
9b5f4e4775
Fix bug: User cannot connect using the orbit button (Devise configuration)
2012-10-26 17:42:14 +08:00
bd0d975014
for user new interface, member role is working.
2012-10-26 11:27:37 +08:00
b301f6522a
Merge branch 'design_update' of github.com:Rulingcom/orbit into design_update
2012-10-26 11:20:26 +08:00
d7fd61ce55
Edit uploaded package
2012-10-26 11:19:57 +08:00
0a1a9d2c2e
member for THU
2012-10-26 11:19:56 +08:00
68bc4c1874
Fix page_part creation when design is changed
2012-10-26 11:19:56 +08:00
cbfa659928
Changes for side_bar
2012-10-26 11:19:56 +08:00
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
9c16da4f46
fixed html for add link. form html
2012-10-26 11:19:56 +08:00
03b608593d
can add member
2012-10-26 11:19:56 +08:00
0a56c555bb
new code for attribute fields and values for new member interface
2012-10-26 11:19:56 +08:00
8b9cffd4f2
new code for attribute fields and values for new member interface
2012-10-26 11:19:55 +08:00
a5722af315
Calendar updates for day view
2012-10-26 11:15:37 +08:00
2b2dd53218
Edit uploaded package
2012-10-24 18:40:38 +08:00
1b876d4305
for user new interface, member role is working.
2012-10-24 14:46:25 +08:00
d1797ac8e3
Fix page_part creation when design is changed
2012-10-18 18:50:46 +08:00
13ae2602cd
member for THU
2012-10-18 18:36:21 +08:00
a50ccdafb2
consolidate_object_auth for 171 production
2012-10-16 15:08:02 +08:00
b3a9a7ab07
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-10-16 14:24:01 +08:00
6dfe10040b
fix object auth without app_auth
2012-10-16 14:23:44 +08:00
afff128e9c
Fix page_part creation when design is changed
2012-10-16 14:15:33 +08:00
f7f0b48707
Merge branch 'master' of github.com:Rulingcom/NCCU
...
Conflicts:
config/initializers/resque.rb
2012-10-16 14:14:56 +08:00
0babd5f302
Changes for side_bar
2012-10-15 15:30:48 +08:00
fe183c316f
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
2012-10-15 14:46:13 +08:00
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
5913f73850
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
2012-10-15 14:09:58 +08:00
31b583228d
fixed html for add link. form html
2012-10-15 14:07:53 +08:00
334e5b464c
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
2012-10-15 13:56:16 +08:00
7901de7b31
can add member
2012-10-15 13:54:29 +08:00
c511600cad
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
2012-10-15 12:35:27 +08:00
9027562450
new code for attribute fields and values for new member interface
2012-10-15 12:35:07 +08:00
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
1ce7f00084
new code for attribute fields and values for new member interface
2012-10-12 18:09:02 +08:00
189fa553c5
Changes for helpers, not including all by default
2012-10-09 14:47:16 +08:00
9e2bc7e1c1
Ray's changes in css and js
2012-10-09 07:48:05 +08:00
d2fea92969
GPRS and CALENDAR
2012-10-09 06:42:00 +08:00
9f825de288
user new interface 70%
2012-10-09 06:40:18 +08:00
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
e16a27601d
user new interface 70%
2012-10-08 16:58:33 +08:00
67bd68d492
harry's js fix
2012-10-08 10:11:45 +08:00
e67ca84282
object_auth change to reload
2012-10-04 18:20:21 +08:00
962bae9a82
merge
2012-10-01 21:09:09 +08:00
7919750d4f
171 doesn't have bug with javascript remove log script
2012-10-01 19:05:23 +08:00
3dc4dc2316
debug commit
2012-10-01 17:56:55 +08:00
506fa179a1
fix announcement
2012-10-01 17:48:51 +08:00
b65d785834
harry's fix, announcement still broken
2012-10-01 17:21:23 +08:00
5ac04ea07d
devin's css for tinymce
2012-09-28 09:58:28 +08:00
aa5d0bb1ad
Merge branch 'master' of github.com:Rulingcom/NCCU
...
Conflicts:
config/locales/zh_tw.yml
2012-09-28 09:49:22 +08:00
cfc80340b8
add setting for tinymce config
2012-09-28 09:45:50 +08:00
9a4c8137fe
Fix for images
2012-09-27 15:33:37 +08:00
dc8ca7e575
fix i18n.file upload failed
2012-09-27 13:34:40 +08:00
87904f8b8d
fix i18n
2012-09-27 11:03:08 +08:00
54b874b2c9
fix nccu login
2012-09-25 15:07:07 +08:00
fb3364b28e
Merge commit '975523c8b2d886805a3622e3ef23b2f398722d45' into app_config
2012-09-24 14:14:13 +08:00
975523c8b2
demo site plugin
2012-09-24 14:10:44 +08:00
3a65f599e6
first version app config for Spen durning Chris's leave.
2012-09-24 11:43:48 +08:00
c846a102ff
Page by page changes for i18n yml
2012-09-24 09:06:44 +08:00
4fb35b00f2
Add missing translations
2012-09-24 09:02:46 +08:00
2ca7e1b548
Fix typos after i18n yml
2012-09-24 09:02:45 +08:00
bdd5a1a047
Changes for i18n yml
2012-09-24 09:02:45 +08:00
b6c06c6d4f
tiny mce fix
2012-09-19 17:59:17 +08:00
12db3118b4
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-09-19 15:09:56 +08:00
8b68387199
fix share loading failed
2012-09-19 15:09:08 +08:00
79006201cd
ad_image date picker fixed
2012-09-19 12:23:05 +08:00
6fd2dac4d5
fix ad_banner data picker not working when on 180
2012-09-19 12:15:03 +08:00
d480a10661
fix for object_auth update
2012-09-19 11:12:22 +08:00
959b6aee12
fix for listing object error
2012-09-19 10:45:03 +08:00
1240064e23
add url generate
2012-09-18 17:37:52 +08:00
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
0907324a2f
add member link to orbit menu
2012-09-17 14:18:27 +08:00
228fa0fca3
Remove setting from side bar
2012-09-17 13:40:14 +08:00
19db9d0037
basic function
2012-09-17 13:32:52 +08:00
9eed9ec7b6
demo site plugin
2012-09-17 13:32:52 +08:00
b09b1cf2f5
commit for calendar
2012-09-14 21:59:20 +08:00
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
0e507d549d
some more changes
2012-09-14 15:32:15 +08:00
3d9fb548e1
calendar fixed
2012-09-14 15:20:01 +08:00
ee51240102
Ray's changes for new backend
2012-09-14 02:38:56 +08:00
194773f064
Fix bugs after merge
2012-09-14 02:27:49 +08:00
42d50ae534
Plugins
2012-09-14 00:05:31 +08:00
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
5fb94f644d
break down Ray's HTML
2012-09-14 00:02:22 +08:00
3e5978c8fd
users new interface controller
2012-09-14 00:02:21 +08:00
4818e3f444
first version for new member html
2012-09-14 00:02:21 +08:00
29ea95b4c6
event_calendar testing
2012-09-13 23:57:47 +08:00
9bfd1d2b0c
break down Ray's HTML
2012-09-13 18:39:27 +08:00
2e9af5d1a8
fix commit bugs
2012-09-13 15:53:36 +08:00
f88176ee1f
Merge branch 'gallery_orbit' of https://github.com/Rulingcom/orbit into gallery_orbit
2012-09-12 16:48:33 +08:00
3432d1359b
Fix bug in show_from_link
2012-09-12 16:46:03 +08:00
17195a9a23
fix for admin has no orbit menu
2012-09-12 16:20:15 +08:00
98e8f5f607
complete visitor dashbroad
2012-09-12 16:20:15 +08:00
803f83b239
fix for no login window for backend
2012-09-12 16:20:15 +08:00
45ef7fd302
guest user
2012-09-12 16:20:15 +08:00
17f3104c8d
Merge branch 'gallery_orbit' into desktop_devin
2012-09-12 16:18:13 +08:00
e96ebefe9c
calendar update
2012-09-12 16:16:01 +08:00
905541aa38
Ray's tp CSS changes
2012-09-12 03:50:20 +08:00
816b542ca6
Change side bar to use key instead of title for ModuleApps
2012-09-12 03:07:25 +08:00
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
4ea0c0ec9c
minor fix for sidebar
2012-09-12 02:14:50 +08:00
8a71bd530f
page added...
2012-09-12 02:14:50 +08:00
8dd69a140f
frontend commits
2012-09-12 02:12:15 +08:00
3749e919cb
front ends updates
2012-09-12 02:12:15 +08:00
7ae1dcd8e0
Calendar Module
2012-09-12 02:06:22 +08:00
789c2df7fd
gallery frontend update
2012-09-12 02:05:10 +08:00
6a23e29f33
Ruby structure implementation
2012-09-12 02:05:09 +08:00
04877b9945
design update
2012-09-12 01:58:23 +08:00
c84b6a626e
minor fix for sidebar
2012-09-11 16:50:42 +08:00
01a8a9b5b6
users new interface controller
2012-09-11 10:53:05 +08:00
42cfe5ac91
first version for new member html
2012-09-11 10:52:27 +08:00
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
7bab8bf8ad
page added...
2012-09-10 14:44:21 +08:00
3db2664c14
add missing file
2012-09-10 14:23:45 +08:00
e12701b34b
preview for association object
2012-09-10 14:19:39 +08:00
768f907f66
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-09-10 11:54:20 +08:00
a20db344f1
preview for update
2012-09-10 11:53:59 +08:00
9d21a86f53
Ray's CSS changes for NCCU email
2012-09-07 18:16:34 +08:00
6044857fea
complete preview for both new and announcement
2012-09-07 17:55:59 +08:00
8bd5481b3f
fix object_auth security problem
2012-09-07 17:53:43 +08:00
8295286c6e
frontend commits
2012-09-05 19:08:48 +08:00
b726c10857
front ends updates
2012-09-04 21:30:17 +08:00
671f86b612
First version of new preview. Only plain text
2012-09-04 12:31:27 +08:00
ae1595a008
view for preview
2012-09-04 09:24:12 +08:00
fc4e2ceba5
fix for 403 for new interface
2012-08-31 18:56:26 +08:00
26f99c296f
fix page blank for 403 forbidden.
2012-08-31 18:33:18 +08:00
6b904a37ad
let all signed in users at NCCU upload files
2012-08-31 17:54:25 +08:00
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
0cb573946e
update item page
2012-08-30 15:17:39 +08:00
a1560ebcf5
update archive
2012-08-30 15:17:39 +08:00
3ebe7378b9
Delete duplicate side_bar code
2012-08-30 14:49:31 +08:00
bc5235aa9f
archive checkbox
2012-08-30 14:49:31 +08:00
e281262b6d
new archive
2012-08-30 14:49:31 +08:00
2a4c737cdd
archive checkbox
2012-08-30 14:48:42 +08:00
7ce4a51b73
new archive
2012-08-30 14:45:28 +08:00
eb7e73b393
new archive
2012-08-30 14:44:55 +08:00
becf88bc20
Delete duplicate side_bar code
2012-08-30 14:39:48 +08:00
c74ebb91b8
archive checkbox
2012-08-30 14:37:56 +08:00
57717eef33
new archive
2012-08-30 14:36:48 +08:00
8a5519073b
new archive
2012-08-30 14:32:32 +08:00
29bcfa3139
archive checkbox
2012-08-30 14:19:51 +08:00
c5c7b0ca7c
new archive
2012-08-30 14:18:16 +08:00
d5cc9961e3
new archive
2012-08-30 14:14:53 +08:00
9cd7aa81a6
Calendar Module
2012-08-29 20:13:41 +08:00
e17bc400f1
gallery frontend update
2012-08-29 17:12:20 +08:00
62abbf9417
Ruby structure implementation
2012-08-27 23:36:56 +08:00
94ee16ae01
design update
2012-08-23 01:36:55 +08:00
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
1bfae05242
update item page
2012-08-21 17:37:25 +08:00
2c0058e8c9
authorization
2012-08-20 23:18:50 +08:00
faf2d914b6
Page added for desktop
2012-08-20 23:17:31 +08:00
263cf130e2
tp
2012-08-20 23:16:54 +08:00
aef1bfaba3
Button fixes
2012-08-20 23:16:54 +08:00
69304fda43
UI modifications
2012-08-20 23:16:06 +08:00
abd1a9ecbc
gallery update
2012-08-20 23:14:11 +08:00
1ba87982ba
Multi language and side bar update
2012-08-20 23:14:11 +08:00
587595f815
gallery translation supported
2012-08-20 23:14:11 +08:00
0333f97bf3
Gallery update..
2012-08-20 23:14:10 +08:00
797c9e57b8
Gallery update
2012-08-20 23:14:10 +08:00
1daf405b3d
Gallery started.
2012-08-20 23:14:10 +08:00
801c7cab0c
tinyscroll bar update
2012-08-20 23:11:32 +08:00
1efb807246
tinyscrollbar extension
2012-08-20 23:11:32 +08:00
23a3a7eff6
update archive
2012-08-20 17:14:13 +08:00
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
96fd89cca3
Fix js for ie in list
2012-08-16 01:09:45 +08:00
53c5f6a3b9
New css and images for rss
2012-08-15 18:00:55 +08:00
0d330edfa3
New css and images for rss
2012-08-15 17:42:45 +08:00
43bc704468
Error popup only shows on flash[:error]
2012-08-15 15:55:29 +08:00
a19a5415c1
Ray's changes for list.css
2012-08-15 12:13:58 +08:00
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
ab1c457a51
Add i18n for message in editor pop-up
2012-08-14 01:20:45 +08:00
9ff60d2ba4
form validation again
2012-08-14 01:02:45 +08:00
ffa49fd092
form validation
2012-08-14 01:02:45 +08:00
9196deb997
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-14 01:00:25 +08:00
c32b0dd4b4
Move delete checkboxes to js
2012-08-14 00:59:01 +08:00
83569fac82
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-13 18:36:04 +08:00
6cc470ede9
nccu fix
2012-08-13 18:35:47 +08:00
18e18a4add
Fix for banner on ie
2012-08-13 15:10:53 +08:00
c2f3f45196
Fix for link in nccu widget
2012-08-13 11:34:14 +08:00
92fc0c8c26
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-13 11:20:23 +08:00
2ea3193879
Fix for banner link
2012-08-13 11:03:11 +08:00
080974b563
Merge branch 'new_rss'
...
Conflicts:
vendor/built_in_modules/announcement/app/models/bulletin.rb
2012-08-12 23:32:28 +08:00
f1b4d9e204
Add authorization for rescue interface
...
Change logic for NCCU site for status panel.
2012-08-12 23:29:13 +08:00
33fc96ac7c
Changes for NCCU after email
2012-08-11 18:19:30 +08:00
5281464af4
Fix bug for sorting when there's only one category with elements
2012-08-11 16:56:28 +08:00
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
53cd39f180
Delete duplicate side_bar code
2012-08-10 15:26:34 +08:00
d8b0613147
archive checkbox
2012-08-10 15:26:34 +08:00
26931a7b9c
new archive
2012-08-10 15:23:56 +08:00
81fa2a7428
archive checkbox
2012-08-10 15:19:45 +08:00
2dd2abc8d2
new archive
2012-08-10 15:17:16 +08:00
e8cea9f0ab
new archive
2012-08-10 15:14:43 +08:00
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
e256440678
RSS first page
2012-08-09 17:04:08 +08:00
d5c55c9697
widget & frontend field
2012-08-09 15:25:30 +08:00
1aea8d91f4
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-08 18:16:38 +08:00
0645f04240
Ray's change in css
2012-08-08 18:11:18 +08:00
62ba8c9f18
Fix bugs on 172:180
2012-08-08 17:56:00 +08:00
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
b4c2dfe0ef
Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share
2012-08-08 11:53:47 +08:00
3fdff9357c
Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share
2012-08-08 11:52:11 +08:00
fbb53cca36
Ray's changes for sitemap backend
2012-08-08 11:51:20 +08:00
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
a03d1ad10b
Change for getting url from key
2012-08-08 11:04:19 +08:00
6cfdf0f25a
Change the way the orig_url is passed to fb
2012-08-08 11:04:19 +08:00
4bed925e0f
Try fb from override and generated page
2012-08-08 11:04:19 +08:00
acf4446523
Add meta to head for fb share
2012-08-08 11:04:19 +08:00
85a556a4a2
first version of fb_share
2012-08-08 11:04:19 +08:00
c6c8187bda
Changes for design: menu, frontend news and announcement
2012-08-08 10:53:04 +08:00
9982fd880f
Update the path when name is changed in item.rb
2012-08-08 10:53:04 +08:00
c8dcc9734d
Change width for site map frontend, add link for more in announcement widget
2012-08-08 10:53:04 +08:00
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
86a3d4a4b1
Remove console.log
2012-08-08 10:52:22 +08:00
ecc5c39840
Fix remote upload file for tinymce
2012-08-08 10:51:54 +08:00
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
db16fdc7b5
Change for getting url from key
2012-08-08 07:46:10 +08:00
f7e6703d5f
Change the way the orig_url is passed to fb
2012-08-08 06:50:28 +08:00
fc560f4205
Try fb from override and generated page
2012-08-08 05:40:50 +08:00
3cb182ff8e
Add meta to head for fb share
2012-08-08 03:10:26 +08:00
4660c26b7a
fix for ie8,9 for tinymce
2012-08-07 20:55:18 +08:00
8ea7bf75cd
Fix uploader, ie9 ok, not ie8
2012-08-07 17:32:15 +08:00
1c62c1a799
first version of fb_share
2012-08-06 16:12:49 +08:00
5f88408dcb
Check for 'http' or 'https' before saving a link
2012-08-04 16:29:31 +08:00
6a94d4f550
Put back impressionist where it was commented out
2012-08-04 15:42:53 +08:00
50b313976e
Fix page: take category and tag at the same time
2012-08-03 17:12:54 +08:00
2d2e01115b
Fix page: take category and tag at the same time
...
With news and announcement views
2012-08-03 01:44:06 +08:00
4127d7f2eb
Fix tags
2012-08-03 01:35:41 +08:00
1b29eb5de4
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-01 18:15:28 +08:00
ee5ac0227e
change the algorithm of tag cloud.
2012-08-01 18:15:10 +08:00
df9a1e8057
Fix typo
2012-08-01 17:11:37 +08:00
f917adcdf3
Fix typo
2012-08-01 17:09:00 +08:00
0d048de33f
Fix link in sitemap
2012-08-01 17:08:07 +08:00
83acb78966
path instead of url
2012-08-01 17:05:34 +08:00
410dfe62e8
Fix typo
2012-08-01 17:03:39 +08:00
02ade108d0
Fix typo
2012-08-01 16:59:11 +08:00
4df4274629
Add links to frontend_sitemap
2012-08-01 16:38:07 +08:00
25a911b4f8
Change for page: take category and tag at the same time
2012-08-01 16:33:46 +08:00
0078c97b19
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-07-31 14:27:44 +08:00
9f859b903d
Add custom validator and fix .html_safe with rescue
2012-07-31 14:25:46 +08:00
7e3b59c09a
finished tag clouds
2012-07-31 11:57:32 +08:00
ecb75fd085
Fix typo
2012-07-30 18:37:20 +08:00
39b63a970c
Fix .class to .class.to_s
2012-07-30 18:34:54 +08:00
f3ccbce5c8
Put back impressions for new and bulletin.
...
Add view_count field to tag.
2012-07-30 17:57:55 +08:00
7440727acd
Fix: "._type" to ".class"
2012-07-30 17:21:37 +08:00
4e1a91ed90
Merge branch 'changing_tag'
...
Conflicts:
vendor/built_in_modules/news/app/models/news_tag.rb
2012-07-30 14:43:53 +08:00
946ec9306f
first version of tag cloud.
2012-07-30 11:59:20 +08:00
a6a8fe3d64
Remove remaining 18n_variables
2012-07-27 19:37:25 +08:00
a657a7d615
remove cache
2012-07-27 19:14:24 +08:00
a8cc581279
Sitemap done for backend and fronted
2012-07-27 19:13:40 +08:00
934b515914
Sitemap with main
2012-07-27 19:13:39 +08:00
38804bd118
Add disable for main title
2012-07-27 19:13:39 +08:00
db9c4c0e10
Partial sitemap
2012-07-27 19:13:39 +08:00
12f9f666eb
Fix bugs after i18n_variable removal
2012-07-27 19:13:39 +08:00
804695749d
Fix bugs after removal of i18n_variable
2012-07-27 19:13:39 +08:00
53cae0a9ee
Remove i18n_variable for views
2012-07-27 19:13:39 +08:00
49dd3a1770
Remove i18n_variable for controllers, helpers and models
2012-07-27 19:13:39 +08:00
e2ebd48b22
Remove i18n_variable for announcement
2012-07-27 19:12:58 +08:00
de831f1f96
disable homepage cache for english page
2012-07-27 05:08:24 +08:00
c0cac812c5
demo site widget
2012-07-26 16:39:29 +08:00
87549d4e1f
fix for nil value
2012-07-25 17:49:16 +08:00
13ec25ed10
fix for orbit bar broken
2012-07-25 17:44:50 +08:00
97b4eee798
full site search with google
2012-07-25 17:20:25 +08:00
f9bdb4a327
New and Announcement search. Disabled impression.
2012-07-20 15:47:40 +08:00
f223e4bb1e
Ika's changes for orbit bar
2012-07-20 15:41:27 +08:00
10731dc211
demo widget
2012-07-18 18:07:45 +08:00
2ae6b54a45
fix for not working cache
2012-07-13 18:32:17 +08:00
4daf36908c
working cache
2012-07-13 15:36:10 +08:00
0e65e379b0
cache first commit
2012-07-12 11:47:24 +08:00
773371e885
fix from messy search
2012-07-09 16:48:23 +08:00
e48735a4ac
Merge branch 'desktop_devin' of github.com:Rulingcom/orbit into desktop_devin
2012-07-09 16:39:58 +08:00
1d8e386bde
demo website widget
2012-07-09 16:28:03 +08:00
68fd726ce1
little
2012-07-09 16:25:41 +08:00
b6266284b4
dump
2012-07-09 16:21:02 +08:00
222c0b9564
Merge branch 'desktop_harry' into desktop_devin
2012-07-09 16:12:45 +08:00
4796de882f
Scroll down fixes
2012-07-09 16:11:31 +08:00
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
bfedf207c9
some changes
2012-07-09 15:37:47 +08:00
49862e70f9
hide category at front end
2012-07-09 12:05:21 +08:00
58d162d225
publication adjustment
2012-07-09 10:44:01 +08:00
56caf4b34e
category disable for backend
2012-07-06 18:11:55 +08:00
2e94c19019
Merge branch 'desktop_devin' into desktop_harry
2012-07-06 16:12:01 +08:00
830eb8eb62
Timeline design and timescale update
2012-07-06 16:11:03 +08:00
8948ccca25
little changes
2012-07-06 16:09:26 +08:00
bfaed4deb4
timeline change
2012-07-05 16:49:03 +08:00
312e63f242
New Timeline with books and seminar pages
2012-07-05 16:42:00 +08:00
bb75383ef0
Seminar Pages modified
2012-07-05 16:27:59 +08:00
c5fdff764e
orbit disable object for categories
2012-07-05 16:00:45 +08:00
6923b82284
Added seminar section
2012-07-04 19:12:02 +08:00
f635f642fc
Merge for new timeline updates and font updates
2012-07-04 18:49:10 +08:00
441929eb74
Latest code by joshua
2012-07-04 18:39:28 +08:00
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
3f42a22094
Books section added
2012-07-04 17:55:30 +08:00
ae2cbb728e
archive for announcement
2012-07-04 17:36:51 +08:00
e133673736
some change
2012-07-04 13:38:18 +08:00
a0c09046a8
Timeline merge plus font update
2012-07-03 19:53:34 +08:00
f20f36383e
Timeline ajax load fixed… a bit change in structure..
2012-07-03 19:45:47 +08:00
f7107936d0
fix for checking @rulingcom.com
2012-07-03 18:21:48 +08:00
9607b5bbfd
rulingcom帳號不透過LDAP認證
2012-07-03 18:12:44 +08:00
d0632b2e4c
change name format
2012-07-03 16:05:19 +08:00
56ecf9c69b
remove remember for nccu
2012-07-03 15:59:25 +08:00
4014f8ee47
fix over queue at resque
2012-07-03 10:51:26 +08:00
bacb1f1e63
Timeline ajax loading
2012-07-02 21:06:36 +08:00
f34cb47618
font aweosme change
2012-07-02 16:23:14 +08:00
08fd07b6aa
timeline and font update
2012-07-02 16:22:51 +08:00
6533abf214
font awesome update
2012-07-02 11:10:01 +08:00
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
7151102a86
new page add and timeline changes
2012-06-28 17:31:48 +08:00
04a23db745
fix invalid invalid byte sequence in US-ASCII for js files
2012-06-27 14:27:27 +08:00
55449efb35
fix 新聞與公告QA
...
1.優先處理-快速編輯中的檔案上傳無法新增，但可刪除
2.優先處理-編輯中的檔案列表，無法刪除
3.優先處理-刪除時應彈出警告視窗，請user確認一次，再將檔案刪除
2012-06-27 14:21:06 +08:00
4c4929c20a
Fix js for news quick_edit and edit for files
2012-06-27 11:36:18 +08:00
6a4abc6c43
fix news error
2012-06-27 09:59:32 +08:00
4aa155a44d
timeline updates major ones..
2012-06-26 21:09:33 +08:00
818c58c1ee
fix for 新聞與公告QA
...
1.8.新聞或公告的「檔案室」上傳圖片後再行編輯時，圖片無法正常顯示（但是可以正常被編輯調整並於前台顯示）
2.add 上傳檔案大小限制: 3MB
3.公告的發佈單位為何是顯示單位代碼：M00？應顯示發布單位
2012-06-26 17:46:02 +08:00
555ec86403
Timeline commit
2012-06-26 15:59:28 +08:00
56b1bd9eaa
add translation
2012-06-26 10:57:51 +08:00
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
a36f73bafc
fix 0621 Trello:"171 頁面管理不能使用"
2012-06-22 18:19:40 +08:00
3f95fe4f13
tmp commit for search. start nccu0621 first
2012-06-22 11:34:10 +08:00
cb17fe0825
Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working
2012-06-20 14:50:51 +08:00
8dd1ab32c1
Add this toolbar, and nccu calendar fix
2012-06-04 16:51:29 +08:00
11247ce84c
Clean up code , cache other auths. Fix sidebar
2012-05-29 17:17:26 +08:00
4d288fb9d1
add script for cache user
2012-05-29 17:17:26 +08:00
1f1868a75f
cache privilege user list.
2012-05-29 17:17:26 +08:00
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
4f484599b7
Clean up code , cache other auths. Fix sidebar
2012-05-29 15:23:50 +08:00
ff620b41aa
add script for cache user
2012-05-29 15:23:50 +08:00
6f0cf0e92e
cache privilege user list.
2012-05-29 15:23:50 +08:00
7488341836
Commit for app window..
2012-05-25 15:41:07 +08:00
3480fa2545
Fix login and label. Check sync jobs and update info function.
2012-05-24 17:01:00 +08:00
c062b43069
Merge branch 'design_team' into ldap
2012-05-23 12:11:38 +08:00
71d4241a2f
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-23 12:11:26 +08:00
006b84f6a1
Ray's fix for ie
2012-05-23 12:06:09 +08:00
7c44e94285
Order list by created_at desc
...
Add best image size in news new
2012-05-23 11:46:19 +08:00
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
eab82269c1
Remove seconds from date display
2012-05-22 20:19:04 +08:00
d6b92fc604
Fixed bugs for nccu
2012-05-22 20:00:07 +08:00
11a371cbb9
Fix destroy in structure
...
Fix sorting
2012-05-22 17:55:45 +08:00
541aa5831e
JS changes to load drag and drop
2012-05-22 17:37:15 +08:00
874a89d99b
Ray's fix for structure side_bar
2012-05-22 16:48:57 +08:00
d0b030c47d
Put inc/ajax_setting in new_admin
...
Fix callback for link on save
2012-05-22 16:11:00 +08:00
99bcdf6e1e
clean up unless code
2012-05-22 14:59:54 +08:00
79f67208fa
js for preventing user do stupid things durning ajax
2012-05-22 14:59:54 +08:00
5e9836f371
Changes for structure
2012-05-22 14:45:49 +08:00
aa114568c4
Move design to site_settings side_bar
2012-05-21 18:20:39 +08:00
c4d7079059
Fix's Matt code for not showing bulletins in index
2012-05-21 18:10:03 +08:00
6fedf7232a
app update
2012-05-21 15:45:15 +08:00
81ff0f2c1c
Merge branch 'desktop_harry' into desktop_devin
2012-05-21 15:26:38 +08:00
a78b72ebfc
app update
2012-05-21 15:25:18 +08:00
dfe7ccf166
general commit
2012-05-21 15:24:47 +08:00
ab7ae6dcee
app
2012-05-21 14:55:51 +08:00
815e6a8361
Fix matt's code and add it to filters
2012-05-19 03:19:55 +08:00
db410b9c50
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-18 19:44:18 +08:00
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
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
6ce6577e83
fix news approve and preview
2012-05-18 18:47:18 +08:00
6a022c90da
Changes on nccu
2012-05-18 15:20:45 +08:00
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
7c6b807170
Change impression count to exclude when :referrer is nil
2012-05-18 14:13:11 +08:00
a4afd5c1d3
Merge branch 'design_team' into ldap
2012-05-18 10:36:32 +08:00
8ad7f70822
Proof i18n_variable for categories
2012-05-18 10:28:28 +08:00
17b6a70506
Merge branch 'design_team' into ldap
2012-05-17 23:36:24 +08:00
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
5d5e798b1a
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-17 23:35:14 +08:00
a0ad1f59b6
Comment out filename in FIleAssetUploader
2012-05-17 23:34:15 +08:00
1b1c2c0032
image title and description callback fixed…
2012-05-17 20:19:31 +08:00
60988f97fb
Merge branch 'design_team' into ldap
2012-05-17 19:41:24 +08:00
2f7d561310
Put back I18n for file_upload
2012-05-17 19:40:30 +08:00
25de941df7
Merge branch 'design_team' into ldap
2012-05-17 19:10:22 +08:00
606050627e
Remove I18n for file_upload html
2012-05-17 19:09:52 +08:00
698c750cd7
Merge branch 'design_team' into ldap
2012-05-17 18:37:56 +08:00
27fd2d0714
Hide assets links from side_bar
2012-05-17 18:37:46 +08:00
79f484300e
Merge branch 'design_team' into ldap
2012-05-17 18:32:06 +08:00
c9cbec4239
Asset changes, add description
2012-05-17 18:31:40 +08:00
5e93fe51a9
Merge branch 'design_team' into ldap
2012-05-17 16:41:11 +08:00
29c54e6480
Add mandatory fields to assets
2012-05-17 16:40:09 +08:00
1e2b146c21
Merge branch 'design_team' into ldap
2012-05-17 10:00:07 +08:00
4467bc5e48
Change Date to DateTime
...
Fix filename error
2012-05-17 09:59:49 +08:00
bfad553cc3
Merge branch 'design_team' into ldap
2012-05-17 09:31:02 +08:00
84dac1d250
Create FileAssetUploader
2012-05-17 09:30:21 +08:00
eba4671733
Merge branch 'design_team' into ldap
2012-05-17 06:46:29 +08:00
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
0f354b8ccc
fix ad_image size hints. fix orbit backend controller error when changing language.
2012-05-17 06:44:14 +08:00
a3acd865d7
AdBanner reopen new banner and delete. Rename title with content editable tag.
2012-05-17 06:44:14 +08:00
7f2564a81e
Fix sidebar and hide some links by roles
2012-05-17 06:43:39 +08:00
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
03387d3c07
Object auth for ad_banner
2012-05-17 06:42:33 +08:00
f663985a40
starting ad_banner auth
2012-05-17 06:42:33 +08:00
6b9c8eb15d
Merge branch 'design_team' into ldap
2012-05-17 06:31:57 +08:00
b05836835a
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-17 06:28:49 +08:00
26292f0dcc
Asset upload
2012-05-17 06:28:29 +08:00
27a0984da1
tinymce loading fixed…
2012-05-16 18:51:37 +08:00
9129835f23
Add tags to assets
2012-05-16 18:19:41 +08:00
0647698012
fix ad_image size hints. fix orbit backend controller error when changing language.
2012-05-16 17:16:48 +08:00
befd3bcdec
AdBanner reopen new banner and delete. Rename title with content editable tag.
2012-05-16 16:42:43 +08:00
617a683d00
image insertion completed..
2012-05-16 16:22:50 +08:00
c380c4cad0
popup fixed
2012-05-16 15:34:23 +08:00
30137b50b4
popup fix..
2012-05-16 15:33:54 +08:00
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
88a26cc6a1
Fix sidebar and hide some links by roles
2012-05-16 12:10:16 +08:00
75cbae049b
few experiments…
2012-05-16 11:18:54 +08:00
0b0916179f
Change assets
2012-05-16 11:07:11 +08:00
b31846f424
Delete duplicate side_bar code
2012-05-16 04:35:19 +08:00
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
cc02ea511c
archive checkbox
2012-05-16 01:13:39 +08:00
cf5e6c1a96
new archive
2012-05-16 01:09:21 +08:00
4e9bb1b583
new archive
2012-05-16 01:06:26 +08:00
f950f77f36
Merge branch 'design_team' into ldap
...
Conflicts:
Gemfile
app/models/ad_banner.rb
2012-05-15 23:02:22 +08:00
80e84c10ba
Remove link from dashboard
2012-05-15 23:01:00 +08:00
e54f4409fb
Add impressionist
2012-05-15 21:26:09 +08:00
53a0fbddf0
Fix commit error
2012-05-15 21:25:51 +08:00
3f744dab05
First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued
2012-05-15 18:55:16 +08:00
b23b5e8ec5
Object auth for ad_banner
2012-05-15 16:39:23 +08:00
77deffb512
Nccu calendar and daily job.
2012-05-15 14:03:54 +08:00
551e1ef740
Reflect login method. LDAP,MidSite connection. The Mysql connection now is build on fly.
2012-05-15 11:28:24 +08:00
0a9f0bcc45
starting ad_banner auth
2012-05-15 09:57:05 +08:00
8fcb8ef8de
Change the way links are displayed in menus in front-end
2012-05-14 21:43:10 +08:00
59b55d1574
Merge branch 'design_team' into ldap
2012-05-14 12:42:06 +08:00
9ba4c2cf2f
Change to apply page to had object_auth
2012-05-14 12:40:50 +08:00
2cd67356a5
Merge branch 'nccu_0509' of https://github.com/Rulingcom/orbit into nccu_0509
...
Conflicts:
config/locales/zh_tw.yml
2012-05-14 12:36:09 +08:00
e1450ec748
Change to apply page to had object_auth
2012-05-14 12:34:15 +08:00
ebc8dd33ec
Merge branch 'design_team' into ldap
...
Conflicts:
Gemfile.lock
app/controllers/admin/module_apps_controller.rb
app/controllers/application_controller.rb
vendor/built_in_modules/web_resource/web_resource.json
2012-05-14 00:57:17 +08:00
dfd2d82efb
Restart job
2012-05-14 00:50:36 +08:00
7a6d30ad62
Remove unless files and change routes.
2012-05-14 00:50:36 +08:00
0119ab1a74
New Interface for App Auth and Object Auth
2012-05-14 00:50:12 +08:00
a184f96ce7
AdBanner app_auth
2012-05-14 00:49:22 +08:00
8b42c595b3
Don't display admin in any premission select. Fix not necessary header for UT data
2012-05-14 00:49:22 +08:00
cf8d20dc84
Add category and tag to pages
2012-05-14 00:33:52 +08:00
e40c76bf5f
Fix new page form
...
Redirect to home when not authorized
Get only module_apps with app_pages for new and edit page
Change web_resource.json
2012-05-13 23:48:34 +08:00
01d0c002f5
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
app/views/admin/pages/_edit.html.erb
app/views/admin/pages/_form.html.erb
lib/parsers/parser_back_end.rb
2012-05-13 23:14:13 +08:00
62e9a772f6
Fix titles for widgets
...
Add translations
2012-05-13 23:09:48 +08:00
4ae8299949
Add custom title to widgets
...
Fix pagination conflict with main_content and widgets
2012-05-13 22:35:00 +08:00
281cfa6518
Changes for widgets
2012-05-13 21:55:39 +08:00
4685952bd6
Changes in page_edit
2012-05-13 20:13:26 +08:00
ef2d416c70
Ray's changes for page_edit
2012-05-13 19:36:04 +08:00
82fa85def8
Clean the parsers code
2012-05-13 19:32:05 +08:00
803253ebcf
Put nestedSortable in page_edit.js.erb
2012-05-12 22:12:17 +08:00
ef49df448d
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
app/helpers/admin/item_helper.rb
2012-05-11 18:09:34 +08:00
17b486f9e9
Fix bugs for shift_to and change items.rake for the missing position in db
2012-05-11 17:56:26 +08:00
076f5ad6ef
Ray's changes for drag and drop in structure's side_bar
2012-05-11 17:54:33 +08:00
82d1d3fed8
Restart job
2012-05-11 16:56:32 +08:00
0a34f0277e
Remove unless files and change routes.
2012-05-11 16:46:36 +08:00
20a1a6e30f
New Interface for App Auth and Object Auth
2012-05-11 16:44:40 +08:00
6a443f0976
Add mongoid-tree to Item
2012-05-11 16:16:09 +08:00
1a9fa8f505
Merge branch 'desktop_harry' into desktop_devin
2012-05-11 15:28:05 +08:00
2c3637e9b4
very important update for widgets management..
2012-05-11 15:27:16 +08:00
fd52d00187
Add drag and drop to structure side_bar
2012-05-11 10:00:45 +08:00
63f904d3b0
Fix tinymce js load
...
Change to full_name for page_context index
2012-05-10 20:36:19 +08:00
97b60c48b2
update
2012-05-10 17:41:56 +08:00
cb25cf60a9
AdBanner app_auth
2012-05-10 15:37:07 +08:00
4f1e47bb82
Don't display admin in any premission select. Fix not necessary header for UT data
2012-05-10 14:43:05 +08:00
5eba2638ce
Merge branch 'design_team' into ldap
2012-05-10 14:17:38 +08:00
b6aad17681
Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page.
2012-05-10 14:16:37 +08:00
87ebcc48e7
Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page.
2012-05-10 11:51:44 +08:00
ada56a7a63
some update
2012-05-10 10:54:43 +08:00
87449ec6a8
Merge branch 'design_team' into ldap
2012-05-10 10:34:28 +08:00
a43877323e
Add tinymce to page_part edit for text
2012-05-10 10:34:13 +08:00
de739d7d20
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/web_resource/web_resource.json
2012-05-10 00:34:23 +08:00
bc5e975fab
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-10 00:29:22 +08:00
9161dc73b5
Translation for "or"
2012-05-10 00:27:12 +08:00
13587306bc
Add list widgets for announcement, news and links with categories and tags
2012-05-10 00:25:30 +08:00
ecd21338bc
Matt's changes for side_bar
2012-05-10 00:23:42 +08:00
dc9af65524
Merge branch 'design_team' into ldap
2012-05-09 15:25:16 +08:00
038378be9a
Ray's changes for inccu in orbit_bar
2012-05-09 15:20:09 +08:00
1785da51a2
Merge branch 'design_team' into ldap
2012-05-09 15:04:06 +08:00
50edfdd02f
Changes for tag key in side_bar announcement and news, fix ad_banner css for dot
2012-05-09 14:59:06 +08:00
9d01f624da
Merge branches 'nccu_0509' and 'design_team' into ldap
2012-05-09 14:21:24 +08:00
6c9944918a
Fix i18 variable
2012-05-09 14:18:52 +08:00
47bca643af
hidding new ad_banner
2012-05-09 14:17:20 +08:00
d88d4e58dc
Merge branch 'design_team' into ldap
...
Conflicts:
config/environments/development.rb
2012-05-09 13:51:00 +08:00
f9f7ddc8ee
Hide some links in side_bar for site_settings
2012-05-09 12:53:42 +08:00
44a485611a
Site_info and site_setting i18n
2012-05-09 12:29:46 +08:00
9216f29bc9
Ray's changes for mail settings
2012-05-09 12:19:32 +08:00
41c0c26330
Add mail_settings
2012-05-09 11:38:29 +08:00
b3be210ff7
Small adjustment for dashboard
2012-05-09 05:55:47 +08:00
2b03263fb7
Dashboard partial implementation
2012-05-09 05:53:07 +08:00
909ca19456
Fix bugs in sub_menu
2012-05-09 04:31:04 +08:00
9ead6cafda
Ray's changes
2012-05-09 04:15:02 +08:00
8d70d87120
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-09 04:13:14 +08:00
26a50cc862
Add sub_menu to children
2012-05-09 04:15:45 +08:00
a186ae08d8
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-08 21:47:03 +08:00
0cc94c65a8
Patch from ldap: Test version for DB sync schedule job
2012-05-08 21:14:57 +08:00
ffcfda912e
Patch from ldap: Calendar sync done,need Ray's JS change
2012-05-08 20:44:17 +08:00
7af17f19ac
God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.
2012-05-08 20:26:36 +08:00
dbac219c18
now jobs is working
2012-05-08 20:25:11 +08:00
f3b58ea36d
starting Resque
2012-05-08 20:24:37 +08:00
f949523bbb
God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.
2012-05-08 20:21:28 +08:00
69f2f6a716
now jobs is working
2012-05-08 20:21:28 +08:00
c28d7d59b6
starting Resque
2012-05-08 20:21:28 +08:00
18c42a80a6
Put site_settings in the orbit_button
2012-05-08 20:06:56 +08:00
083963af65
Test version for DB sync schedule job
2012-05-08 19:20:53 +08:00
55bfaea43e
Can show announcement and news list by tag's key
2012-05-08 17:27:42 +08:00
5c7cf1aef2
Add sub_menu to site_info
2012-05-08 17:27:02 +08:00
d2e07f537a
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-08 17:24:40 +08:00
a3868cb785
Ray's changes for front-end banner
2012-05-08 17:21:26 +08:00
f827e8429e
Calendar sync done,need Ray's JS change
2012-05-08 16:08:41 +08:00
caba8ce7a4
Add nccu icon
...
Change news list in front-end
Hide links and files in news and announcement front-end show when nothing
2012-05-08 15:27:43 +08:00
b22a275360
Merge branch 'ldap' of https://github.com/Rulingcom/orbit into ldap
2012-05-08 11:55:21 +08:00
65a0998080
Merge branch 'jobs_and_mail' into ldap
...
Conflicts:
config/environments/development.rb
config/routes.rb
2012-05-08 11:45:34 +08:00
d7194dc805
God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.
2012-05-08 11:41:58 +08:00
5b604037f8
now jobs is working
2012-05-08 11:41:58 +08:00
7339d1ee4a
starting Resque
2012-05-08 11:41:58 +08:00
2b9190a49e
Merge branch 'design_team' into ldap
...
Conflicts:
config/locales/zh_tw.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-05-08 11:40:38 +08:00
ba4385e3fd
Add module authorization for news
...
Add files and links to announcement and news
Change page.children into page.ordered_and_visible_children in parser_commom
2012-05-08 10:50:09 +08:00
2083e0bf4f
widget structure improvised…
2012-05-07 19:00:50 +08:00
469f5c8267
Add always_display checkbox for title in site_info independent of i18n
2012-05-07 16:29:32 +08:00
9a5e7cc8fa
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
app/views/admin/sites/site_info.html.erb
2012-05-07 16:08:05 +08:00
f534e6ca7b
Ray's changes for site_info
2012-05-07 15:55:45 +08:00
8a3f0b9bdc
Add menu_enabled_for: the page can be shown even if there's no link in the menu
2012-05-07 15:47:14 +08:00
8b61314cc4
Add i18n for site_info.
...
Add always display site title.
Changes for menu in front-end
2012-05-07 15:11:43 +08:00
0246341aef
Add footer to site_info
2012-05-07 11:25:33 +08:00
1fb6c20b86
Add site_info
2012-05-07 00:54:18 +08:00
48f8fbde7f
Fix site_locale_default_head and active for current locale
2012-05-07 00:53:52 +08:00
51f87e7212
Add missing translation for enabled_for
2012-05-06 03:36:01 +08:00
ce1fecaf93
Add position ordering and hiding page for i18n
2012-05-06 00:35:13 +08:00
f190ce18ee
Put sorting in web_link, page_context and design
2012-05-05 21:20:20 +08:00
b48099d752
Fix bug in is_admin?
...
Fix bug in helpers for news and announcement
2012-05-05 17:40:07 +08:00
fcc875bb5d
app store page added… and few other changes..
2012-05-04 20:28:12 +08:00
555aa088d9
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-04 19:23:45 +08:00
3ef81c520e
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-04 19:16:57 +08:00
e0a191162d
Ray's changes
2012-05-04 19:11:28 +08:00
15bc4d4268
Fix merge error
2012-05-04 16:12:28 +08:00
8f1ce78ab4
Fix bug when homepage
2012-05-04 15:51:51 +08:00
453cb21066
Announcement preivew
2012-05-04 15:50:45 +08:00
f6307abfbf
fix broken ad_banner
2012-05-04 15:40:43 +08:00
bff3cefbc7
Apply app_auth to ad_banner. From now,ad_banner can only be viewed for at least manager.
2012-05-04 15:40:43 +08:00
f427c3803f
clean up useless flash msgs. add i18n vars for app auth and object auth
2012-05-04 15:40:43 +08:00
05ded8de03
Fix for NCCU 0430 all functions ok with two submanagers but different behavors
2012-05-04 15:38:18 +08:00
3ad11f2098
View functionality, changed controller, journal and pages collections
2012-05-03 21:38:03 +08:00
a3a1e4b92e
controller change, views working and db for paper and journals
2012-05-03 21:30:12 +08:00
aeaf2f05d1
Start Add Page - no function
2012-05-03 17:59:07 +08:00
1fce99c96f
Merge branch 'desktop_harry' into desktop_devin
2012-05-03 14:42:07 +08:00
d6cbbff9de
connection page working now..
2012-05-03 14:40:54 +08:00
b87cf0e2ff
list page
2012-05-03 14:39:22 +08:00
45e21f9569
Fix filter category in news
2012-05-02 17:55:02 +08:00
6b8c79a9a8
Merge branch 'desktop_devin' into desktop_harry
2012-05-02 17:06:56 +08:00
5b7c422446
position update fixed..
2012-05-02 17:05:40 +08:00
887bda1491
lots of change
2012-05-02 17:04:16 +08:00
b8cd7097b0
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-02 16:27:09 +08:00
2762c24593
Fix wrong variable names in translations
2012-05-02 16:22:06 +08:00
92a53c1b27
Ray's fix
2012-05-02 16:20:59 +08:00
bfc4507696
Connection page design
2012-05-01 18:05:17 +08:00
769a67f026
the group more structured and also demo connecting with gmail account..
2012-04-30 21:17:20 +08:00
1b7fb106f8
lot of updates
2012-04-30 14:33:12 +08:00
aacd9da9fb
auto login encryption done…
2012-04-30 14:29:42 +08:00
fe54c6ae71
Fix bug when id or single object
2012-04-30 14:23:41 +08:00
a9ab016d52
Merge branch 'design_team' into ldap
2012-04-30 08:33:21 +08:00
bda21baed2
Add missing js
2012-04-30 08:32:54 +08:00
767e4a3fe9
Merge branch 'design_team' into ldap
2012-04-30 08:16:17 +08:00
496b8de58a
Side bar translation
2012-04-30 08:15:45 +08:00
20504b2205
Merge branch 'design_team' into ldap
...
Conflicts:
app/controllers/admin/page_parts_controller.rb
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/_sort_headers.html.erb
2012-04-30 07:57:20 +08:00
b6fceadff4
column group experiment
2012-04-30 06:41:05 +08:00
b8f52fa1ec
Separate announcement and news
2012-04-30 06:31:46 +08:00
63ee8eaca9
Remove url from sorting
...
Add sorting_options to params in filters
2012-04-30 06:30:52 +08:00
32faef0c70
DRY code for sorting
2012-04-30 06:30:52 +08:00
a46a8898d7
Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen
2012-04-30 00:24:11 +08:00
6b151b1fb6
403 for unauth apps
2012-04-30 00:24:11 +08:00
c4db7e2157
Fix approval setting ajax problem
2012-04-30 00:24:11 +08:00
94d61abf83
A modal view for approval user
2012-04-30 00:24:10 +08:00
9d97b7c008
Change for the notice msg at login page
2012-04-30 00:24:10 +08:00
851dc72f42
Ray's changes in css and html
2012-04-30 00:17:18 +08:00
a99d685bce
conflict solved
2012-04-28 01:56:00 +08:00
03f19b80b4
small change
2012-04-28 01:49:48 +08:00
a23f290831
changes for login …
2012-04-27 22:14:44 +08:00
2362e1cfdd
Merge branch 'design_team' into ldap
2012-04-27 15:28:32 +08:00
799fd1e3ac
Fix css bugs (opacity=) and changes in sign_in page
2012-04-27 15:27:59 +08:00
feb2156fd3
Fix error in side_bar for web_links
2012-04-27 14:15:36 +08:00
2ebba577eb
journal start
2012-04-27 14:04:11 +08:00
3beb035101
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-27 11:11:56 +08:00
5aca3db95f
Ray's changes for structure and web_links
2012-04-27 11:02:56 +08:00
682880c5bf
skip it
2012-04-26 23:18:52 +08:00
c158375d02
with connection and some save settings…
2012-04-26 21:30:13 +08:00
c2ac682787
updates for connections
2012-04-26 17:23:47 +08:00
7d6b82d9dd
Merge branch 'ad_banner' into ldap
2012-04-26 17:15:44 +08:00
4af2068c1f
Fix ad_banner sec and msec
2012-04-26 17:11:06 +08:00
faace9893a
dehumanize ad banner
2012-04-26 17:11:05 +08:00
9a5ce5f512
Remove unless sidebar links.
2012-04-26 17:11:05 +08:00
3d293f6419
Fix for quick edit file and link in announcement
...
Change submit_button into ajax_for_submit
2012-04-26 16:42:28 +08:00
64be61d61b
with gmail widget..
2012-04-26 14:47:49 +08:00
6bf4c60d45
Changes for js and ccs load for site's pages
2012-04-26 01:49:02 +08:00
6f1eb97ace
Fix for structure js and css
2012-04-25 18:41:38 +08:00
58d52c60d3
Fix for structure: restore js and change manifests
2012-04-25 18:17:58 +08:00
1f4fe65430
Merge branch 'design_team' into ldap
...
Conflicts:
app/views/devise/sessions/new.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
2012-04-25 16:45:04 +08:00
876036dd20
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
app/views/admin/ad_banners/_ad_banner_tab.html.erb
2012-04-25 16:39:26 +08:00
44ded537b3
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-25 16:28:34 +08:00
65a6f9c416
Ray's css fix for quick edit
2012-04-25 16:26:27 +08:00
a3a109fb8b
Remove JS debug msg.
2012-04-25 16:10:11 +08:00
7f285f4719
Change ad_banner preview from using title to id
2012-04-25 16:10:11 +08:00
72921d6dfd
fix useless notice at login
2012-04-25 16:10:11 +08:00
abf75ffedd
Merge branch 'design_team' into ldap
2012-04-25 15:45:16 +08:00
573c19ff4b
Remove .erb when including css
2012-04-25 15:44:44 +08:00
8adb9c6878
Merge branch 'design_team' into ldap
2012-04-25 15:10:50 +08:00
3ec8bb7be6
Fix assets bug: when having a '.' in the name, the extension must be specified
2012-04-25 15:10:28 +08:00
8f242e2d39
Merge branch 'design_team' into ldap
2012-04-24 17:00:51 +08:00
3308744396
Fix side_bar after Matt's changes in translation
2012-04-24 17:00:33 +08:00
0c4f1d91f7
Merge branch 'ad_banner' into ldap
2012-04-24 16:46:04 +08:00
a298cbd5f6
Publication started
2012-04-24 16:45:26 +08:00
db46803cda
R4-Billingual
2012-04-24 16:43:45 +08:00
d1f687e43e
Merge branch 'design_team' into ldap
2012-04-24 16:32:30 +08:00
c7d8e0b27b
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb
2012-04-24 16:32:00 +08:00
291d5e3a03
Ray's changes in css
2012-04-24 16:24:50 +08:00
70f6c7b540
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
2012-04-24 15:28:52 +08:00
c0abaa643c
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-24 15:21:12 +08:00
45c194e870
Ray's changes in css
2012-04-24 15:15:36 +08:00
51ee9a4bfa
Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
...
Conflicts:
app/views/admin/ad_banners/_ad_banner_tab.html.erb
2012-04-24 14:43:30 +08:00
33640de184
Changes for Billingual
2012-04-24 14:37:06 +08:00
bbcdaf00e7
Disable ad_banner_preview. Just show window
2012-04-24 14:37:06 +08:00
e7bb9ea86b
Fix ad image date selector
2012-04-24 14:37:06 +08:00
c57ba305e9
Fix ad_banner
2012-04-24 14:37:06 +08:00
04688608f7
Changes for Billingual
2012-04-24 14:30:30 +08:00
c856b4cdce
Fix for upload image component in announcement
2012-04-24 12:41:28 +08:00
42aeaead93
Ray's changes, put the js for upload image component in a separate file
2012-04-24 12:15:32 +08:00
b80339d704
Ray's changes for image upload component and sign-in page
2012-04-24 11:35:50 +08:00
6e431b6137
Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
2012-04-24 11:26:13 +08:00
308cfc7cf2
Merge branch 'design_team' into ldap
...
Conflicts:
app/views/devise/sessions/new.html.erb
2012-04-24 02:46:06 +08:00
6831a3dbbb
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-24 02:44:39 +08:00
0c4328987a
Ray's changes for css files, sort headers in announcement and pagination
2012-04-24 02:37:51 +08:00
d4aea664e2
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
2012-04-24 02:37:03 +08:00
a5b13e680f
Add sub_menu in r_tags
2012-04-24 02:30:40 +08:00
670ec2a40e
Themes from db fixed..
2012-04-23 21:04:02 +08:00
0836583694
Disable ad_banner_preview. Just show window
2012-04-23 18:29:23 +08:00
a5db2382e7
Fix ad image date selector
2012-04-23 18:20:12 +08:00
35452c039d
Fix ad_banner
2012-04-23 17:03:55 +08:00
834cbe3a11
Fix side_bar for tags
...
Modules needs to use the fullpath for active or visible in tags
2012-04-23 16:12:07 +08:00
3280ff8311
archive checkbox
2012-04-23 15:53:58 +08:00
5a423178e3
Merge branch 'design_team' into ldap
...
Conflicts:
app/assets/stylesheets/new_admin.css.erb
app/assets/stylesheets/widget.css
2012-04-23 15:16:50 +08:00
499930a680
Pull from github
2012-04-23 14:29:55 +08:00
2eeb530422
Merge branch 'master' into ldap
...
Conflicts:
app/assets/stylesheets/new_admin.css.erb
2012-04-23 14:13:37 +08:00
67ba2389a2
fix js
2012-04-23 14:07:14 +08:00
8eedbc951e
add i18n vars
2012-04-23 14:07:14 +08:00
0c46b4da23
AdImage and AnBanner JS fixed
2012-04-23 14:07:13 +08:00
81b0046f42
Preview now can be use at both ad_banner and ad_image,however it won't run correctly if user change its ad_banner at ad_image.
2012-04-23 14:07:13 +08:00
e353afb5ac
fix i18n vars in ad_banner
2012-04-23 14:07:13 +08:00
1b70852ff7
realtime preview is working. but save to object when preview
2012-04-23 14:06:37 +08:00
8cc0611c4a
Ray's fix for ad_banner
2012-04-23 14:06:36 +08:00
30edc317b2
text area for ad_image
2012-04-23 14:06:36 +08:00
ff472714de
AdBanner i18n vars patch
2012-04-23 14:05:18 +08:00
2f279c53ff
Apply patch from ldap
2012-04-23 14:04:55 +08:00
868118116b
Merge commit 'b6f64cd8a5b48ad84703e3824ef4d968ed71779d' into ldap
2012-04-23 13:58:56 +08:00
6a4203b850
Ray's css fix with widget css
2012-04-23 11:53:36 +08:00
b6f64cd8a5
Announcement i18n vars
2012-04-23 11:29:00 +08:00
fe9032787c
NCCU ldap debug
2012-04-23 10:13:44 +08:00
8c42f6bb7c
Merge branch 'desktop_harry' into desktop_devin
2012-04-20 14:44:57 +08:00
2ebed9e44a
javascript update
2012-04-20 09:45:40 +08:00
1f077cf2b3
javascript update
2012-04-20 07:31:48 +08:00
19750d69e0
some update
2012-04-20 05:38:53 +08:00
3eaf97babe
title and heading and welcome msg…
2012-04-19 20:26:21 +08:00
3c5b7a5de3
Modified confirm box…
2012-04-19 15:36:03 +08:00
7e355b77c2
Merge branch 'ldap' of https://github.com/Rulingcom/orbit into ldap
...
Conflicts:
Gemfile
Gemfile.lock
app/views/admin/attributes/_app_selector.html.erb
app/views/admin/module_apps/_app_selector.html.erb
app/views/admin/pages/_app_selector.html.erb
config/application.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
2012-04-19 14:31:05 +08:00
ba0677a001
Merge commit '72efdbd742d4f3ac8a910bd5c817cf5c74570ba5' into ldap
2012-04-19 14:09:37 +08:00
f55b3a4374
Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap
...
Conflicts:
Gemfile
Gemfile.lock
app/views/admin/attributes/_app_selector.html.erb
app/views/admin/module_apps/_app_selector.html.erb
app/views/admin/pages/_app_selector.html.erb
config/application.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
2012-04-19 14:06:00 +08:00
72efdbd742
changes before Chirs and Ray's trip
2012-04-19 11:50:54 +08:00
4bad25e682
Msg box added and background image saving complete
2012-04-18 22:01:12 +08:00
b4bf81d40a
background image…
2012-04-18 18:20:39 +08:00
6b35cf821e
some updates
2012-04-18 18:15:02 +08:00
30a6dc6a95
Merge branch 'desktop_harry' into desktop_devin
2012-04-18 17:58:49 +08:00
11a0875c44
color changes in custom color…
2012-04-18 17:57:47 +08:00
170c12bcdd
fix js
2012-04-18 16:24:17 +08:00
0ddb66a3c9
add i18n vars
2012-04-18 15:33:11 +08:00
8d776fd30d
AdImage and AnBanner JS fixed
2012-04-18 15:26:59 +08:00
d14630769a
Bg color fixed…
2012-04-18 14:57:00 +08:00
b743413be9
function update
2012-04-18 13:17:12 +08:00
7b391904f7
Merge branch 'desktop_devin' of https://github.com/Rulingcom/orbit into desktop_devin
2012-04-17 21:20:36 +08:00
95a1e266ae
Custom thème done and theme id done…
2012-04-17 21:15:40 +08:00
1f44a10206
wallpaper added
2012-04-17 18:06:07 +08:00
b2d72902c3
Merge branch 'desktop_harry' into desktop_devin
2012-04-17 16:35:58 +08:00
02c6933d0b
Tiles position saved in db and also change them from section manager
2012-04-17 16:33:41 +08:00
8cd4844689
html change
2012-04-17 16:32:11 +08:00
51190a79cb
Preview now can be use at both ad_banner and ad_image,however it won't run correctly if user change its ad_banner at ad_image.
2012-04-17 16:03:48 +08:00
a9a4ca6ede
fix i18n vars in ad_banner
2012-04-17 15:21:43 +08:00
06a3128be5
realtime preview is working. but save to object when preview
2012-04-17 11:34:25 +08:00
4f18257733
try
2012-04-17 01:32:53 +08:00
6cdebb440d
Ray's fix for ad_banner
2012-04-13 18:02:36 +08:00
92e898a656
Merge branch 'master' into ldap
2012-04-13 17:52:15 +08:00
7cf00d1d93
text area for ad_image
2012-04-13 17:51:19 +08:00
d81ca40f90
AdBanner i18n vars patch
2012-04-13 17:24:30 +08:00
8d2e5210a1
alert removes
2012-04-13 17:06:27 +08:00
d92451d079
alert removed
2012-04-13 17:05:47 +08:00
7479a64c95
width changes in section page
2012-04-13 17:01:11 +08:00
430b0fd9ae
Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
...
Conflicts:
app/views/admin/ad_banners/_ad_image_update.html.erb
2012-04-13 16:52:14 +08:00
4af73ecf6f
fix preview window size.
2012-04-13 16:46:16 +08:00
0fe5baf93f
fix for letting ad_banner display even when file in not uploaded
2012-04-13 16:14:43 +08:00
a2e35f3626
Merge branch 'master' into ldap
2012-04-13 16:03:57 +08:00
957d4eaebb
Merge branch 'master' into desktop_harry
2012-04-13 16:03:43 +08:00
ebf9a896aa
Merge branches 'dashboard' and 'dashboard' of github.com:Rulingcom/orbit into dashboard
2012-04-13 15:57:42 +08:00
31baa2cb63
new archive
2012-04-13 15:57:15 +08:00
ca0fc4c767
Comment out code that bugged upload image in ad_banner
2012-04-13 15:53:25 +08:00
d1feb102d0
Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
2012-04-13 15:27:10 +08:00
d646a9dff1
fix new ad_image data selector bug
2012-04-13 15:24:59 +08:00
0bcb74d793
new archive
2012-04-13 15:24:19 +08:00
8167172ca9
Merge branch 'master' into desktop_harry
2012-04-13 14:05:08 +08:00
de035cb89a
fix date selector value fill back problem
2012-04-13 13:52:01 +08:00
f54dba8b0b
Merge branch 'master' into desktop_harry
2012-04-13 13:39:00 +08:00
1e43349eb8
Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
2012-04-13 12:48:57 +08:00
fe59446c16
fix date selector value fill back problem
2012-04-13 12:47:57 +08:00
64a9579b92
final on 13 april 00:00
2012-04-13 00:00:24 +08:00
6b43e70f53
Merge branch 'desktop_harry' into desktop_devin
2012-04-12 22:21:05 +08:00
193cee2df7
new icons and widgets
2012-04-12 22:18:58 +08:00
198825a309
Merge branch 'master' into ldap
...
Conflicts:
Gemfile
Gemfile.lock
app/views/admin/attributes/_app_selector.html.erb
app/views/admin/module_apps/_app_selector.html.erb
app/views/admin/pages/_app_selector.html.erb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-04-12 18:50:48 +08:00
f8873267a2
Ray's fix for announcement list
2012-04-12 18:41:14 +08:00
eabbba76fc
css change
2012-04-12 18:14:26 +08:00
6728c35023
Fix side_bar.
...
In the case of tags, take the uri instead of controller name
2012-04-12 18:14:00 +08:00
015c0cb452
Delete useless code in items
2012-04-12 18:13:10 +08:00
93ac99d235
Add missing css in "inc"
2012-04-12 18:12:46 +08:00
01af32aa60
added divs with id
2012-04-12 16:52:32 +08:00
92427e8831
section page done…
2012-04-12 16:25:06 +08:00
7b423877bf
new updates
2012-04-12 14:50:45 +08:00
48323ac1af
lot of changes in fetching
2012-04-12 14:44:08 +08:00
67d1f7ad08
lots of change
2012-04-12 14:19:53 +08:00
b54578ce1e
ad banner preview
2012-04-12 07:14:06 +08:00
83b4443910
add pic and js for permission checkbox and filter
2012-04-12 07:14:06 +08:00
57402b8602
add permission-checkbox js
2012-04-12 07:14:06 +08:00
e4c41ab54c
A filter UI for permission select. with Harry's JS
2012-04-12 07:14:06 +08:00
5417c6fec0
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
2012-04-12 07:13:13 +08:00
7bca339a5b
Ray's fix for columns width in bulletins
2012-04-12 07:01:34 +08:00
486845460c
Filter and delete for bulletins
2012-04-12 06:50:36 +08:00
25ca29403c
section page added
2012-04-11 17:58:52 +08:00
5a6541a592
Setting page update
2012-04-11 17:26:25 +08:00
c55cd5c9bb
Last commit
2012-04-11 15:50:27 +08:00
68803c0c97
Lets see
2012-04-11 15:36:32 +08:00
edf6089e0c
Devin complete
2012-04-11 15:34:19 +08:00
4875b339f8
Fetching desktop from db
2012-04-11 15:31:10 +08:00
1fabe3d8f7
theme setting update
2012-04-11 15:22:05 +08:00
0219c3df28
various update
2012-04-11 15:04:00 +08:00
42f45aa137
theme setting update
2012-04-11 13:46:32 +08:00
ee85380ab2
little update
2012-04-10 18:09:29 +08:00
360e5228b7
custom theme settings
2012-04-10 17:44:36 +08:00
6006f1b3c6
start editing setting page
...
some relevant stuff updated
2012-04-10 01:06:29 +08:00
695c1dee58
Merge branch 'desktop_devin' of https://github.com/Rulingcom/orbit into desktop_devin
2012-04-09 17:55:17 +08:00
32a1be624b
Fully updated..
2012-04-09 17:55:03 +08:00
eb219c14b7
Merge branch 'desktop_harry' of https://github.com/Rulingcom/orbit into desktop_harry
2012-04-09 17:40:13 +08:00
f807cd026d
app section modified…
2012-04-09 17:40:03 +08:00
9dde708c01
app manager page update
2012-04-09 17:13:24 +08:00
d2e77d6bf8
Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
2012-04-09 12:45:27 +08:00
d2a3a4d26e
ad banner preview
2012-04-09 12:44:08 +08:00
0eab9ca8fa
add pic and js for permission checkbox and filter
2012-04-09 12:43:51 +08:00
c7c3af91dd
add permission-checkbox js
2012-04-09 12:43:10 +08:00
e1ef109b8b
Fix bug: Snake -> snake
2012-04-07 01:33:36 +08:00
963a0cb604
Change filter to js with history for bulletins
2012-04-07 00:20:52 +08:00
35567c2139
Widgets Loading dynamically and semi structured
2012-04-06 23:48:03 +08:00
bb2375b15e
Temp Commit
2012-04-06 19:05:11 +08:00
f65bb9b323
Merge branch 'master' into desktop_harry
...
Conflicts:
app/assets/stylesheets/style.css.erb
2012-04-06 19:02:39 +08:00
253f4bcb54
Ray's changes for orbit bar
2012-04-06 18:06:57 +08:00
e1ef2b28e7
theme changes
2012-04-06 17:49:22 +08:00
7309d9c446
Dock change and getting values from db
2012-04-06 17:49:22 +08:00
b2c9229099
route fixed.
2012-04-06 17:47:04 +08:00
3acd8a86c7
commit temp
2012-04-06 17:47:04 +08:00
cd3e04c55c
add tinyscrollbar
2012-04-06 17:47:04 +08:00
293e084bea
dock effect
2012-04-06 17:47:04 +08:00
f5c080efd4
Model commit
2012-04-06 17:47:04 +08:00
79f005c88e
new icons
2012-04-06 17:47:03 +08:00
58b51f0d17
Themes fixed…
2012-04-06 17:47:03 +08:00
ddf6a606a2
with notifications and other changes
2012-04-06 17:47:03 +08:00
6158799a47
Stupid theme
2012-04-06 17:47:03 +08:00
77b2919d8c
Desktop Commit
2012-04-06 17:47:02 +08:00
da7b415ad8
Desktop commit
2012-04-06 17:47:01 +08:00
fa441814f3
A filter UI for permission select. with Harry's JS
2012-04-06 17:46:50 +08:00
6f9363ef54
Fix bugs in upload design and missing menu
2012-04-06 17:37:45 +08:00
94816ce224
js change
2012-04-06 15:18:39 +08:00
74f083b226
details changed
...
orbitdesktop.js, orbitdesktopAPI.js update!
2012-04-06 04:42:20 +08:00
39e1bc8948
new setting page
2012-04-05 20:09:11 +08:00
ad740b0daf
Missing end tag in side_bar
2012-04-05 18:13:52 +08:00
894f8764d8
Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
...
Conflicts:
app/views/layouts/_side_bar.html.erb
2012-04-05 17:42:55 +08:00
01bda515a6
fact_check with Ray's permission check.
...
needs Ray's new css
2012-04-05 17:41:43 +08:00
ef8eb0450b
Changes in tinymce bar
2012-04-05 17:28:21 +08:00
f7997bbd85
layout adjustment
2012-04-05 15:52:15 +08:00
d45725cf3b
fix announcement & add lang tab
2012-04-05 15:23:20 +08:00
ef88c2dbc2
fact_check with Ray's permission check.
...
needs Ray's new css
2012-04-05 15:06:01 +08:00
1259d62249
Fix mainTablePosition in js -> remove the notable class
2012-04-05 14:55:41 +08:00
e0f5583f43
route fixed.
2012-04-05 13:58:58 +08:00
cedd782e7f
Sidebar fix for ad_banner
2012-04-05 13:55:03 +08:00
07dadbef70
commit temp
2012-04-05 13:54:49 +08:00
d8b20ae993
fix ad_banner sidebar
2012-04-05 11:11:48 +08:00
a7d84e8583
add tinyscrollbar
2012-04-05 02:31:32 +08:00
c4b9a9e275
dock effect
2012-04-04 05:53:49 +08:00
11d3906951
new icons
2012-04-03 18:06:16 +08:00
a9988a0d5c
Change for interface,form.
2012-04-02 11:00:51 +08:00
8f28d45379
The new AdBanner.
2012-04-02 03:04:38 +08:00
b17cd7570f
changing to new admin_layout
2012-04-02 02:58:02 +08:00
928c642840
change layout from old admin to new_admin. not complete code
2012-04-02 02:58:01 +08:00
503f71e554
Ray's changes in tags, css and js
2012-04-02 02:55:36 +08:00
6c50aa5243
Add pagination to bulletin index and remove ajax to make it simple
2012-04-02 02:55:36 +08:00
32519f308f
Fix several bus when there is no design
2012-04-02 02:41:42 +08:00
bbd2c23b3d
Themes fixed…
2012-03-30 18:06:06 +08:00
32b7d95669
Fix parser_back_end & side_bar & meta
2012-03-30 15:51:29 +08:00
aa3997f7cf
with notifications and other changes
2012-03-29 19:50:23 +08:00
176597f5af
Stupid theme
2012-03-29 15:23:48 +08:00
2e283a039d
Desktop Commit
2012-03-28 18:53:30 +08:00
4798cd43c1
Desktop commit
2012-03-28 18:53:06 +08:00
d6e4da6dad
Ray's fix for margin-top
2012-03-28 11:31:07 +08:00
cf297fc424
Changed inherited controller in module_apps to OrbitBackendController
2012-03-27 18:58:04 +08:00
d02bbdbaa5
Nokogiri in parsers
2012-03-27 18:58:04 +08:00
55d12e50f2
Ray's changes in announcenment back-end
2012-03-27 18:58:03 +08:00
3ba89ecbcf
Fact check program completed,Lin checked
2012-03-27 18:54:03 +08:00
f5fd3dec7a
Trying nokogiri
2012-03-27 18:42:22 +08:00
f9c5ee5d18
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
app/assets/javascripts/bulletin_form.js.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
vendor/built_in_modules/announcement/config/routes.rb
2012-03-27 18:37:14 +08:00
e8d1352890
fix announcement
2012-03-27 14:29:11 +08:00
a30bc499c7
fix announcement & links
2012-03-27 14:19:58 +08:00
42519d9f78
fix announcement & links
2012-03-23 18:04:11 +08:00
61698f3f2c
Remove quick_edit on bulletin index load
2012-03-23 17:32:59 +08:00
a126935d2c
Clean the parsers and introduce the metas
2012-03-21 18:30:12 +08:00
472744fc87
Changes for IE9 with html5
2012-03-21 15:51:55 +08:00
2c6208db3c
Merge branch 'master' into ldap
2012-03-21 12:44:22 +08:00
3aa7c5120d
Put tinymce in its own js file.
...
To use on a text area just add the class "tinymce_textarea".
2012-03-21 12:41:32 +08:00
a1034f90ba
close alpha on nccu
2012-03-20 14:38:01 +08:00
5fcd3cd783
Merge branch 'master' into ldap
2012-03-20 14:27:04 +08:00
e953344965
Fix before_filter order for object_auth
2012-03-20 14:17:28 +08:00
49ece7be6a
Merge branch 'master' into ldap
2012-03-19 15:50:53 +08:00
7cc075e124
Change the monkey picture
2012-03-19 15:49:40 +08:00
47215693c4
Merge branch 'master' into ldap
...
Conflicts:
Gemfile
Gemfile.lock
config/application.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
2012-03-19 14:27:15 +08:00
a755eb184b
fix announcement links & files
2012-03-16 16:49:25 +08:00
7d553acaec
fix announcement link & files
2012-03-16 15:53:57 +08:00
07edf44643
Merge branches 'design_team' and 'design_team' of github.com:Rulingcom/orbit into design_team
2012-03-16 15:13:06 +08:00
29ec36130e
css and js changes
2012-03-16 15:06:45 +08:00
f4fda08e86
Replace PrototypeR4 by Orbit.
...
Move session into mongoid_store.
Reset session when sing_in.
2012-03-16 14:58:32 +08:00
785ead5209
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
app/views/layouts/_side_bar.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
2012-03-16 14:55:21 +08:00
6f6e84b015
fix dashboard & announcement
2012-03-16 14:44:57 +08:00
b6d49df145
Change Obit to Orbit
2012-03-16 11:54:31 +08:00
13b6892f87
code for new fact check
2012-03-16 11:09:44 +08:00
00ab773942
fix dashboard & announcement
2012-03-14 20:05:03 +08:00
4dd9b7ffa4
Fix announcement pagination in front-end
2012-03-07 18:16:59 +08:00
0b1f83c042
Fix extra loaded js: the widgets only need to render layout when they need js.
2012-03-07 18:16:59 +08:00
d5a2de5476
LDAP with sync rake task
2012-03-06 16:41:06 +08:00
7f05f21930
Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap
...
Conflicts:
config/environments/development.rb
2012-03-01 10:13:49 +08:00
cceb785a8d
change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action.
2012-02-29 18:58:33 +08:00
8932615f05
add "all_user" for app&object auth
2012-02-29 18:56:42 +08:00
2e58c63ff7
fix bugs with token
2012-02-29 18:56:42 +08:00
cc550c5745
First version for App and Object auth.Taking Announcement as experiment
2012-02-29 18:55:55 +08:00
3bcd7ea349
Exp with object_auth
2012-02-29 18:50:23 +08:00
6b2aeadde6
Changes for nccu
2012-02-29 16:01:50 +08:00
9a40ecd1d9
Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine
...
Conflicts:
app/views/devise/passwords/new.html.erb
app/views/devise/sessions/new.html.erb
2012-02-29 13:07:21 +08:00
5223a7a3e9
Css and js changes
2012-02-29 12:45:47 +08:00
b84b7bad63
ldap config for 0229 nccu demo
2012-02-29 12:35:54 +08:00
ccb61fc2dd
change Search bar
2012-02-29 11:29:13 +08:00
0fa5c3ba9d
Fix bug in orbit-bar
2012-02-29 04:56:52 +08:00
344ec86c57
Remove class 'error' in devise forms
2012-02-29 04:56:32 +08:00
4b7b57bb3d
Add some missing translations
2012-02-29 04:48:21 +08:00
9aa4173933
Change orbit-bar for language but bug when user name is too long
2012-02-29 04:21:56 +08:00
18617850e5
Add categories for all the widgets
2012-02-28 22:00:05 +08:00
6a30b0a1e4
Add RSS event
2012-02-28 18:29:13 +08:00
fdf4cfad2d
Add category for announcement widget
2012-02-28 14:08:57 +08:00
7f9a7edc98
Changes in bulletins widget and front-end, add categories to link
2012-02-28 04:24:09 +08:00
f13ebc6c46
Fix bugs and changes for nccu
2012-02-27 18:50:56 +08:00
3209f9aa27
Complete for 229 check.
2012-02-24 19:07:47 +08:00
dcc64a20d2
Finish sorting for announcements
2012-02-24 15:30:49 +08:00
8f531a6fe5
Fix bus for pages and page content
2012-02-24 15:14:23 +08:00
f8d1d7242d
Merge branch 'design_team' into dashboard
2012-02-23 16:05:33 +08:00
1a6e497b3d
Ika's changes
2012-02-23 15:53:15 +08:00
63d7810b35
Add isotope, categories for announcement page, sort for announcement
2012-02-23 15:52:58 +08:00
53ed4b0404
Initial changes in announcement for sorting and filtering
2012-02-23 15:51:33 +08:00
22d9741ac8
Fix for orbit_bar
2012-02-23 15:51:33 +08:00
ba4d71a026
Changes in orbit_bar and js in announcements
2012-02-23 15:51:33 +08:00
678f1eabef
LDAP connection and modified Devise
2012-02-22 14:43:24 +08:00
9b001aa6c3
new page_content app
2012-02-21 19:22:42 +08:00
1146506063
Fix bug when no bulletins or web_links
2012-02-20 15:56:17 +08:00
c304819d6b
Commented out code for Windows
2012-02-20 08:55:21 +08:00
cf038183b9
Ika's changes in modules
2012-02-20 08:48:27 +08:00
a3f152b200
Changes for jquery 1.7 (.live -> .on), create module_layout
2012-02-20 03:24:05 +08:00
3ff2e7867e
Fix bug when editing home
2012-02-20 03:22:53 +08:00
44a346ffe9
Changes for orbit bar, login
2012-02-19 16:33:22 +08:00
0b71714d44
Improve code in items, pages, links
2012-02-17 14:54:11 +08:00
cf4a6c0b35
Remove useless destroy methods
2012-02-17 12:26:03 +08:00
9cd3cbc478
Modifications for design, pages, page_parts…
...
Move orbit_bar out of kernel.js
2012-02-17 02:09:32 +08:00
4389f0cf28
Add new created files to previous commit
2012-02-16 13:09:09 +08:00
e0accbecaa
Changes into page_part edition.
...
Can choose between 'text', 'public_r_tag' and 'widget'
2012-02-16 13:09:09 +08:00
edf236c1c7
edit tags
2012-02-15 15:38:27 +08:00
af3a2547e1
Change ModuleAppTag into "Module name"Tag.
2012-02-15 15:18:11 +08:00
d0c2856a3a
Fix relations error in tags
2012-02-15 11:42:19 +08:00
778a85ca2b
add tags
2012-02-15 10:37:07 +08:00
1913f0aca8
Add tinymce
2012-02-15 10:02:05 +08:00
3e70634add
Announcement modifications and tags
2012-02-15 00:34:22 +08:00
f57e9f19f7
Changes for multiple i18n_variable in bulletin
2012-02-15 00:34:22 +08:00
1f7dae9bee
Gemfile and bugs in js for orbit-bar
2012-02-15 00:34:22 +08:00
55ae7de01c
Orbit-bar in front-end and back-end, side-bar and drop-down menu
2012-02-15 00:34:22 +08:00
dcc6a53430
brief starting for dashboard,adds i18n vars
2012-02-15 00:34:21 +08:00
436f039c1b
build interface to work with object auth. Go to panel/new_blog/back_end/posts/ ,click New Auth link
2012-02-15 00:34:21 +08:00
e20739e32b
Object Auth. Now object can be included with "include OrbitCoreLib::ObjectAuthable" to use kernel method,such as
...
1.Object.authed_for_user(user,title_of_object_auth). title_of_object_auth is optional
2.object.authed_users(user,title_of_object_auth) . title_of_object_auth is optional
if title_of_object_auth is not given,then it will return calculation across all possiblity.
2012-02-15 00:34:21 +08:00
3ed9b81df9
first commit for object auth,will take new_blog for experiment
2012-02-15 00:34:21 +08:00
964d7b6054
announcement path error
2012-02-13 17:09:37 +08:00
872a00b6a2
Forgot to change title in key in pages_controller
2012-02-06 22:09:33 +08:00
f097f83f2b
announcement_category edit
2012-02-06 16:20:51 +08:00
8b3b71ca58
fix js bugs,partial bugs
2012-02-06 16:17:07 +08:00
394099c388
Ad banner close complete,need validation
2012-02-04 09:37:23 +08:00
68cea1ea49
AdBanner is now working
2012-02-04 09:37:23 +08:00
f530eb7112
Revert "mistake commit"
...
This reverts commit 2608b72d65
2012-02-03 14:39:15 +08:00
2608b72d65
mistake commit
2012-02-03 14:28:08 +08:00
a980847eb3
Basic function for AdBanner
2012-02-01 14:27:51 +08:00
ccbde122df
Fix bugs in design.
...
The static js were loaded after the page js.
parser_back_end.rb wasn't changed for the new routes.
The themes weren't parsed and saved correctly.
2012-01-31 16:38:25 +08:00
4906894fb5
Page edit wasn't showing when module_app was nil
2012-01-31 16:35:40 +08:00
762c2f5e8a
Add key in module_app.rb to use instead of title for authorization
2012-01-30 18:12:18 +08:00
46db173e0b
Modifications in the Design code: the uploader works but the edit is broken
2012-01-26 12:05:25 +08:00
783eae4597
Change "NewBlog" folders into "new_blog" in assets
...
Modify routes and pages handling for clean front-end urls
2012-01-24 18:16:58 +08:00
6a196c5d3d
Embedded to referenced for users
2012-01-24 15:12:06 +08:00
83827f82ec
Fix custom image class
2012-01-24 15:11:42 +08:00
afbb9e266a
User role and sub_role simple interface complete
2012-01-24 12:28:33 +08:00
959f3e8b2f
put setup APP var setup into Orbit class
2012-01-24 12:28:32 +08:00
4ed8a2164c
First complete with manager and submanager
2012-01-24 12:28:32 +08:00
4df8ab6cc3
Add methods to work with manager role,add task to build user test data
2012-01-24 12:28:32 +08:00
18a82d7f47
Manger and SubManager
2012-01-24 12:28:32 +08:00
9fcf8280fa
Change "_filename" to "_identifier" for carrierwave
2012-01-24 11:57:27 +08:00
5518ae362d
Ray's modification before redesign
2012-01-24 11:57:27 +08:00
bfd55277d7
Embed attribute_fields and sub_roles
2012-01-24 11:57:27 +08:00
1bbb197fba
Forgot to remove ":remote => true" for asset new
2012-01-24 11:56:08 +08:00
b04d845a5a
New rss.js from Harry and fix html form for assets
2012-01-24 11:56:08 +08:00
4cfae9c107
announcement widget query
2012-01-18 21:34:26 +08:00
3e912b6262
Merge branches 'master' and 'exception_notification' into new_announcement_dev
2012-01-16 07:57:40 +08:00
4be97f6ea6
Merge branch 'fix_it'
...
Conflicts:
app/assets/javascripts/page_edit.js
app/assets/javascripts/rss.js
app/assets/stylesheets/admin.css.erb
app/assets/stylesheets/admin_back_end.css.erb
app/controllers/admin/app_auths_controller.rb
app/controllers/admin/module_apps_controller.rb
app/controllers/admin/users_controller.rb
app/controllers/application_controller.rb
app/models/app_auth.rb
app/models/user/user.rb
app/views/admin/app_auths/index.html.erb
app/views/admin/attributes/_attribute_field.html.erb
app/views/admin/designs/_new.html.erb
app/views/admin/designs/new.html.erb
app/views/admin/infos/_form.html.erb
app/views/admin/module_apps/_app_selector.html.erb
app/views/admin/module_apps/index.html.erb
app/views/admin/pages/_form.html.erb
app/views/admin/roles/_form.html.erb
app/views/admin/roles/_sub_role.html.erb
app/views/admin/users/_form.html.erb
app/views/admin/users/_show_sub_role.html.erb
app/views/admin/users/_sub_role.html.erb
app/views/admin/users/edit.html.erb
app/views/admin/users/index.html.erb
app/views/admin/users/new.html.erb
app/views/admin/users/show.html.erb
app/views/layouts/admin.html.erb
lib/fraisier/layout.html
lib/parsers/parser_back_end.rb
lib/parsers/parser_layout.rb
lib/tasks/dev.rake
spec/models/app_auth_basic.rb
vendor/built_in_modules/NewBlog/.gitignore
vendor/built_in_modules/NewBlog/Gemfile
vendor/built_in_modules/NewBlog/Gemfile.lock
vendor/built_in_modules/NewBlog/MIT-LICENSE
vendor/built_in_modules/NewBlog/NewBlog.gemspec
vendor/built_in_modules/NewBlog/README.rdoc
vendor/built_in_modules/NewBlog/Rakefile
vendor/built_in_modules/NewBlog/app/assets/images/NewBlog/.gitkeep
vendor/built_in_modules/NewBlog/app/assets/javascripts/NewBlog/.gitkeep
vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/.gitkeep
vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/application.css
vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/production.css
vendor/built_in_modules/NewBlog/app/controllers/.gitkeep
vendor/built_in_modules/NewBlog/app/controllers/application_controller.rb
vendor/built_in_modules/NewBlog/app/controllers/panel/blog/back_end/posts_controller.rb
vendor/built_in_modules/NewBlog/app/helpers/.gitkeep
vendor/built_in_modules/NewBlog/app/helpers/application_helper.rb
vendor/built_in_modules/NewBlog/app/mailers/.gitkeep
vendor/built_in_modules/NewBlog/app/models/.gitkeep
vendor/built_in_modules/NewBlog/app/models/comment.rb
vendor/built_in_modules/NewBlog/app/models/post.rb
vendor/built_in_modules/NewBlog/app/views/.gitkeep
vendor/built_in_modules/NewBlog/app/views/layouts/application.html.erb
vendor/built_in_modules/NewBlog/app/views/layouts/edit_view.html.erb
vendor/built_in_modules/NewBlog/app/views/layouts/production.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/_form.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/index.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/latest_post.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/new.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/show.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/front_end/posts/show.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/widget/posts/index.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/widget/posts/latest_post.html.erb
vendor/built_in_modules/NewBlog/config/locales/en.yml
vendor/built_in_modules/NewBlog/lib/NewBlog.rb
vendor/built_in_modules/NewBlog/lib/NewBlog/engine.rb
vendor/built_in_modules/NewBlog/lib/NewBlog/version.rb
vendor/built_in_modules/NewBlog/lib/tasks/NewBlog_tasks.rake
vendor/built_in_modules/NewBlog/script/rails
vendor/built_in_modules/NewBlog/test/NewBlog_test.rb
vendor/built_in_modules/NewBlog/test/dummy/Rakefile
vendor/built_in_modules/NewBlog/test/dummy/app/assets/javascripts/application.js
vendor/built_in_modules/NewBlog/test/dummy/app/assets/stylesheets/application.css
vendor/built_in_modules/NewBlog/test/dummy/app/controllers/application_controller.rb
vendor/built_in_modules/NewBlog/test/dummy/app/helpers/application_helper.rb
vendor/built_in_modules/NewBlog/test/dummy/app/mailers/.gitkeep
vendor/built_in_modules/NewBlog/test/dummy/app/models/.gitkeep
vendor/built_in_modules/NewBlog/test/dummy/app/views/layouts/application.html.erb
vendor/built_in_modules/NewBlog/test/dummy/config.ru
vendor/built_in_modules/NewBlog/test/dummy/config/application.rb
vendor/built_in_modules/NewBlog/test/dummy/config/boot.rb
vendor/built_in_modules/NewBlog/test/dummy/config/database.yml
vendor/built_in_modules/NewBlog/test/dummy/config/environment.rb
vendor/built_in_modules/NewBlog/test/dummy/config/environments/development.rb
vendor/built_in_modules/NewBlog/test/dummy/config/environments/production.rb
vendor/built_in_modules/NewBlog/test/dummy/config/environments/test.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/backtrace_silencers.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/inflections.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/mime_types.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/secret_token.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/session_store.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/wrap_parameters.rb
vendor/built_in_modules/NewBlog/test/dummy/config/locales/en.yml
vendor/built_in_modules/NewBlog/test/dummy/config/mongoid.yml
vendor/built_in_modules/NewBlog/test/dummy/config/routes.rb
vendor/built_in_modules/NewBlog/test/dummy/lib/assets/.gitkeep
vendor/built_in_modules/NewBlog/test/dummy/log/.gitkeep
vendor/built_in_modules/NewBlog/test/dummy/public/404.html
vendor/built_in_modules/NewBlog/test/dummy/public/422.html
vendor/built_in_modules/NewBlog/test/dummy/public/500.html
vendor/built_in_modules/NewBlog/test/dummy/public/favicon.ico
vendor/built_in_modules/NewBlog/test/dummy/script/rails
vendor/built_in_modules/NewBlog/test/integration/navigation_test.rb
vendor/built_in_modules/NewBlog/test/test_helper.rb
vendor/built_in_modules/blog/app/controllers/application_controller.rb
vendor/built_in_modules/blog/app/controllers/panel/blog/posts_controller.rb
vendor/built_in_modules/blog/app/helpers/application_helper.rb
vendor/built_in_modules/blog/app/models/comment.rb
vendor/built_in_modules/blog/app/models/post.rb
vendor/built_in_modules/blog/app/views/layouts/application.html.erb
vendor/built_in_modules/blog/app/views/panel/blog/posts/_form.html.erb
vendor/built_in_modules/blog/app/views/panel/blog/posts/index.html.erb
vendor/built_in_modules/blog/app/views/panel/blog/posts/show.html.erb
vendor/built_in_modules/blog/config/initializers/backtrace_silencers.rb
vendor/built_in_modules/blog/config/initializers/inflections.rb
vendor/built_in_modules/blog/config/initializers/mime_types.rb
vendor/built_in_modules/blog/public/404.html
vendor/built_in_modules/blog/public/422.html
vendor/built_in_modules/blog/public/500.html
vendor/built_in_modules/blog/public/favicon.ico
vendor/built_in_modules/blog/public/stylesheets/.gitkeep
vendor/built_in_modules/blog/script/rails
vendor/built_in_modules/blog/vendor/plugins/.gitkeep
vendor/built_in_modules/new_blog/.gitignore
vendor/built_in_modules/new_blog/Gemfile
vendor/built_in_modules/new_blog/Gemfile.lock
vendor/built_in_modules/new_blog/MIT-LICENSE
vendor/built_in_modules/new_blog/README.rdoc
vendor/built_in_modules/new_blog/Rakefile
vendor/built_in_modules/new_blog/app/assets/images/NewBlog/.gitkeep
vendor/built_in_modules/new_blog/app/assets/javascripts/NewBlog/.gitkeep
vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/.gitkeep
vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/application.css
vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/production.css
vendor/built_in_modules/new_blog/app/controllers/.gitkeep
vendor/built_in_modules/new_blog/app/controllers/application_controller.rb
vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/back_end/posts_controller.rb
vendor/built_in_modules/new_blog/app/helpers/.gitkeep
vendor/built_in_modules/new_blog/app/mailers/.gitkeep
vendor/built_in_modules/new_blog/app/models/.gitkeep
vendor/built_in_modules/new_blog/app/models/comment.rb
vendor/built_in_modules/new_blog/app/models/post.rb
vendor/built_in_modules/new_blog/app/views/.gitkeep
vendor/built_in_modules/new_blog/app/views/layouts/application.html.erb
vendor/built_in_modules/new_blog/app/views/layouts/edit_view.html.erb
vendor/built_in_modules/new_blog/app/views/layouts/production.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/_form.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/index.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/latest_post.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/new.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/show.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/show.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/index.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/latest_post.html.erb
vendor/built_in_modules/new_blog/config/locales/en.yml
vendor/built_in_modules/new_blog/lib/new_blog/version.rb
vendor/built_in_modules/new_blog/lib/tasks/NewBlog_tasks.rake
vendor/built_in_modules/new_blog/new_blog.gemspec
vendor/built_in_modules/new_blog/script/rails
vendor/built_in_modules/new_blog/test/NewBlog_test.rb
vendor/built_in_modules/new_blog/test/dummy/Rakefile
vendor/built_in_modules/new_blog/test/dummy/app/assets/javascripts/application.js
vendor/built_in_modules/new_blog/test/dummy/app/assets/stylesheets/application.css
vendor/built_in_modules/new_blog/test/dummy/app/controllers/application_controller.rb
vendor/built_in_modules/new_blog/test/dummy/app/helpers/application_helper.rb
vendor/built_in_modules/new_blog/test/dummy/app/mailers/.gitkeep
vendor/built_in_modules/new_blog/test/dummy/app/models/.gitkeep
vendor/built_in_modules/new_blog/test/dummy/app/views/layouts/application.html.erb
vendor/built_in_modules/new_blog/test/dummy/config.ru
vendor/built_in_modules/new_blog/test/dummy/config/application.rb
vendor/built_in_modules/new_blog/test/dummy/config/boot.rb
vendor/built_in_modules/new_blog/test/dummy/config/database.yml
vendor/built_in_modules/new_blog/test/dummy/config/environment.rb
vendor/built_in_modules/new_blog/test/dummy/config/environments/development.rb
vendor/built_in_modules/new_blog/test/dummy/config/environments/production.rb
vendor/built_in_modules/new_blog/test/dummy/config/environments/test.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/backtrace_silencers.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/inflections.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/mime_types.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/secret_token.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/session_store.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/wrap_parameters.rb
vendor/built_in_modules/new_blog/test/dummy/config/locales/en.yml
vendor/built_in_modules/new_blog/test/dummy/config/mongoid.yml
vendor/built_in_modules/new_blog/test/dummy/config/routes.rb
vendor/built_in_modules/new_blog/test/dummy/lib/assets/.gitkeep
vendor/built_in_modules/new_blog/test/dummy/log/.gitkeep
vendor/built_in_modules/new_blog/test/dummy/public/404.html
vendor/built_in_modules/new_blog/test/dummy/public/422.html
vendor/built_in_modules/new_blog/test/dummy/public/500.html
vendor/built_in_modules/new_blog/test/dummy/public/favicon.ico
vendor/built_in_modules/new_blog/test/dummy/script/rails
vendor/built_in_modules/new_blog/test/integration/navigation_test.rb
vendor/built_in_modules/new_blog/test/test_helper.rb
vendor/plugins/NewBlog/.gitignore
vendor/plugins/NewBlog/Gemfile
vendor/plugins/NewBlog/Gemfile.lock
vendor/plugins/NewBlog/MIT-LICENSE
vendor/plugins/NewBlog/NewBlog.gemspec
vendor/plugins/NewBlog/README.rdoc
vendor/plugins/NewBlog/Rakefile
vendor/plugins/NewBlog/app/assets/images/NewBlog/.gitkeep
vendor/plugins/NewBlog/app/assets/javascripts/NewBlog/.gitkeep
vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/.gitkeep
vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/application.css
vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/production.css
vendor/plugins/NewBlog/app/controllers/.gitkeep
vendor/plugins/NewBlog/app/helpers/.gitkeep
vendor/plugins/NewBlog/app/mailers/.gitkeep
vendor/plugins/NewBlog/app/models/.gitkeep
vendor/plugins/NewBlog/app/views/.gitkeep
vendor/plugins/NewBlog/app/views/layouts/edit_view.html.erb
vendor/plugins/NewBlog/app/views/layouts/production.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/index.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/latest_post.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/new.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/show.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_index.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_latest_post.html.erb
vendor/plugins/NewBlog/config/locales/en.yml
vendor/plugins/NewBlog/lib/NewBlog/version.rb
vendor/plugins/NewBlog/lib/tasks/NewBlog_tasks.rake
vendor/plugins/NewBlog/script/rails
vendor/plugins/NewBlog/test/NewBlog_test.rb
vendor/plugins/NewBlog/test/dummy/Rakefile
vendor/plugins/NewBlog/test/dummy/app/assets/javascripts/application.js
vendor/plugins/NewBlog/test/dummy/app/assets/stylesheets/application.css
vendor/plugins/NewBlog/test/dummy/app/controllers/application_controller.rb
vendor/plugins/NewBlog/test/dummy/app/mailers/.gitkeep
vendor/plugins/NewBlog/test/dummy/app/models/.gitkeep
vendor/plugins/NewBlog/test/dummy/app/views/layouts/application.html.erb
vendor/plugins/NewBlog/test/dummy/config.ru
vendor/plugins/NewBlog/test/dummy/config/application.rb
vendor/plugins/NewBlog/test/dummy/config/boot.rb
vendor/plugins/NewBlog/test/dummy/config/database.yml
vendor/plugins/NewBlog/test/dummy/config/environment.rb
vendor/plugins/NewBlog/test/dummy/config/environments/development.rb
vendor/plugins/NewBlog/test/dummy/config/environments/production.rb
vendor/plugins/NewBlog/test/dummy/config/environments/test.rb
vendor/plugins/NewBlog/test/dummy/config/initializers/secret_token.rb
vendor/plugins/NewBlog/test/dummy/config/initializers/session_store.rb
vendor/plugins/NewBlog/test/dummy/config/initializers/wrap_parameters.rb
vendor/plugins/NewBlog/test/dummy/config/locales/en.yml
vendor/plugins/NewBlog/test/dummy/config/mongoid.yml
vendor/plugins/NewBlog/test/dummy/config/routes.rb
vendor/plugins/NewBlog/test/integration/navigation_test.rb
vendor/plugins/NewBlog/test/test_helper.rb
2012-01-12 18:15:43 +08:00
c0efb5d1bc
Listing for Module-apps
2012-01-12 14:13:41 +08:00
ec235bcaa3
merge with master
2012-01-11 20:31:52 +08:00
cae3daa9c4
Change NewBlog to new_blog
2012-01-10 18:29:11 +08:00
79f778ad8c
creating for disabling widgets and frontend
2012-01-05 16:21:33 +08:00
7b40706aed
fixing for app_auth
2012-01-05 16:20:51 +08:00
7ebfe3a7f9
Add missing id in site_editor.html.erb and comment out in parser_back_end.rb because of a loading bug
2011-12-29 18:08:08 +08:00
d85f29e65c
Fix missing modification for "panel_main" to "back_main"
2011-12-29 17:49:48 +08:00
c1238a7043
Prefix ids with "back_" in back-end layout to avoid conflict with site's ids
2011-12-29 15:35:13 +08:00
ea19f11fe2
Integrate Harry's modifications to reload pop-up content
2011-12-29 14:09:06 +08:00
b002c411ce
Merge branch 'design_team'
2011-12-28 21:03:35 +08:00
75c9851dbc
Ray's back-end modifications for sub-roles
2011-12-28 20:57:18 +08:00
090493fd51
Re-commit
2011-12-28 20:51:52 +08:00
245def9cb6
Integration of pop-up and generic js.erb
2011-12-28 20:49:53 +08:00
62aaf79491
Merge with sub_roles
2011-12-23 18:34:21 +08:00
fc591ee308
Ray's back_end modification before sub_roles
2011-12-23 18:02:45 +08:00
d3ca1647be
fix page form bugs
2011-12-23 13:54:28 +08:00
a9f06b9517
Divide parser into sub-parsers
2011-12-22 16:23:48 +08:00
d465febca7
merge with november_presentation
2011-12-22 15:43:38 +08:00
e7c9816139
Move NewBlog to built_in_modules and delete "vendor/templates"
2011-12-22 01:38:27 +08:00
a09f8e4551
merge with november_presentation
2011-12-20 16:47:17 +08:00
afbffe37d5
Users can now be saved with sub_roles
2011-12-20 14:35:28 +08:00
4108ebf06d
Fix mongoid deeply nested polimorphic
...
Got the commit from github. The roles and sub_roles save.
2011-12-19 21:22:26 +08:00
d27d7a623c
Changes for sub_roles
...
Issues: update doesn't create new i18n_variables, role form has bugs
2011-12-18 10:07:42 +08:00
d23cf152da
Merge 'standardization' and 'role structure modification'
2011-12-10 18:21:59 +08:00
b7ac5478b4
Change role structure
...
Still needs to: change the views and create sub_roles in the dev.rake
2011-12-10 18:12:39 +08:00
f774084e9a
Back-end standardization
2011-12-10 18:03:32 +08:00
Rueshyna
Harry Bomrah
Matthew K. Fu JuYuan
chris
OrbitServer
Matt
Fu Matthew
unknown
devin
Joshua Milton
Christophe Vilayphiou
nccu
unknown
Matthew Kaito Juyuan Fu