developers/Orbit
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
471987f80015b7ac41850c8fa0321eb7556e84ef
Orbit/app/views/admin
T
History
saurabhbhatia 471987f800 Merge branch 'development' of https://github.com/Rulingcom/orbit into 0917_ntu_mb 
Conflicts:
	vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/show.html.erb
2013-09-27 11:10:07 +08:00
..
ad_banners
Updated AdBanner index page and Ad Image index page, and edit pages
2013-08-09 15:22:06 +08:00
ad_images
Updated AdBanner index page and Ad Image index page, and edit pages
2013-08-09 15:22:06 +08:00
app_auths
Translation changes
2012-12-03 23:00:04 +08:00
asset_categories
Translation changes
2012-12-03 23:00:04 +08:00
assets
small bug fix for inserting and delete button.
2013-09-11 14:03:19 +08:00
attributes
solved conflict for member_new_ui
2013-08-12 15:40:34 +08:00
authorizations
New authorization
2013-08-21 13:42:29 +08:00
categories
New UI changes(tags, categories, authorisations, module index…)
2013-07-02 16:46:44 +08:00
components
Translation changes
2012-12-03 23:00:04 +08:00
dashboards
New UI changes(tags, categories, authorisations, module index…)
2013-07-02 16:46:44 +08:00
default_index
Updated Gallery with authorizations
2013-08-22 16:25:11 +08:00
designs
Updated Sidebar and Preferences
2013-09-09 10:18:14 +08:00
import_data
Updated Import to Sync Data for all personal plugins
2013-09-26 18:51:31 +08:00
items
Fix structure edit
2013-09-14 17:26:16 +08:00
links
Fix for structure
2013-07-29 18:46:38 +08:00
member_selects
Add class for Ray's check-box
2013-07-31 00:08:15 +08:00
module_apps_new_interface
Translation changes
2012-12-03 23:00:04 +08:00
module_store
Redirect to designs after buying template
2012-12-07 09:07:49 +08:00
module_tags
filemanager and some update for file uploader . added file uploader to kernel
2013-09-11 14:03:06 +08:00
object_auths_new_interface
Translation changes
2012-12-03 23:00:04 +08:00
page_parts
Ray's changes in structure
2013-07-22 14:06:58 +08:00
pages
Fix structure edit
2013-09-14 17:26:16 +08:00
personal_plugin_intros
Add Brief intro. for all personal plugins
2013-09-18 18:55:40 +08:00
plugins
new ui member plugin sort fix and user show avatar fix
2013-09-27 11:04:52 +08:00
purchases
put add admin pages using orbit back end controller
2013-04-17 10:54:38 +08:00
role_filters
solved conflict for member_new_ui
2013-08-12 15:40:34 +08:00
roles
solved conflict for member_new_ui
2013-08-12 15:40:34 +08:00
sites
Updated Preference Page
2013-09-09 11:29:46 +08:00
tags
Add default delete modal usage:
2013-07-29 14:29:37 +08:00
template_store
Redirect to designs after buying template
2012-12-07 09:07:49 +08:00
user_actions
add user log link at site page
2013-06-14 15:24:04 +08:00
users_new_interface
Merge branch 'development' of https://github.com/Rulingcom/orbit into 0917_ntu_mb
2013-09-27 11:10:07 +08:00