 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
|
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 |
|
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
|
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 |