Harry Bomrah
0b6ace4e26
ok for precompiling
2013-08-07 15:03:08 +08:00
Harry Bomrah
e3d9966f76
bugs fixed for plugins. .. and also css fixed
2013-08-06 17:53:04 +08:00
Harry Bomrah
7d288b4160
some changes in file selection
2013-08-06 17:52:50 +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
2fea428b67
Changed mongoid production back to test_site
2013-07-30 17:17:17 +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
c18a8a8c6f
mongoid yml fix
2013-07-30 16:43:22 +08:00
Harry Bomrah
38194311ab
some changes again
2013-07-30 16:43:18 +08:00
Harry Bomrah
bd5f3d1a44
some changes
...
Conflicts:
config/mongoid.yml
2013-07-30 16:43:14 +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
78d6e33865
devin branch merge plus minor fixes
2013-07-30 16:41:32 +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