Harry Bomrah
e3d9966f76
bugs fixed for plugins. .. and also css fixed
2013-08-06 17:53:04 +08:00
Harry Bomrah
c2f223b82c
new plugins added for desktop
2013-08-06 17:52:39 +08:00
Harry Bomrah
42615f02ea
new feature in desktop for uploading wallpapers or putting url link
2013-08-02 19:32:41 +08:00
chris
0f3a8414be
Delete duplicate js and css
...
Close the form in search in orbit bar
2013-07-31 17:30:53 +08:00
chris
d632439f80
Add class for Ray's check-box
...
Fix some typos
Change the default index for auth
Add some hard code in object_auth.rb to handle page_context
A user cannot select himself in authorisation
2013-07-31 00:08:15 +08:00
saurabhbhatia
b1755bdc80
Added Stock Backgrounds, Fixed production issue with desktop css
2013-07-30 18:37:36 +08:00
saurabhbhatia
7e67d389b9
Added new orbit bar to compatibility page
2013-07-30 17:15:57 +08:00
saurabhbhatia
094c0f4314
Updated desktop compatibility to fix css paths
2013-07-30 17:15:55 +08:00
saurabhbhatia
d9079d9d7c
Updated with icons, latest js and css for desktop
2013-07-30 16:43:47 +08:00
saurabhbhatia
aeaec79a2c
new themes, apps and widgets for new ui
2013-07-30 16:43:44 +08:00
saurabhbhatia
e12b14311e
Updated Desktop with new UI
2013-07-30 16:43:41 +08:00
saurabhbhatia
55d9aea664
Merged Desktop with New UI
2013-07-30 16:43:38 +08:00
Harry Bomrah
79c7f8e90f
new orbit bar fixed..
...
Conflicts:
app/assets/javascripts/orbit_js_1.0.1-front-end.js
app/assets/stylesheets/basic/orbit_bar.css.erb
app/assets/stylesheets/orbit_bar_bootstrap.css
app/views/layouts/_left_menu.html.erb
app/views/layouts/_orbit_bar.html.erb
app/views/layouts/_right_menu.html.erb
app/views/layouts/desktop.html.erb
2013-07-30 16:43:35 +08:00
Harry Bomrah
f7dbbf1bca
new themes added to desktop plus theme uploader created
2013-07-30 16:43:32 +08:00
Harry Bomrah
6d89eab98a
desktop final fix
2013-07-30 16:43:28 +08:00
Harry Bomrah
38194311ab
some changes again
2013-07-30 16:43:18 +08:00
Harry Bomrah
5f9190db39
few updates with fb integration and some other changes in user and supports data to android
...
Conflicts:
vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb
2013-07-30 16:43:11 +08:00
devin chen
ac58b993c2
simple component update
...
minor update
2013-07-30 16:43:09 +08:00
devin chen
2b12a4775c
Various view update and change #thmbackground tag
2013-07-30 16:43:02 +08:00
devin chen
b085e826a5
fix loading Section page for Chrome
2013-07-30 16:42:59 +08:00
devin chen
ff375f0c5c
minor update
2013-07-30 16:42:56 +08:00
devin chen
3cde26ca4a
gridster update
2013-07-30 16:42:53 +08:00
Harry Bomrah
ed22a4d303
apps update -- app upload and activation
2013-07-30 16:42:50 +08:00
devin chen
f2ada14b7a
app manager's view update
2013-07-30 16:42:46 +08:00
devin chen
9963395b05
'select2' minor update
...
Conflicts:
app/assets/Archive/stylesheets/admin/add_attribute_field.js.erb.bak
2013-07-30 16:42:40 +08:00
Harry Bomrah
66582fb671
fixed saving of positions of the tiles again
2013-07-30 16:42:36 +08:00
devin chen
4ae1fe68cd
app manager view update
2013-07-30 16:42:33 +08:00
Harry Bomrah
2d616ab7a8
solved desktop conflict during cherry pick
2013-07-30 16:42:26 +08:00
devin chen
874819266d
minor update
2013-07-30 16:42:23 +08:00
devin chen
3ded19016a
apps setting view
2013-07-30 16:42:20 +08:00
Harry Bomrah
9478bb13e2
search fixed again according to devin requirements
2013-07-30 16:42:14 +08:00
Harry Bomrah
cff77fbee5
new search for app manager and few javascript fixes
2013-07-30 16:42:11 +08:00
devin chen
ad68f63a7a
style for checkbox, radio button
2013-07-30 16:41:58 +08:00
Harry Bomrah
20521dc8b0
removing duplicate code from js file
2013-07-30 16:41:54 +08:00
devin chen
a458a50e97
publication's view update
2013-07-30 16:41:48 +08:00
Harry Bomrah
ae8033ea1b
duplicate error fixed and css inside widgets fixed, duplicate location fixed
2013-07-30 16:41:44 +08:00
Harry Bomrah
dc94283af9
duplicate error fixed and css inside widgets fixed, duplicate location fixed
2013-07-30 16:41:38 +08:00
Harry Bomrah
b70310c6fe
tiny scrollbar update
2013-07-30 16:41:25 +08:00
devin chen
4215ed5538
minor update
2013-07-30 16:41:16 +08:00
chris
74b2bbf4b7
Fix link in structure when the item is a link
...
Add internal links creation
2013-07-30 11:49:28 +08:00
chris
c85629d3b3
Fix controller js and css loading error
2013-07-30 11:48:14 +08:00
chris
af98f8efce
Fix orbit bar language change
2013-07-29 19:49:07 +08:00
chris
ff59feb2e7
Fix for structure
2013-07-29 18:46:38 +08:00
chris
f332a3191a
Fiix layout for safari
2013-07-29 17:34:29 +08:00
chris
d190a50046
Breadcrumb for dashboard (tags and categories cannot link to original module index)
2013-07-29 17:34:03 +08:00
chris
fe10cc62d9
Fix structure title (page slide)
2013-07-29 14:59:02 +08:00
chris
d434b878a7
Add default delete modal usage:
...
- <%= render 'layouts/delete_modal', delete_options: {title: '', warning: '', cancel: '', submit: '' } %>
- in default index, just set title, warning, cancel and submit in quick_edit if needed
2013-07-29 14:29:37 +08:00
chris
0be8a74fa8
Fix missing condition in index auth
2013-07-25 17:45:39 +08:00
chris
da1d70efcb
Change authorization to accept other than category
2013-07-25 17:36:55 +08:00
chris
0c208d0020
Remove some css causing errors in precompile
...
Remove the image in announcement index
Set the db to test_site
2013-07-25 13:15:49 +08:00
chris
1dc7884ec0
Changes for default index:
...
- remove approvable and filterable
- add display_option
- change params
Update web link and gallery index
2013-07-25 11:32:25 +08:00
Harry Bomrah
57a64dc378
mini colors in new ui fixed
2013-07-23 12:12:46 +08:00
chris
0d0f85e7ad
Fix tooltip in form
...
Change form_file
2013-07-22 20:54:40 +08:00
Spen
5d3bc07488
archive and web_resouce for new ui
...
Conflicts:
app/assets/stylesheets/lib/main-forms.css
2013-07-22 18:14:33 +08:00
chris
1ba1703e90
Fix get_viewable
2013-07-22 17:41:52 +08:00
chris
6cf249ccfb
Change ckeditor gem and kaminari in gemfile
2013-07-22 17:26:32 +08:00
chris
92faeccdb6
Revert change in main-form and change class name of form_file
2013-07-22 17:24:58 +08:00
chris
5284571300
Add tooltip to bulletin form and remove file
2013-07-22 16:55:02 +08:00
chris
fe82427baa
Ray's changes for css and js
2013-07-22 16:31:44 +08:00
rulingcom
408bebaa4b
Ray's changes in structure
2013-07-22 14:06:58 +08:00
saurabhbhatia
c8292a7619
Updated zh_tw translation for sidebar labels
...
Conflicts:
vendor/built_in_modules/location/config/locales/zh_tw.yml
2013-07-22 12:17:31 +08:00
saurabhbhatia
7ea9945af0
Location - category fixes
...
Conflicts:
app/models/category.rb
vendor/built_in_modules/location/init.rb
2013-07-22 12:17:29 +08:00
saurabhbhatia
109b891b27
Merge branch 'development' of https://github.com/Rulingcom/orbit into development
2013-07-19 17:39:55 +08:00
chris
1db324d1a2
Fix get_sorted_and_filtered
2013-07-19 17:38:43 +08:00
chris
5190c1160a
Fix get_sorted_and_filtered, accepts 3 arguments and works for category
2013-07-16 14:43:56 +08:00
chris
62288a71ca
Fix category_id in forms
...
Fix statuses list
2013-07-16 11:41:22 +08:00
saurabhbhatia
91b1cf6edc
Merge branch 'development' of https://github.com/Rulingcom/orbit into development
2013-07-11 17:18:58 +08:00
chris
1c4b66f1cb
Fix approval in index
2013-07-10 16:42:25 +08:00
saurabhbhatia
72861f05a6
Merge branch 'development' of https://github.com/Rulingcom/orbit into development
...
Conflicts:
config/mongoid.yml
2013-07-09 14:40:39 +08:00
chris
2c331bf1a5
Revert non rulingcom email constraint
2013-07-04 14:20:13 +08:00
chris
bec0bd76e4
Replace get_categories by categories
2013-07-04 12:33:28 +08:00
chris
5457afdada
Rename global.css to global.css.erb
2013-07-02 17:42:15 +08:00
chris
856898016b
New UI changes(tags, categories, authorisations, module index…)
...
To run:
- ruby lib/remove_old_tags.rb DB_NAME
- rake new_ui:migrate_tags
- rake new_ui:migrate_categories['APP_KEY,''MODEL_NAME'] (check new_ui.rake for more details)
2013-07-02 16:46:44 +08:00
Matt K. Fu
869f3b6815
fix object de-authorize failed.
2013-06-26 12:28:00 +08:00
Matt K. Fu
345c471fc9
from now on the rescue namespace will be decided by site object field: resque_namespace
2013-06-20 17:50:17 +08:00
Matthew K. Fu JuYuan
d3f0a10187
fix default setting for partial category selection error,due to API changing.
2013-06-17 15:26:43 +08:00
chris
c1bd135595
Fix sortable when there's no record
2013-06-14 15:26:12 +08:00
Matt K. Fu
e20df41db5
add user log link at site page
2013-06-14 15:24:04 +08:00
chris
e68793afc3
Fix tag delete
2013-06-14 15:23:45 +08:00
iCross
f3e1f4057d
ask module update css
2013-06-07 13:04:00 +08:00
iCross
e353961b21
ask moudule: add ask.css
2013-06-07 13:04:00 +08:00
iCross
dcc5fc39a7
ask module: dropdown, icon, big5 encoding, redirect, admin, send mail
2013-06-07 13:03:59 +08:00
chris
0904978292
Remove non resolved conflict
2013-06-07 13:02:47 +08:00
iCross
ddd9a9668e
Merge branch 'lukas/picked_archive' into development
2013-06-06 23:12:30 +08:00
iCross
a468b69013
archive module: fix old data caused error
2013-06-06 23:11:24 +08:00
iCross
b6c8a88b73
Merge branch 'lukas/picked_archive' into development
2013-06-06 22:27:08 +08:00
iCross
5b7ac1a22b
archive module: add sort feature to achive files
2013-06-06 22:20:27 +08:00
Matt K. Fu
d5109c837c
Merge branch 'lukas/picked_ques' into development
2013-06-06 19:59:30 +08:00
iCross
c63ac751ea
archive module: sort for backend/frontend. move get_sorted_and_filtered from orbit_backend_controller.rb to application_controller.rb
2013-06-06 19:20:21 +08:00
iCross
8c1e65994a
Merge branch 'clean_development' into lukas/picked_ques
2013-06-06 19:08:59 +08:00
iCross
d2f131d160
survey module: update css
...
Conflicts:
app/assets/stylesheets/questionnaire.css
2013-06-06 18:43:28 +08:00
iCross
8d71c377f2
fix datepicker helper hidden field value
2013-06-06 18:42:26 +08:00
iCross
21bf3a0ccd
standalone css and icon
2013-06-06 18:41:27 +08:00
iCross
443d1c4fbe
csv stats & required start
2013-06-06 18:38:47 +08:00
iCross
531cee70d2
fix
2013-06-06 18:31:28 +08:00
Lukas
adc15951bb
questionnaire stuff
...
Conflicts:
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
2013-06-06 18:29:58 +08:00
Lukas
51640423a7
survey module initial
2013-06-06 18:26:41 +08:00
Matt K. Fu
dd206437d8
apply tags and cates for fronted. from now app developer can use param category_id and tag_id freely.
2013-06-06 17:39:36 +08:00
Matt K. Fu
7729161123
fix for passing args. code in complete,fronted controller need to take care params,too. backend parser need to catch up.
2013-06-06 17:38:17 +08:00
Matthew K. Fu JuYuan
5c94200b77
fix argument passing problem for more link and tag cloud, incomplete code.
2013-06-06 17:21:27 +08:00
Matt K. Fu
6b8b749b0f
fix chris tag cloud
2013-06-06 17:18:42 +08:00
chris
253cca06cc
New widget for tag cloud
2013-06-06 17:17:45 +08:00
Matt K. Fu
30824d1620
add search to archive
2013-06-05 18:03:09 +08:00
Matt K. Fu
704db56925
fix bulletin data having 8 hours difference.
2013-06-05 18:01:57 +08:00
Matt K. Fu
06fd305bf9
default widget show search
2013-06-05 13:00:21 +08:00
Matt K. Fu
c0f1614cb9
fix uploading error due to user action decoder can not handle uploading file
2013-05-30 10:17:28 +08:00
Matt K. Fu
3e0b7d81ae
clean 403 404 500
2013-05-27 16:46:49 +08:00
Matt K. Fu
2806dd35a9
spen's fix for user
2013-05-23 14:03:18 +08:00
Matt K. Fu
54a35b30be
fix design index bug when start start from blank DB.
...
add delay impressionist.
add several i18n vars
2013-05-23 12:07:43 +08:00
Matt K. Fu
37aa950028
user action
2013-05-23 11:55:57 +08:00
Spen
5b368235e8
ntu dropdown fix list sort
2013-05-14 14:19:55 +08:00
Spen
b8da40b4ae
ntu_dropdown_fix
2013-05-14 14:19:55 +08:00
Matt K. Fu
287e77836d
fix css compiling error
2013-05-14 14:19:20 +08:00
Matt K. Fu
3e6c2b1ec2
fix member error with blank database
2013-05-14 11:48:13 +08:00
Matt K. Fu
f2247aab32
ray's css fix
2013-05-14 11:27:15 +08:00
Matt K. Fu
ef2c732d2e
make blank site working better
2013-05-14 11:26:35 +08:00
Matt K. Fu
1096db79b6
blank site now can be start from rake site:build
2013-05-14 10:32:53 +08:00
Matt K. Fu
88d55989de
change logger
2013-05-14 10:29:11 +08:00
chris
c2331695cd
Set order of page context to match the order of structure
...
Add some params to keep the sorting
2013-05-07 11:15:30 +08:00
chris
127ab3845c
Changes for queries
2013-05-03 12:12:19 +08:00
chris
aefd62da2a
Add tagged_ids to taggable
2013-05-03 12:12:19 +08:00
chris
167a71272a
queries need to be rethink
2013-05-03 12:12:19 +08:00
Matt K. Fu
7d077a92a5
system preference
2013-04-29 15:23:15 +08:00
Matt K. Fu
64101109dd
disable all sorted_tags
2013-04-26 18:07:59 +08:00
Matt K. Fu
3e567223e3
fix for Spen's translation and Chris's tag error
2013-04-26 15:37:27 +08:00
Spen
79ef86f2c9
member translation fix
2013-04-26 11:26:11 +08:00
Matthew K. Fu JuYuan
d047a3d62a
chris tags update
2013-04-26 11:26:10 +08:00
Spen
697944a029
user id set & user fields set & role set & member frontend list & user translation & create new member bug fix
2013-04-25 19:59:59 +08:00
Matt K. Fu
a0478f2a8f
fix page name repeated error when page creating
2013-04-25 12:19:25 +08:00
Matt K. Fu
b198b1a17b
system preference
2013-04-24 19:21:11 +08:00
Matt K. Fu
62fa589e8a
add msg when user session expired at page admin
2013-04-24 11:58:48 +08:00
Matt K. Fu
5ff7dfbac6
fronted open switch and backend openness
2013-04-23 18:48:18 +08:00
Matt K. Fu
41168f4c99
fix for fronted routing failed
2013-04-23 10:01:02 +08:00
Matt K. Fu
7e9fce0c2d
clean Harry's code
2013-04-17 14:31:10 +08:00
Harry Bomrah
38d5a193e0
tiny scrollbar trigger fixed and devin branch merged
2013-04-17 14:31:09 +08:00
devin chen
989e5aa974
minor update
2013-04-17 14:29:56 +08:00
devin chen
aedab01ae6
minor update
2013-04-17 14:29:04 +08:00
devin chen
e3782c9cf7
minor update
2013-04-17 14:29:04 +08:00
Harry Bomrah
e2802d94d0
rake task added
2013-04-17 14:28:13 +08:00
devin chen
055d758769
Page Loading Effect
...
tinyscrollbar has problem
2013-04-17 14:27:18 +08:00
Matt K. Fu
a4ebe31ada
fix for widget edit js missing
2013-04-17 14:19:32 +08:00
Matt K. Fu
3098496083
widget link followed by setting
2013-04-17 14:19:32 +08:00
Matt K. Fu
28f0df5da8
fix default widget link failed
2013-04-17 14:19:32 +08:00
Matt K. Fu
3de4591413
fix frontend ajax respond 404 due to javascript overwritten after assets precompile
2013-04-17 14:19:32 +08:00
devin chen
d177fe0369
minor update
2013-04-17 14:19:32 +08:00
Harry Bomrah
c6868bf2e0
small fix in select2.js
2013-04-17 14:18:49 +08:00
devin chen
95e308e046
minor update
2013-04-17 14:18:49 +08:00
Matt K. Fu
425a320c02
fix widget and fronted setting interface. checked with Spen
2013-04-17 14:16:24 +08:00
devin chen
dc5f24ab22
starting new branch ( add rules in .gitignore for SASS cache folder )
2013-04-17 14:16:24 +08:00
Harry Bomrah
bc0477a5ed
widget and gridster fixes
2013-04-17 14:16:24 +08:00
Matt K. Fu
0781779ac0
solved conflicts
2013-04-17 14:14:24 +08:00
devin
e7bffe4c0f
devin's new branch
2013-04-17 14:14:24 +08:00
chris
dd10b3147c
Fix js bug and asset url after merge
2013-04-17 14:14:24 +08:00
devin
cae43e8acd
recover .gitignore file
...
Conflicts:
.gitignore
2013-04-17 14:14:23 +08:00
Harry Bomrah
793d739726
features and widgets added
...
Conflicts:
app/assets/javascripts/orbitdesktop.js
2013-04-17 14:14:23 +08:00
devin
c8aa50ee87
Lots of Update
...
1. CSS to SCSS
2. Journal Paper update
Conflicts:
Gemfile.lock
app/assets/javascripts/orbitdesktop.js
app/assets/stylesheets/desktop/desktop-main.css
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb
2013-04-17 14:14:23 +08:00
Matt K. Fu
0f6f5aafce
fix for both part and page part settings
...
Conflicts:
app/helpers/admin/page_parts_helper.rb
app/views/admin/pages/reload_front_end_setting.js.erb
app/views/admin/pages/reload_frontend_pages.js.erb
2013-04-17 14:12:52 +08:00
Fu Matthew
f6b600df59
deliver API
2013-04-17 14:09:01 +08:00
chris
6af375efa4
Fix bug in setup_app_frontend_and_style
2013-04-17 14:09:00 +08:00
Fu Matthew
1709773b0a
style for front end
2013-04-17 14:08:01 +08:00
Harry Bomrah
764f83d58c
app manager changed plus some changes
2013-04-17 14:01:14 +08:00
Harry Bomrah
8dee211ab4
section page fixed..
2013-04-17 14:01:14 +08:00
Harry Bomrah
f9e7cefc94
compatibility page added and tinyscrollbar drag event fixed..
2013-04-17 13:59:16 +08:00
Harry Bomrah
41643d1f61
tinyscrollbar pagination fixed
2013-04-17 12:11:33 +08:00
Harry Bomrah
54af5e8bd4
insert and remove columns
2013-04-17 12:06:33 +08:00
Harry Bomrah
6db9e70132
Major tinyscrollbar update
2013-04-17 12:04:22 +08:00
Harry Bomrah
dae3f069ff
app manager changed plus some changes
2013-04-17 11:09:56 +08:00
Harry Bomrah
b1d7d5345e
section page fixed..
2013-04-17 11:08:58 +08:00
Fu Matthew
6efef253a6
add conditions for making multi cates and tags more stable
2013-04-17 11:08:57 +08:00
devin
0d5ab20efa
add browser compatibility page
2013-04-17 11:07:45 +08:00
Fu Matthew
9815950083
now default options can be chosen by developer at init
2013-04-17 11:07:45 +08:00
Harry Bomrah
b8ee2fd559
compatibility page added and tinyscrollbar drag event fixed..
2013-04-17 11:07:20 +08:00
Harry Bomrah
323fadc210
tinyscrollbar pagination fixed
2013-04-17 11:05:57 +08:00
Fu Matthew
69a49a69aa
style for front end
2013-04-17 11:05:57 +08:00
Rueshyna
625f2e9ad6
have done conference author filter, journal haven't been done, yet
2013-04-17 11:04:52 +08:00
Harry Bomrah
d840b82fa9
insert and remove columns
2013-04-17 10:56:15 +08:00
devin
84dfb44e78
tinyscrollbar css minor update
2013-04-17 10:56:15 +08:00
Fu Matthew
4a08a1992b
1.make module app forbid unearthed access except from admin
...
2.override sidebar link when it's object_auth or app_auth.
2013-04-17 10:56:15 +08:00
Harry Bomrah
1d06bcaae7
Major tinyscrollbar update
2013-04-17 10:54:38 +08:00
Fu Matthew
8e98cb3ec9
put add admin pages using orbit back end controller
2013-04-17 10:54:38 +08:00
Harry Bomrah
0189d1c2c0
all none fixed
2013-04-17 10:54:38 +08:00
chris
3e96cfe514
Changes for FAQ to work with not latest but stable code
2013-03-28 15:05:52 +08:00
chris
da8a5123c2
Change in announcement init for query
...
Change in default widget query
2013-03-27 16:31:42 +08:00
chris
d01968dcd0
Changes in query for default widget
2013-03-21 02:29:56 +08:00
chris
617ebfd43a
Revert "Fix query for top in bulletin"
...
This reverts commit 332481f9f1a5802ae652bb401d0dd409196ab00f.
2013-03-19 23:44:02 +08:00
chris
b55988af33
Fix query for top in bulletin
2013-03-19 23:44:02 +08:00
chris
9684189258
Fix query for date in bulletin
2013-03-19 23:43:59 +08:00
chris
8374bc8d12
Set I18n from browser
2013-03-19 23:43:31 +08:00
chris
9cf8c2b72b
Revert "Page front end stay in the same page when a link is clicked (category)"
...
This reverts commit 14d856b4d6
.
2013-03-19 20:00:16 +08:00
chris
14d856b4d6
Page front end stay in the same page when a link is clicked (category)
2013-03-19 19:44:04 +08:00
chris
37a38369e7
Fix typo in default widget not showing objects in front end
2013-03-19 18:41:03 +08:00
chris
ff30b3d05e
Fix link not showing for default front end
2013-03-19 18:23:35 +08:00
chris
f3c809fd58
Fix link switch not showing for default front end
2013-03-19 17:49:46 +08:00
chris
5e4e3ac560
Fix link for default widget
...
Convert single id to array to find item
2013-03-19 17:14:01 +08:00
chris
7dcea95dd4
Fix query for multi categories and tags (empty array)
2013-03-19 15:10:31 +08:00
chris
ef2a32be4c
Fix query for multi categories and tags
2013-03-18 22:01:08 +08:00
chris
157935e7eb
Page front end stay in the same page when a link is clicked (title or pagination)
2013-03-18 21:54:06 +08:00
chris
e208e99a73
Fix page part update when no tag or category
2013-03-13 15:45:30 +08:00
chris
b864cc0268
Changes in I18n (except personal_conference and personal_journal)
2013-03-12 18:13:48 +08:00
chris
73e9a60212
Pagination or more link for default widget
2013-03-07 21:21:48 +08:00
Spen
d7d480ac12
archive edit & plugins edit
2013-03-07 21:12:31 +08:00
chris
147b7b9292
Fix update when no tag or category
2013-03-07 17:30:49 +08:00
chris
27686a5d04
Merge branch 'development' into desktop
2013-03-05 19:07:58 +08:00
Rueshyna
a9bf400fac
Merge branch 'desktop_work_devin' into desktop
...
* desktop_work_devin:
tinyscrollbar minor update
desktop CSS update
tinyscrollbar minor update
desktop CSS update
Conflicts:
app/views/desktop/index.html.erb
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_form.html.erb
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/_form.html.erb
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_form.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/_form.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_window.html.erb
2013-03-05 18:48:12 +08:00
Fu Matthew
dc3966be81
fix cates and tags
2013-03-05 18:34:41 +08:00
Rueshyna
d5f1d13670
Merge remote-tracking branch 'origin/desktop_work' into desktop
...
* origin/desktop_work:
simple layout tinyscrollbar fixed
highlighting fixed…
fixed adding.
layout fix
tinyscrollbar_bug fixed
url handling modified.. tinyscrollbar modified… star checkbox fixed..
tinyscrollbar fixed
some changes for gridster
Lot of changes in gridster
Conflicts:
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
2013-03-05 17:34:28 +08:00
Rueshyna
806ffe0a1e
fixed desktop several bug
2013-03-05 17:31:57 +08:00
devin
db2b371744
tinyscrollbar minor update
2013-03-05 17:22:53 +08:00
Fu Matthew
626b2a7bca
fix default failed when cate or tags set to empty
2013-03-05 11:48:20 +08:00
Harry Bomrah
3182f5c9a8
merging
2013-03-05 11:20:01 +08:00
Harry Bomrah
dc92ef9f42
simple layout tinyscrollbar fixed
2013-03-05 11:04:18 +08:00
devin
4e24223c78
desktop CSS update
2013-03-05 09:39:01 +08:00
Fu Matthew
285119a5f3
fix for multi select cates and tags
2013-03-04 19:29:45 +08:00
Harry Bomrah
b5abbc9ef0
highlighting fixed…
2013-03-04 17:57:32 +08:00
Fu Matthew
15b9839b76
fix archive category
...
fix page adding failed
2013-03-04 14:40:29 +08:00
Harry Bomrah
e69679d3fe
tinyscrollbar_bug fixed
2013-03-04 12:37:29 +08:00
Harry Bomrah
2ead541733
url handling modified.. tinyscrollbar modified… star checkbox fixed..
2013-03-04 12:37:29 +08:00
Harry Bomrah
23c8c28b52
tinyscrollbar fixed
2013-03-04 12:37:29 +08:00
Harry Bomrah
0f12314213
some changes for gridster
2013-03-04 12:37:29 +08:00
Harry Bomrah
b8ee748723
Lot of changes in gridster
2013-03-04 12:37:29 +08:00
Rueshyna
ee4b94ace0
Merge branch 'desktop' of https://github.com/Rulingcom/orbit into desktop
...
* 'desktop' of https://github.com/Rulingcom/orbit :
fix widget field reload
link to more
fix default widget link
fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init
fix javascript disable checkbox failed after cate and tags being reloaded.
first version of multi categories and tags
fix widget field reload
link to more
fix default widget link
fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init
fix javascript disable checkbox failed after cate and tags being reloaded.
first version of multi categories and tags
2013-03-04 12:17:14 +08:00
Rueshyna
8f1d7b55ab
authors auto-complete
2013-03-04 12:16:46 +08:00
Harry Bomrah
c1cb5e5ffb
tinyscrollbar_bug fixed
2013-03-01 17:49:58 +08:00
Harry Bomrah
9b8ab2a2c1
url handling modified.. tinyscrollbar modified… star checkbox fixed..
2013-03-01 14:45:20 +08:00
Harry Bomrah
c82e9a646d
tinyscrollbar fixed
2013-02-27 18:55:26 +08:00
Harry Bomrah
7ef02d3108
Merge branch 'desktop' into desktop_work
2013-02-27 11:51:56 +08:00
Harry Bomrah
912080482b
some changes for gridster
2013-02-27 11:47:41 +08:00
chris
ca946fc881
Merge branch 'development' of github.com:Rulingcom/orbit into development
...
Conflicts:
lib/tasks/migrate.rake
2013-02-27 11:03:52 +08:00
Fu Matthew
0dabd5b95f
fix widget field reload
2013-02-27 10:51:41 +08:00
Fu Matthew
071e8a349c
link to more
2013-02-27 10:50:50 +08:00
Fu Matthew
8a8bfcb8fb
fix default widget link
2013-02-27 10:50:47 +08:00
Fu Matthew
d7699e1a46
fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init
2013-02-27 10:49:51 +08:00
Fu Matthew
0e6599e9b9
fix javascript disable checkbox failed after cate and tags being reloaded.
2013-02-27 10:49:51 +08:00
Fu Matthew
99e67c8719
first version of multi categories and tags
2013-02-27 10:49:48 +08:00
Rueshyna
fb931b0a4a
Merge remote-tracking branch 'origin/desktop' into desktop
...
* origin/desktop:
Remove Gemfile.lock
sort conference and type
add conferene list order function
css minor changes.
gridster, url code fixed, views removed.
Fix selection of sub_menu for widget (the value wasn't set)
Fix bug in widget selection
css minor changes.
Fix public_r_tag selection
gridster, url code fixed, views removed.
2013-02-26 17:02:01 +08:00
Rueshyna
4ac0f19011
generate journal page by rails side and fixed model name bug
2013-02-26 15:15:09 +08:00
Harry Bomrah
e9c0f443b7
Lot of changes in gridster
2013-02-26 11:47:39 +08:00
Fu Matthew
5f832a17d4
fix widget field reload
2013-02-25 12:49:06 +08:00
Harry Bomrah
edd2c1f522
css minor changes.
2013-02-25 11:08:57 +08:00
Harry Bomrah
9f362d9ae6
gridster, url code fixed, views removed.
2013-02-25 11:08:56 +08:00
chris
3572856486
Fix selection of sub_menu for widget (the value wasn't set)
2013-02-25 10:35:59 +08:00
Fu Matthew
0be1c45c81
link to more
2013-02-23 18:29:50 +08:00
chris
5b0b8e6c79
Fix bug in widget selection
2013-02-23 17:25:07 +08:00
chris
caac9191ce
Fix public_r_tag selection
2013-02-23 16:52:37 +08:00
Fu Matthew
73bca03b33
fix default widget link
2013-02-23 15:19:51 +08:00
Fu Matthew
8592015b1b
fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init
2013-02-23 15:19:04 +08:00
chris
ad9b91f792
Fix url with id in default widget
2013-02-23 12:20:45 +08:00
Fu Matthew
d6dd38744b
fix javascript disable checkbox failed after cate and tags being reloaded.
2013-02-23 11:34:47 +08:00
Fu Matthew
9fec7beb47
Merge branch 'development' of github.com:Rulingcom/orbit into development
...
Conflicts:
app/controllers/default_widget_controller.rb
lib/tasks/migrate.rake
2013-02-22 17:53:49 +08:00
Fu Matthew
b315215bed
first version of multi categories and tags
2013-02-22 16:32:05 +08:00