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
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
874819266d
minor update
2013-07-30 16:42:23 +08:00
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
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
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
4215ed5538
minor update
2013-07-30 16:41:16 +08:00
74b2bbf4b7
Fix link in structure when the item is a link
...
Add internal links creation
2013-07-30 11:49:28 +08:00
c85629d3b3
Fix controller js and css loading error
2013-07-30 11:48:14 +08:00
af98f8efce
Fix orbit bar language change
2013-07-29 19:49:07 +08:00
ff59feb2e7
Fix for structure
2013-07-29 18:46:38 +08:00
f332a3191a
Fiix layout for safari
2013-07-29 17:34:29 +08:00
d190a50046
Breadcrumb for dashboard (tags and categories cannot link to original module index)
2013-07-29 17:34:03 +08:00
fe10cc62d9
Fix structure title (page slide)
2013-07-29 14:59:02 +08:00
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
0be8a74fa8
Fix missing condition in index auth
2013-07-25 17:45:39 +08:00
da1d70efcb
Change authorization to accept other than category
2013-07-25 17:36:55 +08:00
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
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
0d0f85e7ad
Fix tooltip in form
...
Change form_file
2013-07-22 20:54:40 +08:00
5d3bc07488
archive and web_resouce for new ui
...
Conflicts:
app/assets/stylesheets/lib/main-forms.css
2013-07-22 18:14:33 +08:00
1ba1703e90
Fix get_viewable
2013-07-22 17:41:52 +08:00
6cf249ccfb
Change ckeditor gem and kaminari in gemfile
2013-07-22 17:26:32 +08:00
92faeccdb6
Revert change in main-form and change class name of form_file
2013-07-22 17:24:58 +08:00
5284571300
Add tooltip to bulletin form and remove file
2013-07-22 16:55:02 +08:00
fe82427baa
Ray's changes for css and js
2013-07-22 16:31:44 +08:00
408bebaa4b
Ray's changes in structure
2013-07-22 14:06:58 +08:00
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
7ea9945af0
Location - category fixes
...
Conflicts:
app/models/category.rb
vendor/built_in_modules/location/init.rb
2013-07-22 12:17:29 +08:00
109b891b27
Merge branch 'development' of https://github.com/Rulingcom/orbit into development
2013-07-19 17:39:55 +08:00
1db324d1a2
Fix get_sorted_and_filtered
2013-07-19 17:38:43 +08:00
5190c1160a
Fix get_sorted_and_filtered, accepts 3 arguments and works for category
2013-07-16 14:43:56 +08:00
62288a71ca
Fix category_id in forms
...
Fix statuses list
2013-07-16 11:41:22 +08:00
91b1cf6edc
Merge branch 'development' of https://github.com/Rulingcom/orbit into development
2013-07-11 17:18:58 +08:00
1c4b66f1cb
Fix approval in index
2013-07-10 16:42:25 +08:00
72861f05a6
Merge branch 'development' of https://github.com/Rulingcom/orbit into development
...
Conflicts:
config/mongoid.yml
2013-07-09 14:40:39 +08:00
2c331bf1a5
Revert non rulingcom email constraint
2013-07-04 14:20:13 +08:00
bec0bd76e4
Replace get_categories by categories
2013-07-04 12:33:28 +08:00
5457afdada
Rename global.css to global.css.erb
2013-07-02 17:42:15 +08:00
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
869f3b6815
fix object de-authorize failed.
2013-06-26 12:28:00 +08:00
345c471fc9
from now on the rescue namespace will be decided by site object field: resque_namespace
2013-06-20 17:50:17 +08:00
d3f0a10187
fix default setting for partial category selection error,due to API changing.
2013-06-17 15:26:43 +08:00
c1bd135595
Fix sortable when there's no record
2013-06-14 15:26:12 +08:00
e20df41db5
add user log link at site page
2013-06-14 15:24:04 +08:00
e68793afc3
Fix tag delete
2013-06-14 15:23:45 +08:00
f3e1f4057d
ask module update css
2013-06-07 13:04:00 +08:00
e353961b21
ask moudule: add ask.css
2013-06-07 13:04:00 +08:00
dcc5fc39a7
ask module: dropdown, icon, big5 encoding, redirect, admin, send mail
2013-06-07 13:03:59 +08:00
0904978292
Remove non resolved conflict
2013-06-07 13:02:47 +08:00
ddd9a9668e
Merge branch 'lukas/picked_archive' into development
2013-06-06 23:12:30 +08:00
a468b69013
archive module: fix old data caused error
2013-06-06 23:11:24 +08:00
b6c8a88b73
Merge branch 'lukas/picked_archive' into development
2013-06-06 22:27:08 +08:00
5b7ac1a22b
archive module: add sort feature to achive files
2013-06-06 22:20:27 +08:00
d5109c837c
Merge branch 'lukas/picked_ques' into development
2013-06-06 19:59:30 +08:00
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
8c1e65994a
Merge branch 'clean_development' into lukas/picked_ques
2013-06-06 19:08:59 +08:00
d2f131d160
survey module: update css
...
Conflicts:
app/assets/stylesheets/questionnaire.css
2013-06-06 18:43:28 +08:00
8d71c377f2
fix datepicker helper hidden field value
2013-06-06 18:42:26 +08:00
21bf3a0ccd
standalone css and icon
2013-06-06 18:41:27 +08:00
443d1c4fbe
csv stats & required start
2013-06-06 18:38:47 +08:00
531cee70d2
fix
2013-06-06 18:31:28 +08:00
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
51640423a7
survey module initial
2013-06-06 18:26:41 +08:00
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
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
5c94200b77
fix argument passing problem for more link and tag cloud, incomplete code.
2013-06-06 17:21:27 +08:00
6b8b749b0f
fix chris tag cloud
2013-06-06 17:18:42 +08:00
253cca06cc
New widget for tag cloud
2013-06-06 17:17:45 +08:00
30824d1620
add search to archive
2013-06-05 18:03:09 +08:00
704db56925
fix bulletin data having 8 hours difference.
2013-06-05 18:01:57 +08:00
06fd305bf9
default widget show search
2013-06-05 13:00:21 +08:00
c0f1614cb9
fix uploading error due to user action decoder can not handle uploading file
2013-05-30 10:17:28 +08:00
3e0b7d81ae
clean 403 404 500
2013-05-27 16:46:49 +08:00
2806dd35a9
spen's fix for user
2013-05-23 14:03:18 +08:00
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
37aa950028
user action
2013-05-23 11:55:57 +08:00
5b368235e8
ntu dropdown fix list sort
2013-05-14 14:19:55 +08:00
b8da40b4ae
ntu_dropdown_fix
2013-05-14 14:19:55 +08:00
287e77836d
fix css compiling error
2013-05-14 14:19:20 +08:00
3e6c2b1ec2
fix member error with blank database
2013-05-14 11:48:13 +08:00
f2247aab32
ray's css fix
2013-05-14 11:27:15 +08:00
ef2c732d2e
make blank site working better
2013-05-14 11:26:35 +08:00
1096db79b6
blank site now can be start from rake site:build
2013-05-14 10:32:53 +08:00
88d55989de
change logger
2013-05-14 10:29:11 +08:00
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
127ab3845c
Changes for queries
2013-05-03 12:12:19 +08:00
aefd62da2a
Add tagged_ids to taggable
2013-05-03 12:12:19 +08:00
167a71272a
queries need to be rethink
2013-05-03 12:12:19 +08:00
7d077a92a5
system preference
2013-04-29 15:23:15 +08:00
64101109dd
disable all sorted_tags
2013-04-26 18:07:59 +08:00
devin chen
Harry Bomrah
chris
Spen
rulingcom
saurabhbhatia
Matt K. Fu
Matthew K. Fu JuYuan
iCross