Commit Graph
100 Commits
Author SHA1 Message Date
harrybomrah 9428171859 all problem fixed for all categories and tags in plugin widget 2013-11-22 10:22:47 +08:00
harrybomrah 6040e63034 small ie fix for gallery forntend after routes changed 2013-11-19 12:57:22 +08:00
harrybomrah 91d5ab6352 gallery versioning added.. and also the models changed for gallery now more R4 compatible. urls for gallery working fine now.. 2013-11-19 09:32:08 +08:00
harrybomrah 16b695200a gallery_album to album 2013-11-19 09:31:49 +08:00
harrybomrah 369bbe4d72 category click, event click and more button fix 2013-11-18 17:15:36 +08:00
harrybomrah 4888195566 more button works according to categories 2013-11-15 22:35:20 +08:00
harrybomrah e129b25554 more button fix and also new way to select more page. 2013-11-15 15:13:58 +08:00
harrybomrah 8f3a68b3d7 completed locations frontend and widget using categories filtering etc. 2013-11-14 10:04:19 +08:00
harrybomrah a3d921c47a implementd maps with category filteration and custom color markers. 2013-11-13 15:44:28 +08:00
harrybomrah 3d091b692d category blank fix 2013-11-12 17:35:41 +08:00
harrybomrah f91c08ce4b color added to location categories. 2013-11-12 16:45:42 +08:00
harrybomrah 405c2c5a12 small fix for banner pagination. 2013-11-11 17:23:18 +08:00
harrybomrah afff07ec89 items.js modified for new page setting 2013-11-08 18:32:45 +08:00
harrybomrah ed569601c3 two major fix for site setting and bulletin controller 2013-11-08 16:38:17 +08:00
harrybomrah 9e432a5a93 fixed announcement rendering.. 2013-11-08 12:58:34 +08:00
harrybomrah 0db28d9ab4 gallery theater url fix for theater 2013-11-07 22:11:40 +08:00
harrybomrah c51dd81d2b fixed page setting select all bug 2013-11-07 19:27:04 +08:00
harrybomrah d17953ab86 partial is rendered when editing a page part 2013-11-07 17:23:15 +08:00
harrybomrah 4353b481c7 changed the frontend loading to more rails specific. and also fixed the filter reload in thumbnali and summary view of members 2013-11-07 14:39:07 +08:00
harrybomrah 8c532e7241 fixed gallery frontend for category display 2013-11-07 09:34:52 +08:00
harrybomrah 49217d4705 fixed all button for page settings and also filter display after page refresh 2013-11-06 22:36:59 +08:00
harrybomrah f191029279 design change in album view 2013-11-06 16:39:21 +08:00
harrybomrah c158108576 gallery all bugs fixed.. 2013-11-06 16:39:18 +08:00
harrybomrah 3c4f22234b fixed template updation from site preferences 2013-11-05 20:50:05 +08:00
harrybomrah bae1c0da7d now only approved announcement can be viewed when backend is open 2013-11-05 20:50:02 +08:00
harrybomrah 9d7af2ccac fixed the edit link problem in site settings 2013-11-05 16:54:33 +08:00
harrybomrah af103fa427 gallery frontend ui fixed. 2013-11-05 13:28:10 +08:00
harrybomrah 3db075b9d2 side bar for calendar fixed. 2013-11-04 18:31:10 +08:00
harrybomrah 2c8705ac3e fixed site structure and also member roles side bar problem. 2013-11-04 17:39:16 +08:00
harrybomrah eaa87b3dd8 new categories for calendar with colors inside.. plus changed the working of calendar. it has now categories like all other modules 2013-11-04 15:17:50 +08:00
harrybomrah df5cda7a98 new feature added for not loading submenus inside api for desktop 2013-10-16 09:37:39 +08:00
harrybomrah fbea249782 jquery update and also fixed app manager bug .. jquery updated to 1.10.2 and jquery ui updated to 1.10.0 .. gem jquery-rails vs 2.1.4 changed to 3.0.4 and jquery-ui-rails changed to 4.0.5 2013-10-16 09:37:33 +08:00
harrybomrah 14ea611f8c fixed file view on server for desktop 2013-10-14 16:49:54 +08:00
harrybomrah 4f04eca74f test for fileview in desktop on server 2013-10-14 16:49:51 +08:00
harrybomrah caca264b50 isotope fixed for all plugins for list and form. 2013-10-01 15:06:49 +08:00
harrybomrah 2f673b20ad disabling changes in desktop, missed out in last one 2013-09-30 17:25:02 +08:00
harrybomrah 0a9fd6a4b5 some needed changes in api for desktop 2013-09-30 16:59:50 +08:00
harrybomrah 74ca99a581 delete and sequencing fixed for survey questions 2013-09-30 16:49:27 +08:00
harrybomrah 52c896d8c5 some backend code change for sharing personal plugin module content. Added sharing in desktop for all the modules. 2013-09-26 20:11:45 +08:00
harrybomrah 5332162646 small add question fix for survey module. 2013-09-26 09:31:52 +08:00
harrybomrah 1d0ea6718f brief added to desktop for all plugins 2013-09-25 18:23:44 +08:00
harrybomrah 04ff345b94 survey edit completed 2013-09-25 17:29:38 +08:00
harrybomrah 58fb2d1c73 external links and link widget fixed for development 2013-09-24 15:37:40 +08:00
harrybomrah 1e3cffee0a add page completed with attributes and reordering 2013-09-17 15:34:34 +08:00
harrybomrah e4a16eab3a commit for survey questions 2013-09-17 15:34:23 +08:00
harrybomrah e45b7e09a0 half survey module form changed to new ui plus one calendar fix 2013-09-16 12:25:58 +08:00
harrybomrah bd3462df7f small change left in last commit. commiting for gallery widget 2013-09-16 11:19:24 +08:00
harrybomrah f5f1822f0a no data file added 2013-09-16 11:19:18 +08:00
harrybomrah d532ded8e4 widget code for gallery rewritten for new_ui 2013-09-16 11:19:11 +08:00
harrybomrah 3595c59810 some unmerged code i pushd 3 months back not update by chris 2013-09-13 15:58:42 +08:00
harrybomrah 789e02e313 ad_banner banner load fixed for test site 2013-09-13 14:23:44 +08:00
harrybomrah 579bc3c245 some very small fix for image alternative text and browse files manager 2013-09-11 14:03:25 +08:00
harrybomrah 8c98645a69 small bug fix for inserting and delete button. 2013-09-11 14:03:19 +08:00
harrybomrah 9e10a3c944 editing for the assets are done with replacable files and description 2013-09-11 14:03:13 +08:00
harrybomrah f920a4f6ba filemanager and some update for file uploader . added file uploader to kernel 2013-09-11 14:03:06 +08:00
harrybomrah 335991e152 by mistake pushed code with debugger 2013-09-05 12:51:15 +08:00
harrybomrah 131dd3fea8 child images tag adding and deleting updated. 2013-09-05 12:51:13 +08:00
harrybomrah 4209356e9d new features in gallery image view.. and also tags for gallery completed. 2013-09-02 11:23:01 +08:00
harrybomrah 82b6be483a isotope embedded inside desktop kernel 2013-08-30 10:58:08 +08:00
harrybomrah ff64fb5230 file title translations fixed 2013-08-30 10:57:54 +08:00
harrybomrah 399dfad392 faq authorization completed. 2013-08-22 18:00:05 +08:00
harrybomrah 897ed49d2e new ui for faq and announcement status fixed. 2013-08-20 18:22:11 +08:00
harrybomrah b004121187 minimize bar updated to new style and more flexible. 2013-08-19 12:59:57 +08:00
harrybomrah 88ad59f55a title and css fix for file view 2013-08-19 09:42:50 +08:00
harrybomrah bbb765c88d small fix for file link inside edit form for desktop 2013-08-16 15:49:12 +08:00
harrybomrah 6577885761 docx xlsx and pptx file types fixed plus icon provided in edit form for files 2013-08-16 15:49:04 +08:00
harrybomrah a04155963d all file things are fixed. delete and view and also names 2013-08-14 09:30:48 +08:00
harrybomrah 6d54dbd5f8 bilingual for files fixed and description added and also filename display after selecting filenames
Conflicts:
	app/assets/javascripts/desktop/orbitdesktop.js
