Matthew K. Fu JuYuan
|
6a4abc6c43
|
fix news error
|
2012-06-27 09:59:32 +08:00 |
Harry Bomrah
|
4aa155a44d
|
timeline updates major ones..
|
2012-06-26 21:09:33 +08:00 |
|
Harry Bomrah
|
555ec86403
|
Timeline commit
|
2012-06-26 15:59:28 +08:00 |
|
Harry Bomrah
|
7488341836
|
Commit for app window..
|
2012-05-25 15:41:07 +08:00 |
Christophe Vilayphiou
|
541aa5831e
|
JS changes to load drag and drop
|
2012-05-22 17:37:15 +08:00 |
|
Christophe Vilayphiou
|
d0b030c47d
|
Put inc/ajax_setting in new_admin
Fix callback for link on save
|
2012-05-22 16:11:00 +08:00 |
|
Matthew K. Fu JuYuan
|
99bcdf6e1e
|
clean up unless code
|
2012-05-22 14:59:54 +08:00 |
|
Matthew K. Fu JuYuan
|
79f67208fa
|
js for preventing user do stupid things durning ajax
|
2012-05-22 14:59:54 +08:00 |
|
Christophe Vilayphiou
|
5e9836f371
|
Changes for structure
|
2012-05-22 14:45:49 +08:00 |
|
Harry Bomrah
|
81ff0f2c1c
|
Merge branch 'desktop_harry' into desktop_devin
|
2012-05-21 15:26:38 +08:00 |
|
Harry Bomrah
|
dfe7ccf166
|
general commit
|
2012-05-21 15:24:47 +08:00 |
devin
|
ab7ae6dcee
|
app
|
2012-05-21 14:55:51 +08:00 |
|
Christophe Vilayphiou
|
4d33c7a56d
|
Changes for dat and time format
Impression bug when some i18n missing in impressionable object
JS bug in ad_banner edit title
|
2012-05-18 19:42:36 +08:00 |
|
Matthew K. Fu JuYuan
|
16ada34585
|
fix ad_banner. new ad_image with best size from ad_banner. content editable at tab
|
2012-05-17 23:35:46 +08:00 |
|
Harry Bomrah
|
1b1c2c0032
|
image title and description callback fixed…
|
2012-05-17 20:19:31 +08:00 |
|
Matthew K. Fu JuYuan
|
a3acd865d7
|
AdBanner reopen new banner and delete. Rename title with content editable tag.
|
2012-05-17 06:44:14 +08:00 |
|
Christophe Vilayphiou
|
26292f0dcc
|
Asset upload
|
2012-05-17 06:28:29 +08:00 |
|
Harry Bomrah
|
617a683d00
|
image insertion completed..
|
2012-05-16 16:22:50 +08:00 |
|
Harry Bomrah
|
c380c4cad0
|
popup fixed
|
2012-05-16 15:34:23 +08:00 |
|
Harry Bomrah
|
30137b50b4
|
popup fix..
|
2012-05-16 15:33:54 +08:00 |
|
Harry Bomrah
|
75cbae049b
|
few experiments…
|
2012-05-16 11:18:54 +08:00 |
|
Christophe Vilayphiou
|
0b0916179f
|
Change assets
|
2012-05-16 11:07:11 +08:00 |
|
Christophe Vilayphiou
|
53a0fbddf0
|
Fix commit error
|
2012-05-15 21:25:51 +08:00 |
|
Christophe Vilayphiou
|
281cfa6518
|
Changes for widgets
|
2012-05-13 21:55:39 +08:00 |
|
Christophe Vilayphiou
|
803253ebcf
|
Put nestedSortable in page_edit.js.erb
|
2012-05-12 22:12:17 +08:00 |
|
Harry Bomrah
|
1a9fa8f505
|
Merge branch 'desktop_harry' into desktop_devin
|
2012-05-11 15:28:05 +08:00 |
|
Harry Bomrah
|
2c3637e9b4
|
very important update for widgets management..
|
2012-05-11 15:27:16 +08:00 |
|
Christophe Vilayphiou
|
fd52d00187
|
Add drag and drop to structure side_bar
|
2012-05-11 10:00:45 +08:00 |
|
Christophe Vilayphiou
|
63f904d3b0
|
Fix tinymce js load
Change to full_name for page_context index
|
2012-05-10 20:36:19 +08:00 |
|
devin
|
97b60c48b2
|
update
|
2012-05-10 17:41:56 +08:00 |
|
Matthew K. Fu JuYuan
|
b6aad17681
|
Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page.
|
2012-05-10 14:16:37 +08:00 |
|
devin
|
ada56a7a63
|
some update
|
2012-05-10 10:54:43 +08:00 |
|
Christophe Vilayphiou
|
a43877323e
|
Add tinymce to page_part edit for text
|
2012-05-10 10:34:13 +08:00 |
Christophe Vilayphiou
|
9ead6cafda
|
Ray's changes
|
2012-05-09 04:15:02 +08:00 |
|
Harry Bomrah
|
2083e0bf4f
|
widget structure improvised…
|
2012-05-07 19:00:50 +08:00 |
|
Harry Bomrah
|
fcc875bb5d
|
app store page added… and few other changes..
|
2012-05-04 20:28:12 +08:00 |
|
Christophe Vilayphiou
|
e0a191162d
|
Ray's changes
|
2012-05-04 19:11:28 +08:00 |
|
Harry Bomrah
|
3ad11f2098
|
View functionality, changed controller, journal and pages collections
|
2012-05-03 21:38:03 +08:00 |
|
Harry Bomrah
|
a3a1e4b92e
|
controller change, views working and db for paper and journals
|
2012-05-03 21:30:12 +08:00 |
|
devin
|
aeaf2f05d1
|
Start Add Page - no function
|
2012-05-03 17:59:07 +08:00 |
|
Harry Bomrah
|
1fce99c96f
|
Merge branch 'desktop_harry' into desktop_devin
|
2012-05-03 14:42:07 +08:00 |
|
Harry Bomrah
|
d6cbbff9de
|
connection page working now..
|
2012-05-03 14:40:54 +08:00 |
|
devin
|
b87cf0e2ff
|
list page
|
2012-05-03 14:39:22 +08:00 |
|
Harry Bomrah
|
6b8c79a9a8
|
Merge branch 'desktop_devin' into desktop_harry
|
2012-05-02 17:06:56 +08:00 |
|
Harry Bomrah
|
5b7c422446
|
position update fixed..
|
2012-05-02 17:05:40 +08:00 |
|
devin
|
887bda1491
|
lots of change
|
2012-05-02 17:04:16 +08:00 |
|
Christophe Vilayphiou
|
92a53c1b27
|
Ray's fix
|
2012-05-02 16:20:59 +08:00 |
|
devin
|
bfc4507696
|
Connection page design
|
2012-05-01 18:05:17 +08:00 |
|
Harry Bomrah
|
769a67f026
|
the group more structured and also demo connecting with gmail account..
|
2012-04-30 21:17:20 +08:00 |
|
Harry Bomrah
|
1b7fb106f8
|
lot of updates
|
2012-04-30 14:33:12 +08:00 |
|
Harry Bomrah
|
aacd9da9fb
|
auto login encryption done…
|
2012-04-30 14:29:42 +08:00 |
|
Christophe Vilayphiou
|
bda21baed2
|
Add missing js
|
2012-04-30 08:32:54 +08:00 |
|
devin
|
b6fceadff4
|
column group experiment
|
2012-04-30 06:41:05 +08:00 |
|
Christophe Vilayphiou
|
32faef0c70
|
DRY code for sorting
|
2012-04-30 06:30:52 +08:00 |
|
Matthew K. Fu JuYuan
|
c4db7e2157
|
Fix approval setting ajax problem
|
2012-04-30 00:24:11 +08:00 |
|
Matthew K. Fu JuYuan
|
94d61abf83
|
A modal view for approval user
|
2012-04-30 00:24:10 +08:00 |
|
Christophe Vilayphiou
|
851dc72f42
|
Ray's changes in css and html
|
2012-04-30 00:17:18 +08:00 |
|
devin
|
2ebba577eb
|
journal start
|
2012-04-27 14:04:11 +08:00 |
|
Christophe Vilayphiou
|
3beb035101
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-04-27 11:11:56 +08:00 |
|
Christophe Vilayphiou
|
5aca3db95f
|
Ray's changes for structure and web_links
|
2012-04-27 11:02:56 +08:00 |
|
devin
|
682880c5bf
|
skip it
|
2012-04-26 23:18:52 +08:00 |
|
Harry Bomrah
|
c158375d02
|
with connection and some save settings…
|
2012-04-26 21:30:13 +08:00 |
|
Christophe Vilayphiou
|
3d293f6419
|
Fix for quick edit file and link in announcement
Change submit_button into ajax_for_submit
|
2012-04-26 16:42:28 +08:00 |
|
Christophe Vilayphiou
|
6f1eb97ace
|
Fix for structure js and css
|
2012-04-25 18:41:38 +08:00 |
|
Christophe Vilayphiou
|
58d52c60d3
|
Fix for structure: restore js and change manifests
|
2012-04-25 18:17:58 +08:00 |
|
Matthew K. Fu JuYuan
|
7f285f4719
|
Change ad_banner preview from using title to id
|
2012-04-25 16:10:11 +08:00 |
|
Harry Bomrah
|
a298cbd5f6
|
Publication started
|
2012-04-24 16:45:26 +08:00 |
|
Matthew K. Fu JuYuan
|
c57ba305e9
|
Fix ad_banner
|
2012-04-24 14:37:06 +08:00 |
|
Christophe Vilayphiou
|
42aeaead93
|
Ray's changes, put the js for upload image component in a separate file
|
2012-04-24 12:15:32 +08:00 |
|
Christophe Vilayphiou
|
b80339d704
|
Ray's changes for image upload component and sign-in page
|
2012-04-24 11:35:50 +08:00 |
|
Christophe Vilayphiou
|
6831a3dbbb
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-04-24 02:44:39 +08:00 |
|
Christophe Vilayphiou
|
0c4328987a
|
Ray's changes for css files, sort headers in announcement and pagination
|
2012-04-24 02:37:51 +08:00 |
|
Christophe Vilayphiou
|
a5b13e680f
|
Add sub_menu in r_tags
|
2012-04-24 02:30:40 +08:00 |
|
Harry Bomrah
|
670ec2a40e
|
Themes from db fixed..
|
2012-04-23 21:04:02 +08:00 |
|
Matthew K. Fu JuYuan
|
0c46b4da23
|
AdImage and AnBanner JS fixed
|
2012-04-23 14:07:13 +08:00 |
|
Matthew K. Fu JuYuan
|
81b0046f42
|
Preview now can be use at both ad_banner and ad_image,however it won't run correctly if user change its ad_banner at ad_image.
|
2012-04-23 14:07:13 +08:00 |
|
Matthew K. Fu JuYuan
|
1b70852ff7
|
realtime preview is working. but save to object when preview
|
2012-04-23 14:06:37 +08:00 |
|
Christophe Vilayphiou
|
2f279c53ff
|
Apply patch from ldap
|
2012-04-23 14:04:55 +08:00 |
|
Harry Bomrah
|
8c42f6bb7c
|
Merge branch 'desktop_harry' into desktop_devin
|
2012-04-20 14:44:57 +08:00 |
|
devin
|
2ebed9e44a
|
javascript update
|
2012-04-20 09:45:40 +08:00 |
|
devin
|
1f077cf2b3
|
javascript update
|
2012-04-20 07:31:48 +08:00 |
|
devin
|
19750d69e0
|
some update
|
2012-04-20 05:38:53 +08:00 |
|
Harry Bomrah
|
3eaf97babe
|
title and heading and welcome msg…
|
2012-04-19 20:26:21 +08:00 |
|
Harry Bomrah
|
3c5b7a5de3
|
Modified confirm box…
|
2012-04-19 15:36:03 +08:00 |
|
Christophe Vilayphiou
|
72efdbd742
|
changes before Chirs and Ray's trip
|
2012-04-19 11:50:54 +08:00 |
|
Harry Bomrah
|
4bad25e682
|
Msg box added and background image saving complete
|
2012-04-18 22:01:12 +08:00 |
|
Harry Bomrah
|
b4bf81d40a
|
background image…
|
2012-04-18 18:20:39 +08:00 |
|
Harry Bomrah
|
6b35cf821e
|
some updates
|
2012-04-18 18:15:02 +08:00 |
|
Harry Bomrah
|
30a6dc6a95
|
Merge branch 'desktop_harry' into desktop_devin
|
2012-04-18 17:58:49 +08:00 |
|
Harry Bomrah
|
11a0875c44
|
color changes in custom color…
|
2012-04-18 17:57:47 +08:00 |
|
Harry Bomrah
|
d14630769a
|
Bg color fixed…
|
2012-04-18 14:57:00 +08:00 |
|
devin
|
b743413be9
|
function update
|
2012-04-18 13:17:12 +08:00 |
|
Harry Bomrah
|
95a1e266ae
|
Custom thème done and theme id done…
|
2012-04-17 21:15:40 +08:00 |
|
Harry Bomrah
|
b2d72902c3
|
Merge branch 'desktop_harry' into desktop_devin
|
2012-04-17 16:35:58 +08:00 |
|
Harry Bomrah
|
02c6933d0b
|
Tiles position saved in db and also change them from section manager
|
2012-04-17 16:33:41 +08:00 |
|
devin
|
4f18257733
|
try
|
2012-04-17 01:32:53 +08:00 |
|
Harry Bomrah
|
8d2e5210a1
|
alert removes
|
2012-04-13 17:06:27 +08:00 |
|
Harry Bomrah
|
d92451d079
|
alert removed
|
2012-04-13 17:05:47 +08:00 |
|
Harry Bomrah
|
7479a64c95
|
width changes in section page
|
2012-04-13 17:01:11 +08:00 |
|
Christophe Vilayphiou
|
957d4eaebb
|
Merge branch 'master' into desktop_harry
|
2012-04-13 16:03:43 +08:00 |
|
Christophe Vilayphiou
|
ca0fc4c767
|
Comment out code that bugged upload image in ad_banner
|
2012-04-13 15:53:25 +08:00 |
|
Christophe Vilayphiou
|
f54dba8b0b
|
Merge branch 'master' into desktop_harry
|
2012-04-13 13:39:00 +08:00 |
|
Harry Bomrah
|
64a9579b92
|
final on 13 april 00:00
|
2012-04-13 00:00:24 +08:00 |
|
Harry Bomrah
|
193cee2df7
|
new icons and widgets
|
2012-04-12 22:18:58 +08:00 |
|
Christophe Vilayphiou
|
f8873267a2
|
Ray's fix for announcement list
|
2012-04-12 18:41:14 +08:00 |
|
Harry Bomrah
|
92427e8831
|
section page done…
|
2012-04-12 16:25:06 +08:00 |
|
Harry Bomrah
|
7b423877bf
|
new updates
|
2012-04-12 14:50:45 +08:00 |
|
Harry Bomrah
|
48323ac1af
|
lot of changes in fetching
|
2012-04-12 14:44:08 +08:00 |
|
devin
|
67d1f7ad08
|
lots of change
|
2012-04-12 14:19:53 +08:00 |
|
Matthew K. Fu JuYuan
|
83b4443910
|
add pic and js for permission checkbox and filter
|
2012-04-12 07:14:06 +08:00 |
|
Matthew K. Fu JuYuan
|
57402b8602
|
add permission-checkbox js
|
2012-04-12 07:14:06 +08:00 |
|
Matthew K. Fu JuYuan
|
e4c41ab54c
|
A filter UI for permission select. with Harry's JS
|
2012-04-12 07:14:06 +08:00 |
|
Christophe Vilayphiou
|
486845460c
|
Filter and delete for bulletins
|
2012-04-12 06:50:36 +08:00 |
|
Harry Bomrah
|
25ca29403c
|
section page added
|
2012-04-11 17:58:52 +08:00 |
|
Harry Bomrah
|
5a6541a592
|
Setting page update
|
2012-04-11 17:26:25 +08:00 |
|
Harry Bomrah
|
c55cd5c9bb
|
Last commit
|
2012-04-11 15:50:27 +08:00 |
|
Harry Bomrah
|
68803c0c97
|
Lets see
|
2012-04-11 15:36:32 +08:00 |
|
Harry Bomrah
|
edf6089e0c
|
Devin complete
|
2012-04-11 15:34:19 +08:00 |
|
Harry Bomrah
|
4875b339f8
|
Fetching desktop from db
|
2012-04-11 15:31:10 +08:00 |
|
devin
|
1fabe3d8f7
|
theme setting update
|
2012-04-11 15:22:05 +08:00 |
|
devin
|
0219c3df28
|
various update
|
2012-04-11 15:04:00 +08:00 |
|
devin
|
42f45aa137
|
theme setting update
|
2012-04-11 13:46:32 +08:00 |
|
devin
|
ee85380ab2
|
little update
|
2012-04-10 18:09:29 +08:00 |
|
devin
|
360e5228b7
|
custom theme settings
|
2012-04-10 17:44:36 +08:00 |
|
devin
|
6006f1b3c6
|
start editing setting page
some relevant stuff updated
|
2012-04-10 01:06:29 +08:00 |
|
Harry Bomrah
|
32a1be624b
|
Fully updated..
|
2012-04-09 17:55:03 +08:00 |
|
Harry Bomrah
|
f807cd026d
|
app section modified…
|
2012-04-09 17:40:03 +08:00 |
|
Christophe Vilayphiou
|
963a0cb604
|
Change filter to js with history for bulletins
|
2012-04-07 00:20:52 +08:00 |
|
Harry Bomrah
|
35567c2139
|
Widgets Loading dynamically and semi structured
|
2012-04-06 23:48:03 +08:00 |
|
Harry Bomrah
|
bb2375b15e
|
Temp Commit
|
2012-04-06 19:05:11 +08:00 |
|
Christophe Vilayphiou
|
f65bb9b323
|
Merge branch 'master' into desktop_harry
Conflicts:
app/assets/stylesheets/style.css.erb
|
2012-04-06 19:02:39 +08:00 |
|
Christophe Vilayphiou
|
253f4bcb54
|
Ray's changes for orbit bar
|
2012-04-06 18:06:57 +08:00 |
|
Harry Bomrah
|
e1ef2b28e7
|
theme changes
|
2012-04-06 17:49:22 +08:00 |
|
Harry Bomrah
|
7309d9c446
|
Dock change and getting values from db
|
2012-04-06 17:49:22 +08:00 |
|
Harry Bomrah
|
b2c9229099
|
route fixed.
|
2012-04-06 17:47:04 +08:00 |
|
Harry Bomrah
|
3acd8a86c7
|
commit temp
|
2012-04-06 17:47:04 +08:00 |
|
devin
|
cd3e04c55c
|
add tinyscrollbar
|
2012-04-06 17:47:04 +08:00 |
|
devin
|
293e084bea
|
dock effect
|
2012-04-06 17:47:04 +08:00 |
|
Harry Bomrah
|
f5c080efd4
|
Model commit
|
2012-04-06 17:47:04 +08:00 |
unknown
|
79f005c88e
|
new icons
|
2012-04-06 17:47:03 +08:00 |
|
Harry Bomrah
|
58b51f0d17
|
Themes fixed…
|
2012-04-06 17:47:03 +08:00 |
|
Harry Bomrah
|
ddf6a606a2
|
with notifications and other changes
|
2012-04-06 17:47:03 +08:00 |
|
Harry Bomrah
|
6158799a47
|
Stupid theme
|
2012-04-06 17:47:03 +08:00 |
|
Harry Bomrah
|
77b2919d8c
|
Desktop Commit
|
2012-04-06 17:47:02 +08:00 |
|
Harry Bomrah
|
da7b415ad8
|
Desktop commit
|
2012-04-06 17:47:01 +08:00 |
|
Harry Bomrah
|
94816ce224
|
js change
|
2012-04-06 15:18:39 +08:00 |
|
devin
|
74f083b226
|
details changed
orbitdesktop.js, orbitdesktopAPI.js update!
|
2012-04-06 04:42:20 +08:00 |
|
Harry Bomrah
|
39e1bc8948
|
new setting page
|
2012-04-05 20:09:11 +08:00 |
|
Matthew K. Fu JuYuan
|
01bda515a6
|
fact_check with Ray's permission check.
needs Ray's new css
|
2012-04-05 17:41:43 +08:00 |
|
Christophe Vilayphiou
|
ef8eb0450b
|
Changes in tinymce bar
|
2012-04-05 17:28:21 +08:00 |