 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 |
|
|
harrybomrah
|
edd2c1f522
|
css minor changes.
|
2013-02-25 11:08:57 +08:00 |
|
|
harrybomrah
|
9f362d9ae6
|
gridster, url code fixed, views removed.
|
2013-02-25 11:08:56 +08:00 |
|
|
harrybomrah
|
a0b22761c7
|
css minor changes.
|
2013-02-23 17:12:02 +08:00 |
|
|
harrybomrah
|
5f9dd984b1
|
gridster, url code fixed, views removed.
|
2013-02-23 15:23:24 +08:00 |
|
|
harrybomrah
|
37f8c1637a
|
new desktop framework updates
|
2012-12-27 18:25:54 +08:00 |
|
|
harrybomrah
|
607a4f5acf
|
fixed fileview in english mode
|
2012-12-07 12:38:23 +08:00 |
|
|
harrybomrah
|
9dde79414d
|
all sections and sections megerd
|
2012-12-07 12:38:23 +08:00 |
|
|
harrybomrah
|
ad8273d638
|
fixed fileview in english mode
|
2012-12-07 11:19:40 +08:00 |
|
|
harrybomrah
|
08b99011d0
|
all sections and sections megerd
|
2012-12-07 10:10:38 +08:00 |
|
|
harrybomrah
|
59c4080f0c
|
stupid fix
|
2012-12-07 04:21:26 +08:00 |
|
|
harrybomrah
|
da3f0b58f5
|
section fixed and some other fixes
|
2012-12-07 04:21:26 +08:00 |
|
|
harrybomrah
|
3d382fec6b
|
scroll fixed...
|
2012-12-07 04:21:26 +08:00 |
|
|
harrybomrah
|
c2285a34f6
|
stupid fix
|
2012-12-06 18:50:24 +08:00 |
|
|
harrybomrah
|
8094ddc967
|
section fixed and some other fixes
|
2012-12-06 17:43:19 +08:00 |
|
|
harrybomrah
|
df4a9a5dff
|
scroll fixed...
|
2012-12-06 15:44:16 +08:00 |
|
|
harrybomrah
|
3d1fb48489
|
edit coauthor relation done
|
2012-12-06 07:59:44 +08:00 |
|
|
harrybomrah
|
79dc99d431
|
br fixed
|
2012-12-06 07:59:43 +08:00 |
|
|
harrybomrah
|
93c027cfd6
|
edit coauthor relation done
|
2012-12-05 18:58:43 +08:00 |
|
|
harrybomrah
|
02ff46d16e
|
br fixed
|
2012-12-05 17:09:17 +08:00 |
|
|
harrybomrah
|
c6e0b56012
|
stupid bug fixed
|
2012-12-04 00:31:46 +08:00 |
|
|
harrybomrah
|
49d1ca6997
|
new type fixed
|
2012-12-04 00:31:46 +08:00 |
|
|
harrybomrah
|
0e6c75e677
|
form for coauthor - fixed
|
2012-12-04 00:31:07 +08:00 |
|
|
harrybomrah
|
a6a50227eb
|
new type fixed
|
2012-12-04 00:31:07 +08:00 |
|