 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 |
|
|
harrybomrah
|
465d417c35
|
fixed updated method of events.. was having week error when updating events
|
2013-06-26 12:27:23 +08:00 |
|
|
harrybomrah
|
eaf7577810
|
small syntax error missed out yesterday fixed.
|
2013-06-26 12:26:52 +08:00 |
|
|
harrybomrah
|
22358bd862
|
Small change for creating events when calendar is not selected
|
2013-06-26 12:26:24 +08:00 |
|
|
harrybomrah
|
300de76c3a
|
Calendar fixed... all views fixed plus event loading fixed and also agenda view fixed.
|
2013-06-26 12:25:58 +08:00 |
|
|
harrybomrah
|
d089822ff3
|
fixed updated method of events.. was having week error when updating events
|
2013-06-20 12:47:44 +08:00 |
|
|
harrybomrah
|
777af19abb
|
small syntax error missed out yesterday fixed.
|
2013-06-20 11:55:06 +08:00 |
|
|
harrybomrah
|
07e895fc42
|
Small change for creating events when calendar is not selected
|
2013-06-19 17:27:13 +08:00 |
|
|
harrybomrah
|
80bf3499be
|
Calendar fixed... all views fixed plus event loading fixed and also agenda view fixed.
|
2013-06-19 17:16:52 +08:00 |
|
|
harrybomrah
|
11067ef34f
|
english mandatory removed from albums
|
2013-04-23 11:09:43 +08:00 |
|
|
harrybomrah
|
38d5a193e0
|
tiny scrollbar trigger fixed and devin branch merged
|
2013-04-17 14:31:09 +08:00 |
|
|
harrybomrah
|
e2802d94d0
|
rake task added
|
2013-04-17 14:28:13 +08:00 |
|
|
harrybomrah
|
d288972035
|
stupid commit
|
2013-04-17 14:19:32 +08:00 |
|
|
harrybomrah
|
c6868bf2e0
|
small fix in select2.js
|
2013-04-17 14:18:49 +08:00 |
|
|
harrybomrah
|
bc0477a5ed
|
widget and gridster fixes
|
2013-04-17 14:16:24 +08:00 |
|
|
harrybomrah
|
793d739726
|
features and widgets added
Conflicts:
app/assets/javascripts/orbitdesktop.js
|
2013-04-17 14:14:23 +08:00 |
|
|
harrybomrah
|
84afbfa86c
|
section page fixed..
|
2013-04-17 14:01:48 +08:00 |
|
|
harrybomrah
|
764f83d58c
|
app manager changed plus some changes
|
2013-04-17 14:01:14 +08:00 |
|
|
harrybomrah
|
8dee211ab4
|
section page fixed..
|
2013-04-17 14:01:14 +08:00 |
|
|
harrybomrah
|
f9e7cefc94
|
compatibility page added and tinyscrollbar drag event fixed..
|
2013-04-17 13:59:16 +08:00 |
|
|
harrybomrah
|
41643d1f61
|
tinyscrollbar pagination fixed
|
2013-04-17 12:11:33 +08:00 |
|
|
harrybomrah
|
54af5e8bd4
|
insert and remove columns
|
2013-04-17 12:06:33 +08:00 |
|
|
harrybomrah
|
6db9e70132
|
Major tinyscrollbar update
|
2013-04-17 12:04:22 +08:00 |
|
|
harrybomrah
|
dabceec3ea
|
all none for conf done
|
2013-04-17 11:23:03 +08:00 |
|
|
harrybomrah
|
52789fa032
|
all none fixed
|
2013-04-17 11:23:02 +08:00 |
|
|
harrybomrah
|
dae3f069ff
|
app manager changed plus some changes
|
2013-04-17 11:09:56 +08:00 |
|
|
harrybomrah
|
b1d7d5345e
|
section page fixed..
|
2013-04-17 11:08:58 +08:00 |
|
|
harrybomrah
|
b8ee2fd559
|
compatibility page added and tinyscrollbar drag event fixed..
|
2013-04-17 11:07:20 +08:00 |
|
|
harrybomrah
|
401c75c0de
|
Major tinyscrollbar update
|
2013-04-17 11:06:28 +08:00 |
|
|
harrybomrah
|
323fadc210
|
tinyscrollbar pagination fixed
|
2013-04-17 11:05:57 +08:00 |
|
|
harrybomrah
|
db60a3bcfa
|
insert and remove columns
|
2013-04-17 11:04:37 +08:00 |
|
|
harrybomrah
|
a7667d586a
|
Major tinyscrollbar update
|
2013-04-17 11:04:36 +08:00 |
|
|
harrybomrah
|
d840b82fa9
|
insert and remove columns
|
2013-04-17 10:56:15 +08:00 |
|
|
harrybomrah
|
1d06bcaae7
|
Major tinyscrollbar update
|
2013-04-17 10:54:38 +08:00 |
|
|
harrybomrah
|
6cd97adf21
|
all none for conf done
|
2013-04-17 10:54:38 +08:00 |
|
|
harrybomrah
|
0189d1c2c0
|
all none fixed
|
2013-04-17 10:54:38 +08:00 |
|
|
harrybomrah
|
3182f5c9a8
|
merging
|
2013-03-05 11:20:01 +08:00 |
|
|
harrybomrah
|
dc92ef9f42
|
simple layout tinyscrollbar fixed
|
2013-03-05 11:04:18 +08:00 |
|
|
harrybomrah
|
b5abbc9ef0
|
highlighting fixed…
|
2013-03-04 17:57:32 +08:00 |
|
|
harrybomrah
|
ee5fd18b64
|
highlighting fixed…
|
2013-03-04 17:44:55 +08:00 |
|
|
harrybomrah
|
8ade2c5949
|
fixed adding.
|
2013-03-04 16:31:37 +08:00 |
|
|
harrybomrah
|
0c659e5a9b
|
layout fix
|
2013-03-04 16:31:37 +08:00 |
|
|
harrybomrah
|
d4392c8d56
|
fixed adding.
|
2013-03-04 16:21:35 +08:00 |
|
|
harrybomrah
|
6ae4e4d0ef
|
layout fix
|
2013-03-04 15:48:24 +08:00 |
|
|
harrybomrah
|
9a32732ae4
|
layout fix
|
2013-03-04 14:57:36 +08:00 |
|
|
harrybomrah
|
e69679d3fe
|
tinyscrollbar_bug fixed
|
2013-03-04 12:37:29 +08:00 |
|
|
harrybomrah
|
2ead541733
|
url handling modified.. tinyscrollbar modified… star checkbox fixed..
|
2013-03-04 12:37:29 +08:00 |
|
|
harrybomrah
|
23c8c28b52
|
tinyscrollbar fixed
|
2013-03-04 12:37:29 +08:00 |
|
|
harrybomrah
|
0f12314213
|
some changes for gridster
|
2013-03-04 12:37:29 +08:00 |
|
|
harrybomrah
|
b8ee748723
|
Lot of changes in gridster
|
2013-03-04 12:37:29 +08:00 |
|
|
harrybomrah
|
c1cb5e5ffb
|
tinyscrollbar_bug fixed
|
2013-03-01 17:49:58 +08:00 |
|
|
harrybomrah
|
9b8ab2a2c1
|
url handling modified.. tinyscrollbar modified… star checkbox fixed..
|
2013-03-01 14:45:20 +08:00 |
|
|
harrybomrah
|
c82e9a646d
|
tinyscrollbar fixed
|
2013-02-27 18:55:26 +08:00 |
|
|
harrybomrah
|
7ef02d3108
|
Merge branch 'desktop' into desktop_work
|
2013-02-27 11:51:56 +08:00 |
|
|
harrybomrah
|
912080482b
|
some changes for gridster
|
2013-02-27 11:47:41 +08:00 |
|
|
harrybomrah
|
e9c0f443b7
|
Lot of changes in gridster
|
2013-02-26 11:47:39 +08:00 |
|