saurabhbhatia
|
a2e9aa2e0b
|
Updated ADBanner with fixes on index page, ADImage with fixes
Conflicts:
app/views/admin/ad_banners/index.html.erb
app/views/admin/ad_images/_form.html.erb
vendor/built_in_modules/ad_banner/init.rb
|
2013-08-09 15:21:51 +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 |
saurabhbhatia
|
e12b14311e
|
Updated Desktop with new UI
|
2013-07-30 16:43:41 +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 |
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 |
Harry Bomrah
|
2d616ab7a8
|
solved desktop conflict during cherry pick
|
2013-07-30 16:42:26 +08:00 |
Harry Bomrah
|
dc94283af9
|
duplicate error fixed and css inside widgets fixed, duplicate location fixed
|
2013-07-30 16:41:38 +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
|
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
|
d190a50046
|
Breadcrumb for dashboard (tags and categories cannot link to original module index)
|
2013-07-29 17:34:03 +08:00 |
chris
|
da1d70efcb
|
Change authorization to accept other than category
|
2013-07-25 17:36:55 +08:00 |
chris
|
1ba1703e90
|
Fix get_viewable
|
2013-07-22 17:41:52 +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 |
chris
|
1c4b66f1cb
|
Fix approval in index
|
2013-07-10 16:42:25 +08:00 |
chris
|
2c331bf1a5
|
Revert non rulingcom email constraint
|
2013-07-04 14:20:13 +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 |
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 |
Matt K. Fu
|
e20df41db5
|
add user log link at site page
|
2013-06-14 15:24:04 +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 |
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 |
chris
|
253cca06cc
|
New widget for tag cloud
|
2013-06-06 17:17:45 +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
|
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 |
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 |
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 |
Matt K. Fu
|
3e567223e3
|
fix for Spen's translation and Chris's tag error
|
2013-04-26 15:37:27 +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
|
5ff7dfbac6
|
fronted open switch and backend openness
|
2013-04-23 18:48:18 +08:00 |
Matt K. Fu
|
3098496083
|
widget link followed by setting
|
2013-04-17 14:19:32 +08:00 |
Matt K. Fu
|
425a320c02
|
fix widget and fronted setting interface. checked with Spen
|
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 |
Harry Bomrah
|
793d739726
|
features and widgets added
Conflicts:
app/assets/javascripts/orbitdesktop.js
|
2013-04-17 14:14:23 +08:00 |