2013-08-13 17:22:09 +08:00
harrybomrah 9c7558847a bilingual fixed for all the plugins in desktop 2013-08-12 12:28:58 +08:00
harrybomrah 771ec0b8f6 css fixed for plugins and types and also some other css problem fixed 2013-08-12 12:28:51 +08:00
harrybomrah d0ef862f85 language changes and conferences add/edit bug fixed 2013-08-12 12:28:46 +08:00
harrybomrah b2c3beefe9 icons and colors for themes fixed 2013-08-12 12:28:39 +08:00
harrybomrah 55670e6318 icons and theme minicolors fixed 2013-08-12 12:28:32 +08:00
harrybomrah 0b6ace4e26 ok for precompiling 2013-08-07 15:03:08 +08:00
harrybomrah e3d9966f76 bugs fixed for plugins. .. and also css fixed 2013-08-06 17:53:04 +08:00
harrybomrah 7d288b4160 some changes in file selection 2013-08-06 17:52:50 +08:00
harrybomrah c2f223b82c new plugins added for desktop 2013-08-06 17:52:39 +08:00
harrybomrah 42615f02ea new feature in desktop for uploading wallpapers or putting url link 2013-08-02 19:32:41 +08:00
harrybomrah 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
harrybomrah f7dbbf1bca new themes added to desktop plus theme uploader created 2013-07-30 16:43:32 +08:00
harrybomrah 6d89eab98a desktop final fix 2013-07-30 16:43:28 +08:00
harrybomrah c18a8a8c6f mongoid yml fix 2013-07-30 16:43:22 +08:00
harrybomrah 38194311ab some changes again 2013-07-30 16:43:18 +08:00
harrybomrah bd5f3d1a44 some changes
Conflicts:
	config/mongoid.yml
2013-07-30 16:43:14 +08:00
harrybomrah 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
harrybomrah ed22a4d303 apps update -- app upload and activation 2013-07-30 16:42:50 +08:00
harrybomrah 66582fb671 fixed saving of positions of the tiles again 2013-07-30 16:42:36 +08:00
harrybomrah 2d616ab7a8 solved desktop conflict during cherry pick 2013-07-30 16:42:26 +08:00
harrybomrah 9478bb13e2 search fixed again according to devin requirements 2013-07-30 16:42:14 +08:00
harrybomrah cff77fbee5 new search for app manager and few javascript fixes 2013-07-30 16:42:11 +08:00
harrybomrah 20521dc8b0 removing duplicate code from js file 2013-07-30 16:41:54 +08:00
harrybomrah ae8033ea1b duplicate error fixed and css inside widgets fixed, duplicate location fixed 2013-07-30 16:41:44 +08:00
harrybomrah dc94283af9 duplicate error fixed and css inside widgets fixed, duplicate location fixed 2013-07-30 16:41:38 +08:00
harrybomrah 78d6e33865 devin branch merge plus minor fixes 2013-07-30 16:41:32 +08:00
harrybomrah b70310c6fe tiny scrollbar update 2013-07-30 16:41:25 +08:00
harrybomrah 57a64dc378 mini colors in new ui fixed 2013-07-23 12:12:46 +08:00
harrybomrah 4ff5724379 new ui for calendar fixed. 2013-07-23 12:12:25 +08:00
harrybomrah 0921d7731b my favorite update :) lazy loading for theater view plus a very smooth navigation of images. 2013-07-19 17:38:41 +08:00
harrybomrah 3c0d2da9a7 description fixed for gallery 2013-07-19 17:38:38 +08:00
harrybomrah 3287a2ef17 gallery migrated to new ui 2013-07-19 17:38:27 +08:00