8f1ce78ab4
Fix bug when homepage
2012-05-04 15:51:51 +08:00
453cb21066
Announcement preivew
2012-05-04 15:50:45 +08:00
f6307abfbf
fix broken ad_banner
2012-05-04 15:40:43 +08:00
bff3cefbc7
Apply app_auth to ad_banner. From now,ad_banner can only be viewed for at least manager.
2012-05-04 15:40:43 +08:00
f427c3803f
clean up useless flash msgs. add i18n vars for app auth and object auth
2012-05-04 15:40:43 +08:00
05ded8de03
Fix for NCCU 0430 all functions ok with two submanagers but different behavors
2012-05-04 15:38:18 +08:00
3ad11f2098
View functionality, changed controller, journal and pages collections
2012-05-03 21:38:03 +08:00
a3a1e4b92e
controller change, views working and db for paper and journals
2012-05-03 21:30:12 +08:00
aeaf2f05d1
Start Add Page - no function
2012-05-03 17:59:07 +08:00
1fce99c96f
Merge branch 'desktop_harry' into desktop_devin
2012-05-03 14:42:07 +08:00
d6cbbff9de
connection page working now..
2012-05-03 14:40:54 +08:00
b87cf0e2ff
list page
2012-05-03 14:39:22 +08:00
45e21f9569
Fix filter category in news
2012-05-02 17:55:02 +08:00
6b8c79a9a8
Merge branch 'desktop_devin' into desktop_harry
2012-05-02 17:06:56 +08:00
5b7c422446
position update fixed..
2012-05-02 17:05:40 +08:00
887bda1491
lots of change
2012-05-02 17:04:16 +08:00
b8cd7097b0
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-02 16:27:09 +08:00
2762c24593
Fix wrong variable names in translations
2012-05-02 16:22:06 +08:00
92a53c1b27
Ray's fix
2012-05-02 16:20:59 +08:00
bfc4507696
Connection page design
2012-05-01 18:05:17 +08:00
769a67f026
the group more structured and also demo connecting with gmail account..
2012-04-30 21:17:20 +08:00
1b7fb106f8
lot of updates
2012-04-30 14:33:12 +08:00
aacd9da9fb
auto login encryption done…
2012-04-30 14:29:42 +08:00
fe54c6ae71
Fix bug when id or single object
2012-04-30 14:23:41 +08:00
a9ab016d52
Merge branch 'design_team' into ldap
2012-04-30 08:33:21 +08:00
bda21baed2
Add missing js
2012-04-30 08:32:54 +08:00
767e4a3fe9
Merge branch 'design_team' into ldap
2012-04-30 08:16:17 +08:00
496b8de58a
Side bar translation
2012-04-30 08:15:45 +08:00
20504b2205
Merge branch 'design_team' into ldap
...
Conflicts:
app/controllers/admin/page_parts_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
2012-04-30 07:57:20 +08:00
b6fceadff4
column group experiment
2012-04-30 06:41:05 +08:00
b8f52fa1ec
Separate announcement and news
2012-04-30 06:31:46 +08:00
63ee8eaca9
Remove url from sorting
...
Add sorting_options to params in filters
2012-04-30 06:30:52 +08:00
32faef0c70
DRY code for sorting
2012-04-30 06:30:52 +08:00
a46a8898d7
Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen
2012-04-30 00:24:11 +08:00
6b151b1fb6
403 for unauth apps
2012-04-30 00:24:11 +08:00
c4db7e2157
Fix approval setting ajax problem
2012-04-30 00:24:11 +08:00
94d61abf83
A modal view for approval user
2012-04-30 00:24:10 +08:00
9d97b7c008
Change for the notice msg at login page
2012-04-30 00:24:10 +08:00
851dc72f42
Ray's changes in css and html
2012-04-30 00:17:18 +08:00
a99d685bce
conflict solved
2012-04-28 01:56:00 +08:00
03f19b80b4
small change
2012-04-28 01:49:48 +08:00
a23f290831
changes for login …
2012-04-27 22:14:44 +08:00
2362e1cfdd
Merge branch 'design_team' into ldap
2012-04-27 15:28:32 +08:00
799fd1e3ac
Fix css bugs (opacity=) and changes in sign_in page
2012-04-27 15:27:59 +08:00
feb2156fd3
Fix error in side_bar for web_links
2012-04-27 14:15:36 +08:00
2ebba577eb
journal start
2012-04-27 14:04:11 +08:00
3beb035101
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-27 11:11:56 +08:00
5aca3db95f
Ray's changes for structure and web_links
2012-04-27 11:02:56 +08:00
682880c5bf
skip it
2012-04-26 23:18:52 +08:00
c158375d02
with connection and some save settings…
2012-04-26 21:30:13 +08:00
c2ac682787
updates for connections
2012-04-26 17:23:47 +08:00
7d6b82d9dd
Merge branch 'ad_banner' into ldap
2012-04-26 17:15:44 +08:00
4af2068c1f
Fix ad_banner sec and msec
2012-04-26 17:11:06 +08:00
faace9893a
dehumanize ad banner
2012-04-26 17:11:05 +08:00
9a5ce5f512
Remove unless sidebar links.
2012-04-26 17:11:05 +08:00
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
64be61d61b
with gmail widget..
2012-04-26 14:47:49 +08:00
6bf4c60d45
Changes for js and ccs load for site's pages
2012-04-26 01:49:02 +08:00
6f1eb97ace
Fix for structure js and css
2012-04-25 18:41:38 +08:00
58d52c60d3
Fix for structure: restore js and change manifests
2012-04-25 18:17:58 +08:00
1f4fe65430
Merge branch 'design_team' into ldap
...
Conflicts:
app/views/devise/sessions/new.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
2012-04-25 16:45:04 +08:00
876036dd20
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
app/views/admin/ad_banners/_ad_banner_tab.html.erb
2012-04-25 16:39:26 +08:00
44ded537b3
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-25 16:28:34 +08:00
65a6f9c416
Ray's css fix for quick edit
2012-04-25 16:26:27 +08:00
a3a109fb8b
Remove JS debug msg.
2012-04-25 16:10:11 +08:00
7f285f4719
Change ad_banner preview from using title to id
2012-04-25 16:10:11 +08:00
72921d6dfd
fix useless notice at login
2012-04-25 16:10:11 +08:00
abf75ffedd
Merge branch 'design_team' into ldap
2012-04-25 15:45:16 +08:00
573c19ff4b
Remove .erb when including css
2012-04-25 15:44:44 +08:00
8adb9c6878
Merge branch 'design_team' into ldap
2012-04-25 15:10:50 +08:00
3ec8bb7be6
Fix assets bug: when having a '.' in the name, the extension must be specified
2012-04-25 15:10:28 +08:00
8f242e2d39
Merge branch 'design_team' into ldap
2012-04-24 17:00:51 +08:00
3308744396
Fix side_bar after Matt's changes in translation
2012-04-24 17:00:33 +08:00
0c4f1d91f7
Merge branch 'ad_banner' into ldap
2012-04-24 16:46:04 +08:00
a298cbd5f6
Publication started
2012-04-24 16:45:26 +08:00
db46803cda
R4-Billingual
2012-04-24 16:43:45 +08:00
d1f687e43e
Merge branch 'design_team' into ldap
2012-04-24 16:32:30 +08:00
c7d8e0b27b
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb
2012-04-24 16:32:00 +08:00
291d5e3a03
Ray's changes in css
2012-04-24 16:24:50 +08:00
70f6c7b540
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
2012-04-24 15:28:52 +08:00
c0abaa643c
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-24 15:21:12 +08:00
45c194e870
Ray's changes in css
2012-04-24 15:15:36 +08:00
51ee9a4bfa
Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
...
Conflicts:
app/views/admin/ad_banners/_ad_banner_tab.html.erb
2012-04-24 14:43:30 +08:00
33640de184
Changes for Billingual
2012-04-24 14:37:06 +08:00
bbcdaf00e7
Disable ad_banner_preview. Just show window
2012-04-24 14:37:06 +08:00
e7bb9ea86b
Fix ad image date selector
2012-04-24 14:37:06 +08:00
c57ba305e9
Fix ad_banner
2012-04-24 14:37:06 +08:00
04688608f7
Changes for Billingual
2012-04-24 14:30:30 +08:00
c856b4cdce
Fix for upload image component in announcement
2012-04-24 12:41:28 +08:00
42aeaead93
Ray's changes, put the js for upload image component in a separate file
2012-04-24 12:15:32 +08:00
b80339d704
Ray's changes for image upload component and sign-in page
2012-04-24 11:35:50 +08:00
6e431b6137
Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
2012-04-24 11:26:13 +08:00
308cfc7cf2
Merge branch 'design_team' into ldap
...
Conflicts:
app/views/devise/sessions/new.html.erb
2012-04-24 02:46:06 +08:00
6831a3dbbb
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-24 02:44:39 +08:00
0c4328987a
Ray's changes for css files, sort headers in announcement and pagination
2012-04-24 02:37:51 +08:00
d4aea664e2
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
2012-04-24 02:37:03 +08:00
a5b13e680f
Add sub_menu in r_tags
2012-04-24 02:30:40 +08:00
670ec2a40e
Themes from db fixed..
2012-04-23 21:04:02 +08:00
0836583694
Disable ad_banner_preview. Just show window
2012-04-23 18:29:23 +08:00
a5db2382e7
Fix ad image date selector
2012-04-23 18:20:12 +08:00
35452c039d
Fix ad_banner
2012-04-23 17:03:55 +08:00
834cbe3a11
Fix side_bar for tags
...
Modules needs to use the fullpath for active or visible in tags
2012-04-23 16:12:07 +08:00
3280ff8311
archive checkbox
2012-04-23 15:53:58 +08:00
5a423178e3
Merge branch 'design_team' into ldap
...
Conflicts:
app/assets/stylesheets/new_admin.css.erb
app/assets/stylesheets/widget.css
2012-04-23 15:16:50 +08:00
499930a680
Pull from github
2012-04-23 14:29:55 +08:00
2eeb530422
Merge branch 'master' into ldap
...
Conflicts:
app/assets/stylesheets/new_admin.css.erb
2012-04-23 14:13:37 +08:00
67ba2389a2
fix js
2012-04-23 14:07:14 +08:00
8eedbc951e
add i18n vars
2012-04-23 14:07:14 +08:00
0c46b4da23
AdImage and AnBanner JS fixed
2012-04-23 14:07:13 +08:00
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
e353afb5ac
fix i18n vars in ad_banner
2012-04-23 14:07:13 +08:00
1b70852ff7
realtime preview is working. but save to object when preview
2012-04-23 14:06:37 +08:00
8cc0611c4a
Ray's fix for ad_banner
2012-04-23 14:06:36 +08:00
30edc317b2
text area for ad_image
2012-04-23 14:06:36 +08:00
ff472714de
AdBanner i18n vars patch
2012-04-23 14:05:18 +08:00
2f279c53ff
Apply patch from ldap
2012-04-23 14:04:55 +08:00
868118116b
Merge commit 'b6f64cd8a5b48ad84703e3824ef4d968ed71779d' into ldap
2012-04-23 13:58:56 +08:00
6a4203b850
Ray's css fix with widget css
2012-04-23 11:53:36 +08:00
b6f64cd8a5
Announcement i18n vars
2012-04-23 11:29:00 +08:00
fe9032787c
NCCU ldap debug
2012-04-23 10:13:44 +08:00
8c42f6bb7c
Merge branch 'desktop_harry' into desktop_devin
2012-04-20 14:44:57 +08:00
2ebed9e44a
javascript update
2012-04-20 09:45:40 +08:00
1f077cf2b3
javascript update
2012-04-20 07:31:48 +08:00
19750d69e0
some update
2012-04-20 05:38:53 +08:00
3eaf97babe
title and heading and welcome msg…
2012-04-19 20:26:21 +08:00
3c5b7a5de3
Modified confirm box…
2012-04-19 15:36:03 +08:00
7e355b77c2
Merge branch 'ldap' of https://github.com/Rulingcom/orbit into ldap
...
Conflicts:
Gemfile
Gemfile.lock
app/views/admin/attributes/_app_selector.html.erb
app/views/admin/module_apps/_app_selector.html.erb
app/views/admin/pages/_app_selector.html.erb
config/application.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
2012-04-19 14:31:05 +08:00
ba0677a001
Merge commit '72efdbd742d4f3ac8a910bd5c817cf5c74570ba5' into ldap
2012-04-19 14:09:37 +08:00
f55b3a4374
Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap
...
Conflicts:
Gemfile
Gemfile.lock
app/views/admin/attributes/_app_selector.html.erb
app/views/admin/module_apps/_app_selector.html.erb
app/views/admin/pages/_app_selector.html.erb
config/application.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
2012-04-19 14:06:00 +08:00
72efdbd742
changes before Chirs and Ray's trip
2012-04-19 11:50:54 +08:00
4bad25e682
Msg box added and background image saving complete
2012-04-18 22:01:12 +08:00
b4bf81d40a
background image…
2012-04-18 18:20:39 +08:00
6b35cf821e
some updates
2012-04-18 18:15:02 +08:00
30a6dc6a95
Merge branch 'desktop_harry' into desktop_devin
2012-04-18 17:58:49 +08:00
11a0875c44
color changes in custom color…
2012-04-18 17:57:47 +08:00
170c12bcdd
fix js
2012-04-18 16:24:17 +08:00
0ddb66a3c9
add i18n vars
2012-04-18 15:33:11 +08:00
8d776fd30d
AdImage and AnBanner JS fixed
2012-04-18 15:26:59 +08:00
d14630769a
Bg color fixed…
2012-04-18 14:57:00 +08:00
b743413be9
function update
2012-04-18 13:17:12 +08:00
7b391904f7
Merge branch 'desktop_devin' of https://github.com/Rulingcom/orbit into desktop_devin
2012-04-17 21:20:36 +08:00
95a1e266ae
Custom thème done and theme id done…
2012-04-17 21:15:40 +08:00
1f44a10206
wallpaper added
2012-04-17 18:06:07 +08:00
b2d72902c3
Merge branch 'desktop_harry' into desktop_devin
2012-04-17 16:35:58 +08:00
02c6933d0b
Tiles position saved in db and also change them from section manager
2012-04-17 16:33:41 +08:00
8cd4844689
html change
2012-04-17 16:32:11 +08:00
51190a79cb
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-17 16:03:48 +08:00
a9a4ca6ede
fix i18n vars in ad_banner
2012-04-17 15:21:43 +08:00
06a3128be5
realtime preview is working. but save to object when preview
2012-04-17 11:34:25 +08:00
4f18257733
try
2012-04-17 01:32:53 +08:00
6cdebb440d
Ray's fix for ad_banner
2012-04-13 18:02:36 +08:00
92e898a656
Merge branch 'master' into ldap
2012-04-13 17:52:15 +08:00
7cf00d1d93
text area for ad_image
2012-04-13 17:51:19 +08:00
d81ca40f90
AdBanner i18n vars patch
2012-04-13 17:24:30 +08:00
8d2e5210a1
alert removes
2012-04-13 17:06:27 +08:00
d92451d079
alert removed
2012-04-13 17:05:47 +08:00
7479a64c95
width changes in section page
2012-04-13 17:01:11 +08:00
430b0fd9ae
Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
...
Conflicts:
app/views/admin/ad_banners/_ad_image_update.html.erb
2012-04-13 16:52:14 +08:00
4af73ecf6f
fix preview window size.
2012-04-13 16:46:16 +08:00
0fe5baf93f
fix for letting ad_banner display even when file in not uploaded
2012-04-13 16:14:43 +08:00
a2e35f3626
Merge branch 'master' into ldap
2012-04-13 16:03:57 +08:00
957d4eaebb
Merge branch 'master' into desktop_harry
2012-04-13 16:03:43 +08:00
ebf9a896aa
Merge branches 'dashboard' and 'dashboard' of github.com:Rulingcom/orbit into dashboard
2012-04-13 15:57:42 +08:00
31baa2cb63
new archive
2012-04-13 15:57:15 +08:00
ca0fc4c767
Comment out code that bugged upload image in ad_banner
2012-04-13 15:53:25 +08:00
d1feb102d0
Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
2012-04-13 15:27:10 +08:00
d646a9dff1
fix new ad_image data selector bug
2012-04-13 15:24:59 +08:00
0bcb74d793
new archive
2012-04-13 15:24:19 +08:00
8167172ca9
Merge branch 'master' into desktop_harry
2012-04-13 14:05:08 +08:00
de035cb89a
fix date selector value fill back problem
2012-04-13 13:52:01 +08:00
f54dba8b0b
Merge branch 'master' into desktop_harry
2012-04-13 13:39:00 +08:00
1e43349eb8
Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
2012-04-13 12:48:57 +08:00
fe59446c16
fix date selector value fill back problem
2012-04-13 12:47:57 +08:00
64a9579b92
final on 13 april 00:00
2012-04-13 00:00:24 +08:00
6b43e70f53
Merge branch 'desktop_harry' into desktop_devin
2012-04-12 22:21:05 +08:00
193cee2df7
new icons and widgets
2012-04-12 22:18:58 +08:00
198825a309
Merge branch 'master' into ldap
...
Conflicts:
Gemfile
Gemfile.lock
app/views/admin/attributes/_app_selector.html.erb
app/views/admin/module_apps/_app_selector.html.erb
app/views/admin/pages/_app_selector.html.erb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-04-12 18:50:48 +08:00
f8873267a2
Ray's fix for announcement list
2012-04-12 18:41:14 +08:00
eabbba76fc
css change
2012-04-12 18:14:26 +08:00
6728c35023
Fix side_bar.
...
In the case of tags, take the uri instead of controller name
2012-04-12 18:14:00 +08:00
015c0cb452
Delete useless code in items
2012-04-12 18:13:10 +08:00
93ac99d235
Add missing css in "inc"
2012-04-12 18:12:46 +08:00
01af32aa60
added divs with id
2012-04-12 16:52:32 +08:00
92427e8831
section page done…
2012-04-12 16:25:06 +08:00
7b423877bf
new updates
2012-04-12 14:50:45 +08:00
48323ac1af
lot of changes in fetching
2012-04-12 14:44:08 +08:00
67d1f7ad08
lots of change
2012-04-12 14:19:53 +08:00
b54578ce1e
ad banner preview
2012-04-12 07:14:06 +08:00
83b4443910
add pic and js for permission checkbox and filter
2012-04-12 07:14:06 +08:00
57402b8602
add permission-checkbox js
2012-04-12 07:14:06 +08:00
e4c41ab54c
A filter UI for permission select. with Harry's JS
2012-04-12 07:14:06 +08:00
5417c6fec0
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
2012-04-12 07:13:13 +08:00
7bca339a5b
Ray's fix for columns width in bulletins
2012-04-12 07:01:34 +08:00
486845460c
Filter and delete for bulletins
2012-04-12 06:50:36 +08:00
25ca29403c
section page added
2012-04-11 17:58:52 +08:00
5a6541a592
Setting page update
2012-04-11 17:26:25 +08:00
c55cd5c9bb
Last commit
2012-04-11 15:50:27 +08:00
68803c0c97
Lets see
2012-04-11 15:36:32 +08:00
edf6089e0c
Devin complete
2012-04-11 15:34:19 +08:00
4875b339f8
Fetching desktop from db
2012-04-11 15:31:10 +08:00
1fabe3d8f7
theme setting update
2012-04-11 15:22:05 +08:00
0219c3df28
various update
2012-04-11 15:04:00 +08:00
42f45aa137
theme setting update
2012-04-11 13:46:32 +08:00
ee85380ab2
little update
2012-04-10 18:09:29 +08:00
360e5228b7
custom theme settings
2012-04-10 17:44:36 +08:00
6006f1b3c6
start editing setting page
...
some relevant stuff updated
2012-04-10 01:06:29 +08:00
695c1dee58
Merge branch 'desktop_devin' of https://github.com/Rulingcom/orbit into desktop_devin
2012-04-09 17:55:17 +08:00
32a1be624b
Fully updated..
2012-04-09 17:55:03 +08:00
eb219c14b7
Merge branch 'desktop_harry' of https://github.com/Rulingcom/orbit into desktop_harry
2012-04-09 17:40:13 +08:00
f807cd026d
app section modified…
2012-04-09 17:40:03 +08:00
9dde708c01
app manager page update
2012-04-09 17:13:24 +08:00
d2e77d6bf8
Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
2012-04-09 12:45:27 +08:00
d2a3a4d26e
ad banner preview
2012-04-09 12:44:08 +08:00
0eab9ca8fa
add pic and js for permission checkbox and filter
2012-04-09 12:43:51 +08:00
c7c3af91dd
add permission-checkbox js
2012-04-09 12:43:10 +08:00
e1ef109b8b
Fix bug: Snake -> snake
2012-04-07 01:33:36 +08:00
963a0cb604
Change filter to js with history for bulletins
2012-04-07 00:20:52 +08:00
35567c2139
Widgets Loading dynamically and semi structured
2012-04-06 23:48:03 +08:00
bb2375b15e
Temp Commit
2012-04-06 19:05:11 +08:00
f65bb9b323
Merge branch 'master' into desktop_harry
...
Conflicts:
app/assets/stylesheets/style.css.erb
2012-04-06 19:02:39 +08:00
253f4bcb54
Ray's changes for orbit bar
2012-04-06 18:06:57 +08:00
e1ef2b28e7
theme changes
2012-04-06 17:49:22 +08:00
7309d9c446
Dock change and getting values from db
2012-04-06 17:49:22 +08:00
b2c9229099
route fixed.
2012-04-06 17:47:04 +08:00
3acd8a86c7
commit temp
2012-04-06 17:47:04 +08:00
cd3e04c55c
add tinyscrollbar
2012-04-06 17:47:04 +08:00
293e084bea
dock effect
2012-04-06 17:47:04 +08:00
f5c080efd4
Model commit
2012-04-06 17:47:04 +08:00
79f005c88e
new icons
2012-04-06 17:47:03 +08:00
58b51f0d17
Themes fixed…
2012-04-06 17:47:03 +08:00
ddf6a606a2
with notifications and other changes
2012-04-06 17:47:03 +08:00
6158799a47
Stupid theme
2012-04-06 17:47:03 +08:00
77b2919d8c
Desktop Commit
2012-04-06 17:47:02 +08:00
da7b415ad8
Desktop commit
2012-04-06 17:47:01 +08:00
fa441814f3
A filter UI for permission select. with Harry's JS
2012-04-06 17:46:50 +08:00
6f9363ef54
Fix bugs in upload design and missing menu
2012-04-06 17:37:45 +08:00
94816ce224
js change
2012-04-06 15:18:39 +08:00
74f083b226
details changed
...
orbitdesktop.js, orbitdesktopAPI.js update!
2012-04-06 04:42:20 +08:00
39e1bc8948
new setting page
2012-04-05 20:09:11 +08:00
ad740b0daf
Missing end tag in side_bar
2012-04-05 18:13:52 +08:00
894f8764d8
Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
...
Conflicts:
app/views/layouts/_side_bar.html.erb
2012-04-05 17:42:55 +08:00
01bda515a6
fact_check with Ray's permission check.
...
needs Ray's new css
2012-04-05 17:41:43 +08:00
ef8eb0450b
Changes in tinymce bar
2012-04-05 17:28:21 +08:00
f7997bbd85
layout adjustment
2012-04-05 15:52:15 +08:00
d45725cf3b
fix announcement & add lang tab
2012-04-05 15:23:20 +08:00
ef88c2dbc2
fact_check with Ray's permission check.
...
needs Ray's new css
2012-04-05 15:06:01 +08:00
1259d62249
Fix mainTablePosition in js -> remove the notable class
2012-04-05 14:55:41 +08:00
e0f5583f43
route fixed.
2012-04-05 13:58:58 +08:00
cedd782e7f
Sidebar fix for ad_banner
2012-04-05 13:55:03 +08:00
07dadbef70
commit temp
2012-04-05 13:54:49 +08:00
d8b20ae993
fix ad_banner sidebar
2012-04-05 11:11:48 +08:00
a7d84e8583
add tinyscrollbar
2012-04-05 02:31:32 +08:00
c4b9a9e275
dock effect
2012-04-04 05:53:49 +08:00
11d3906951
new icons
2012-04-03 18:06:16 +08:00
a9988a0d5c
Change for interface,form.
2012-04-02 11:00:51 +08:00
8f28d45379
The new AdBanner.
2012-04-02 03:04:38 +08:00
b17cd7570f
changing to new admin_layout
2012-04-02 02:58:02 +08:00
928c642840
change layout from old admin to new_admin. not complete code
2012-04-02 02:58:01 +08:00
503f71e554
Ray's changes in tags, css and js
2012-04-02 02:55:36 +08:00
6c50aa5243
Add pagination to bulletin index and remove ajax to make it simple
2012-04-02 02:55:36 +08:00
32519f308f
Fix several bus when there is no design
2012-04-02 02:41:42 +08:00
bbd2c23b3d
Themes fixed…
2012-03-30 18:06:06 +08:00
32b7d95669
Fix parser_back_end & side_bar & meta
2012-03-30 15:51:29 +08:00
aa3997f7cf
with notifications and other changes
2012-03-29 19:50:23 +08:00
176597f5af
Stupid theme
2012-03-29 15:23:48 +08:00
2e283a039d
Desktop Commit
2012-03-28 18:53:30 +08:00
4798cd43c1
Desktop commit
2012-03-28 18:53:06 +08:00
d6e4da6dad
Ray's fix for margin-top
2012-03-28 11:31:07 +08:00
cf297fc424
Changed inherited controller in module_apps to OrbitBackendController
2012-03-27 18:58:04 +08:00
d02bbdbaa5
Nokogiri in parsers
2012-03-27 18:58:04 +08:00
55d12e50f2
Ray's changes in announcenment back-end
2012-03-27 18:58:03 +08:00
3ba89ecbcf
Fact check program completed,Lin checked
2012-03-27 18:54:03 +08:00
f5fd3dec7a
Trying nokogiri
2012-03-27 18:42:22 +08:00
f9c5ee5d18
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
app/assets/javascripts/bulletin_form.js.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
vendor/built_in_modules/announcement/config/routes.rb
2012-03-27 18:37:14 +08:00
e8d1352890
fix announcement
2012-03-27 14:29:11 +08:00
a30bc499c7
fix announcement & links
2012-03-27 14:19:58 +08:00
42519d9f78
fix announcement & links
2012-03-23 18:04:11 +08:00
61698f3f2c
Remove quick_edit on bulletin index load
2012-03-23 17:32:59 +08:00
a126935d2c
Clean the parsers and introduce the metas
2012-03-21 18:30:12 +08:00
472744fc87
Changes for IE9 with html5
2012-03-21 15:51:55 +08:00
2c6208db3c
Merge branch 'master' into ldap
2012-03-21 12:44:22 +08:00
3aa7c5120d
Put tinymce in its own js file.
...
To use on a text area just add the class "tinymce_textarea".
2012-03-21 12:41:32 +08:00
a1034f90ba
close alpha on nccu
2012-03-20 14:38:01 +08:00
5fcd3cd783
Merge branch 'master' into ldap
2012-03-20 14:27:04 +08:00
e953344965
Fix before_filter order for object_auth
2012-03-20 14:17:28 +08:00
49ece7be6a
Merge branch 'master' into ldap
2012-03-19 15:50:53 +08:00
7cc075e124
Change the monkey picture
2012-03-19 15:49:40 +08:00
47215693c4
Merge branch 'master' into ldap
...
Conflicts:
Gemfile
Gemfile.lock
config/application.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
2012-03-19 14:27:15 +08:00
a755eb184b
fix announcement links & files
2012-03-16 16:49:25 +08:00
7d553acaec
fix announcement link & files
2012-03-16 15:53:57 +08:00
07edf44643
Merge branches 'design_team' and 'design_team' of github.com:Rulingcom/orbit into design_team
2012-03-16 15:13:06 +08:00
29ec36130e
css and js changes
2012-03-16 15:06:45 +08:00
f4fda08e86
Replace PrototypeR4 by Orbit.
...
Move session into mongoid_store.
Reset session when sing_in.
2012-03-16 14:58:32 +08:00
785ead5209
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
app/views/layouts/_side_bar.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
2012-03-16 14:55:21 +08:00
6f6e84b015
fix dashboard & announcement
2012-03-16 14:44:57 +08:00
b6d49df145
Change Obit to Orbit
2012-03-16 11:54:31 +08:00
13b6892f87
code for new fact check
2012-03-16 11:09:44 +08:00
00ab773942
fix dashboard & announcement
2012-03-14 20:05:03 +08:00
4dd9b7ffa4
Fix announcement pagination in front-end
2012-03-07 18:16:59 +08:00
0b1f83c042
Fix extra loaded js: the widgets only need to render layout when they need js.
2012-03-07 18:16:59 +08:00
d5a2de5476
LDAP with sync rake task
2012-03-06 16:41:06 +08:00
7f05f21930
Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap
...
Conflicts:
config/environments/development.rb
2012-03-01 10:13:49 +08:00
cceb785a8d
change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action.
2012-02-29 18:58:33 +08:00
8932615f05
add "all_user" for app&object auth
2012-02-29 18:56:42 +08:00
2e58c63ff7
fix bugs with token
2012-02-29 18:56:42 +08:00
cc550c5745
First version for App and Object auth.Taking Announcement as experiment
2012-02-29 18:55:55 +08:00
3bcd7ea349
Exp with object_auth
2012-02-29 18:50:23 +08:00
6b2aeadde6
Changes for nccu
2012-02-29 16:01:50 +08:00
9a40ecd1d9
Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine
...
Conflicts:
app/views/devise/passwords/new.html.erb
app/views/devise/sessions/new.html.erb
2012-02-29 13:07:21 +08:00
5223a7a3e9
Css and js changes
2012-02-29 12:45:47 +08:00
b84b7bad63
ldap config for 0229 nccu demo
2012-02-29 12:35:54 +08:00
ccb61fc2dd
change Search bar
2012-02-29 11:29:13 +08:00
0fa5c3ba9d
Fix bug in orbit-bar
2012-02-29 04:56:52 +08:00
344ec86c57
Remove class 'error' in devise forms
2012-02-29 04:56:32 +08:00
4b7b57bb3d
Add some missing translations
2012-02-29 04:48:21 +08:00
9aa4173933
Change orbit-bar for language but bug when user name is too long
2012-02-29 04:21:56 +08:00
18617850e5
Add categories for all the widgets
2012-02-28 22:00:05 +08:00
6a30b0a1e4
Add RSS event
2012-02-28 18:29:13 +08:00
fdf4cfad2d
Add category for announcement widget
2012-02-28 14:08:57 +08:00
7f9a7edc98
Changes in bulletins widget and front-end, add categories to link
2012-02-28 04:24:09 +08:00
f13ebc6c46
Fix bugs and changes for nccu
2012-02-27 18:50:56 +08:00
3209f9aa27
Complete for 229 check.
2012-02-24 19:07:47 +08:00
dcc64a20d2
Finish sorting for announcements
2012-02-24 15:30:49 +08:00
8f531a6fe5
Fix bus for pages and page content
2012-02-24 15:14:23 +08:00
f8d1d7242d
Merge branch 'design_team' into dashboard
2012-02-23 16:05:33 +08:00
1a6e497b3d
Ika's changes
2012-02-23 15:53:15 +08:00
63d7810b35
Add isotope, categories for announcement page, sort for announcement
2012-02-23 15:52:58 +08:00
53ed4b0404
Initial changes in announcement for sorting and filtering
2012-02-23 15:51:33 +08:00
22d9741ac8
Fix for orbit_bar
2012-02-23 15:51:33 +08:00
ba4d71a026
Changes in orbit_bar and js in announcements
2012-02-23 15:51:33 +08:00
678f1eabef
LDAP connection and modified Devise
2012-02-22 14:43:24 +08:00
9b001aa6c3
new page_content app
2012-02-21 19:22:42 +08:00
1146506063
Fix bug when no bulletins or web_links
2012-02-20 15:56:17 +08:00
c304819d6b
Commented out code for Windows
2012-02-20 08:55:21 +08:00
cf038183b9
Ika's changes in modules
2012-02-20 08:48:27 +08:00
a3f152b200
Changes for jquery 1.7 (.live -> .on), create module_layout
2012-02-20 03:24:05 +08:00
3ff2e7867e
Fix bug when editing home
2012-02-20 03:22:53 +08:00
44a346ffe9
Changes for orbit bar, login
2012-02-19 16:33:22 +08:00
0b71714d44
Improve code in items, pages, links
2012-02-17 14:54:11 +08:00
cf4a6c0b35
Remove useless destroy methods
2012-02-17 12:26:03 +08:00
9cd3cbc478
Modifications for design, pages, page_parts…
...
Move orbit_bar out of kernel.js
2012-02-17 02:09:32 +08:00
4389f0cf28
Add new created files to previous commit
2012-02-16 13:09:09 +08:00
e0accbecaa
Changes into page_part edition.
...
Can choose between 'text', 'public_r_tag' and 'widget'
2012-02-16 13:09:09 +08:00
edf236c1c7
edit tags
2012-02-15 15:38:27 +08:00
af3a2547e1
Change ModuleAppTag into "Module name"Tag.
2012-02-15 15:18:11 +08:00
d0c2856a3a
Fix relations error in tags
2012-02-15 11:42:19 +08:00
778a85ca2b
add tags
2012-02-15 10:37:07 +08:00
1913f0aca8
Add tinymce
2012-02-15 10:02:05 +08:00
3e70634add
Announcement modifications and tags
2012-02-15 00:34:22 +08:00
f57e9f19f7
Changes for multiple i18n_variable in bulletin
2012-02-15 00:34:22 +08:00
1f7dae9bee
Gemfile and bugs in js for orbit-bar
2012-02-15 00:34:22 +08:00
55ae7de01c
Orbit-bar in front-end and back-end, side-bar and drop-down menu
2012-02-15 00:34:22 +08:00
dcc6a53430
brief starting for dashboard,adds i18n vars
2012-02-15 00:34:21 +08:00
436f039c1b
build interface to work with object auth. Go to panel/new_blog/back_end/posts/ ,click New Auth link
2012-02-15 00:34:21 +08:00
e20739e32b
Object Auth. Now object can be included with "include OrbitCoreLib::ObjectAuthable" to use kernel method,such as
...
1.Object.authed_for_user(user,title_of_object_auth). title_of_object_auth is optional
2.object.authed_users(user,title_of_object_auth) . title_of_object_auth is optional
if title_of_object_auth is not given,then it will return calculation across all possiblity.
2012-02-15 00:34:21 +08:00
3ed9b81df9
first commit for object auth,will take new_blog for experiment
2012-02-15 00:34:21 +08:00
964d7b6054
announcement path error
2012-02-13 17:09:37 +08:00
872a00b6a2
Forgot to change title in key in pages_controller
2012-02-06 22:09:33 +08:00
f097f83f2b
announcement_category edit
2012-02-06 16:20:51 +08:00
8b3b71ca58
fix js bugs,partial bugs
2012-02-06 16:17:07 +08:00
394099c388
Ad banner close complete,need validation
2012-02-04 09:37:23 +08:00
68cea1ea49
AdBanner is now working
2012-02-04 09:37:23 +08:00
f530eb7112
Revert "mistake commit"
...
This reverts commit 2608b72d65
2012-02-03 14:39:15 +08:00
2608b72d65
mistake commit
2012-02-03 14:28:08 +08:00
a980847eb3
Basic function for AdBanner
2012-02-01 14:27:51 +08:00
ccbde122df
Fix bugs in design.
...
The static js were loaded after the page js.
parser_back_end.rb wasn't changed for the new routes.
The themes weren't parsed and saved correctly.
2012-01-31 16:38:25 +08:00
4906894fb5
Page edit wasn't showing when module_app was nil
2012-01-31 16:35:40 +08:00
762c2f5e8a
Add key in module_app.rb to use instead of title for authorization
2012-01-30 18:12:18 +08:00
46db173e0b
Modifications in the Design code: the uploader works but the edit is broken
2012-01-26 12:05:25 +08:00
783eae4597
Change "NewBlog" folders into "new_blog" in assets
...
Modify routes and pages handling for clean front-end urls
2012-01-24 18:16:58 +08:00
6a196c5d3d
Embedded to referenced for users
2012-01-24 15:12:06 +08:00
83827f82ec
Fix custom image class
2012-01-24 15:11:42 +08:00
afbb9e266a
User role and sub_role simple interface complete
2012-01-24 12:28:33 +08:00
959f3e8b2f
put setup APP var setup into Orbit class
2012-01-24 12:28:32 +08:00
4ed8a2164c
First complete with manager and submanager
2012-01-24 12:28:32 +08:00
4df8ab6cc3
Add methods to work with manager role,add task to build user test data
2012-01-24 12:28:32 +08:00
18a82d7f47
Manger and SubManager
2012-01-24 12:28:32 +08:00
9fcf8280fa
Change "_filename" to "_identifier" for carrierwave
2012-01-24 11:57:27 +08:00
5518ae362d
Ray's modification before redesign
2012-01-24 11:57:27 +08:00
bfd55277d7
Embed attribute_fields and sub_roles
2012-01-24 11:57:27 +08:00
1bbb197fba
Forgot to remove ":remote => true" for asset new
2012-01-24 11:56:08 +08:00
b04d845a5a
New rss.js from Harry and fix html form for assets
2012-01-24 11:56:08 +08:00
4cfae9c107
announcement widget query
2012-01-18 21:34:26 +08:00
3e912b6262
Merge branches 'master' and 'exception_notification' into new_announcement_dev
2012-01-16 07:57:40 +08:00
4be97f6ea6
Merge branch 'fix_it'
...
Conflicts:
app/assets/javascripts/page_edit.js
app/assets/javascripts/rss.js
app/assets/stylesheets/admin.css.erb
app/assets/stylesheets/admin_back_end.css.erb
app/controllers/admin/app_auths_controller.rb
app/controllers/admin/module_apps_controller.rb
app/controllers/admin/users_controller.rb
app/controllers/application_controller.rb
app/models/app_auth.rb
app/models/user/user.rb
app/views/admin/app_auths/index.html.erb
app/views/admin/attributes/_attribute_field.html.erb
app/views/admin/designs/_new.html.erb
app/views/admin/designs/new.html.erb
app/views/admin/infos/_form.html.erb
app/views/admin/module_apps/_app_selector.html.erb
app/views/admin/module_apps/index.html.erb
app/views/admin/pages/_form.html.erb
app/views/admin/roles/_form.html.erb
app/views/admin/roles/_sub_role.html.erb
app/views/admin/users/_form.html.erb
app/views/admin/users/_show_sub_role.html.erb
app/views/admin/users/_sub_role.html.erb
app/views/admin/users/edit.html.erb
app/views/admin/users/index.html.erb
app/views/admin/users/new.html.erb
app/views/admin/users/show.html.erb
app/views/layouts/admin.html.erb
lib/fraisier/layout.html
lib/parsers/parser_back_end.rb
lib/parsers/parser_layout.rb
lib/tasks/dev.rake
spec/models/app_auth_basic.rb
vendor/built_in_modules/NewBlog/.gitignore
vendor/built_in_modules/NewBlog/Gemfile
vendor/built_in_modules/NewBlog/Gemfile.lock
vendor/built_in_modules/NewBlog/MIT-LICENSE
vendor/built_in_modules/NewBlog/NewBlog.gemspec
vendor/built_in_modules/NewBlog/README.rdoc
vendor/built_in_modules/NewBlog/Rakefile
vendor/built_in_modules/NewBlog/app/assets/images/NewBlog/.gitkeep
vendor/built_in_modules/NewBlog/app/assets/javascripts/NewBlog/.gitkeep
vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/.gitkeep
vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/application.css
vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/production.css
vendor/built_in_modules/NewBlog/app/controllers/.gitkeep
vendor/built_in_modules/NewBlog/app/controllers/application_controller.rb
vendor/built_in_modules/NewBlog/app/controllers/panel/blog/back_end/posts_controller.rb
vendor/built_in_modules/NewBlog/app/helpers/.gitkeep
vendor/built_in_modules/NewBlog/app/helpers/application_helper.rb
vendor/built_in_modules/NewBlog/app/mailers/.gitkeep
vendor/built_in_modules/NewBlog/app/models/.gitkeep
vendor/built_in_modules/NewBlog/app/models/comment.rb
vendor/built_in_modules/NewBlog/app/models/post.rb
vendor/built_in_modules/NewBlog/app/views/.gitkeep
vendor/built_in_modules/NewBlog/app/views/layouts/application.html.erb
vendor/built_in_modules/NewBlog/app/views/layouts/edit_view.html.erb
vendor/built_in_modules/NewBlog/app/views/layouts/production.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/_form.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/index.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/latest_post.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/new.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/show.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/front_end/posts/show.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/widget/posts/index.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/widget/posts/latest_post.html.erb
vendor/built_in_modules/NewBlog/config/locales/en.yml
vendor/built_in_modules/NewBlog/lib/NewBlog.rb
vendor/built_in_modules/NewBlog/lib/NewBlog/engine.rb
vendor/built_in_modules/NewBlog/lib/NewBlog/version.rb
vendor/built_in_modules/NewBlog/lib/tasks/NewBlog_tasks.rake
vendor/built_in_modules/NewBlog/script/rails
vendor/built_in_modules/NewBlog/test/NewBlog_test.rb
vendor/built_in_modules/NewBlog/test/dummy/Rakefile
vendor/built_in_modules/NewBlog/test/dummy/app/assets/javascripts/application.js
vendor/built_in_modules/NewBlog/test/dummy/app/assets/stylesheets/application.css
vendor/built_in_modules/NewBlog/test/dummy/app/controllers/application_controller.rb
vendor/built_in_modules/NewBlog/test/dummy/app/helpers/application_helper.rb
vendor/built_in_modules/NewBlog/test/dummy/app/mailers/.gitkeep
vendor/built_in_modules/NewBlog/test/dummy/app/models/.gitkeep
vendor/built_in_modules/NewBlog/test/dummy/app/views/layouts/application.html.erb
vendor/built_in_modules/NewBlog/test/dummy/config.ru
vendor/built_in_modules/NewBlog/test/dummy/config/application.rb
vendor/built_in_modules/NewBlog/test/dummy/config/boot.rb
vendor/built_in_modules/NewBlog/test/dummy/config/database.yml
vendor/built_in_modules/NewBlog/test/dummy/config/environment.rb
vendor/built_in_modules/NewBlog/test/dummy/config/environments/development.rb
vendor/built_in_modules/NewBlog/test/dummy/config/environments/production.rb
vendor/built_in_modules/NewBlog/test/dummy/config/environments/test.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/backtrace_silencers.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/inflections.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/mime_types.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/secret_token.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/session_store.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/wrap_parameters.rb
vendor/built_in_modules/NewBlog/test/dummy/config/locales/en.yml
vendor/built_in_modules/NewBlog/test/dummy/config/mongoid.yml
vendor/built_in_modules/NewBlog/test/dummy/config/routes.rb
vendor/built_in_modules/NewBlog/test/dummy/lib/assets/.gitkeep
vendor/built_in_modules/NewBlog/test/dummy/log/.gitkeep
vendor/built_in_modules/NewBlog/test/dummy/public/404.html
vendor/built_in_modules/NewBlog/test/dummy/public/422.html
vendor/built_in_modules/NewBlog/test/dummy/public/500.html
vendor/built_in_modules/NewBlog/test/dummy/public/favicon.ico
vendor/built_in_modules/NewBlog/test/dummy/script/rails
vendor/built_in_modules/NewBlog/test/integration/navigation_test.rb
vendor/built_in_modules/NewBlog/test/test_helper.rb
vendor/built_in_modules/blog/app/controllers/application_controller.rb
vendor/built_in_modules/blog/app/controllers/panel/blog/posts_controller.rb
vendor/built_in_modules/blog/app/helpers/application_helper.rb
vendor/built_in_modules/blog/app/models/comment.rb
vendor/built_in_modules/blog/app/models/post.rb
vendor/built_in_modules/blog/app/views/layouts/application.html.erb
vendor/built_in_modules/blog/app/views/panel/blog/posts/_form.html.erb
vendor/built_in_modules/blog/app/views/panel/blog/posts/index.html.erb
vendor/built_in_modules/blog/app/views/panel/blog/posts/show.html.erb
vendor/built_in_modules/blog/config/initializers/backtrace_silencers.rb
vendor/built_in_modules/blog/config/initializers/inflections.rb
vendor/built_in_modules/blog/config/initializers/mime_types.rb
vendor/built_in_modules/blog/public/404.html
vendor/built_in_modules/blog/public/422.html
vendor/built_in_modules/blog/public/500.html
vendor/built_in_modules/blog/public/favicon.ico
vendor/built_in_modules/blog/public/stylesheets/.gitkeep
vendor/built_in_modules/blog/script/rails
vendor/built_in_modules/blog/vendor/plugins/.gitkeep
vendor/built_in_modules/new_blog/.gitignore
vendor/built_in_modules/new_blog/Gemfile
vendor/built_in_modules/new_blog/Gemfile.lock
vendor/built_in_modules/new_blog/MIT-LICENSE
vendor/built_in_modules/new_blog/README.rdoc
vendor/built_in_modules/new_blog/Rakefile
vendor/built_in_modules/new_blog/app/assets/images/NewBlog/.gitkeep
vendor/built_in_modules/new_blog/app/assets/javascripts/NewBlog/.gitkeep
vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/.gitkeep
vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/application.css
vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/production.css
vendor/built_in_modules/new_blog/app/controllers/.gitkeep
vendor/built_in_modules/new_blog/app/controllers/application_controller.rb
vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/back_end/posts_controller.rb
vendor/built_in_modules/new_blog/app/helpers/.gitkeep
vendor/built_in_modules/new_blog/app/mailers/.gitkeep
vendor/built_in_modules/new_blog/app/models/.gitkeep
vendor/built_in_modules/new_blog/app/models/comment.rb
vendor/built_in_modules/new_blog/app/models/post.rb
vendor/built_in_modules/new_blog/app/views/.gitkeep
vendor/built_in_modules/new_blog/app/views/layouts/application.html.erb
vendor/built_in_modules/new_blog/app/views/layouts/edit_view.html.erb
vendor/built_in_modules/new_blog/app/views/layouts/production.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/_form.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/index.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/latest_post.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/new.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/show.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/show.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/index.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/latest_post.html.erb
vendor/built_in_modules/new_blog/config/locales/en.yml
vendor/built_in_modules/new_blog/lib/new_blog/version.rb
vendor/built_in_modules/new_blog/lib/tasks/NewBlog_tasks.rake
vendor/built_in_modules/new_blog/new_blog.gemspec
vendor/built_in_modules/new_blog/script/rails
vendor/built_in_modules/new_blog/test/NewBlog_test.rb
vendor/built_in_modules/new_blog/test/dummy/Rakefile
vendor/built_in_modules/new_blog/test/dummy/app/assets/javascripts/application.js
vendor/built_in_modules/new_blog/test/dummy/app/assets/stylesheets/application.css
vendor/built_in_modules/new_blog/test/dummy/app/controllers/application_controller.rb
vendor/built_in_modules/new_blog/test/dummy/app/helpers/application_helper.rb
vendor/built_in_modules/new_blog/test/dummy/app/mailers/.gitkeep
vendor/built_in_modules/new_blog/test/dummy/app/models/.gitkeep
vendor/built_in_modules/new_blog/test/dummy/app/views/layouts/application.html.erb
vendor/built_in_modules/new_blog/test/dummy/config.ru
vendor/built_in_modules/new_blog/test/dummy/config/application.rb
vendor/built_in_modules/new_blog/test/dummy/config/boot.rb
vendor/built_in_modules/new_blog/test/dummy/config/database.yml
vendor/built_in_modules/new_blog/test/dummy/config/environment.rb
vendor/built_in_modules/new_blog/test/dummy/config/environments/development.rb
vendor/built_in_modules/new_blog/test/dummy/config/environments/production.rb
vendor/built_in_modules/new_blog/test/dummy/config/environments/test.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/backtrace_silencers.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/inflections.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/mime_types.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/secret_token.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/session_store.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/wrap_parameters.rb
vendor/built_in_modules/new_blog/test/dummy/config/locales/en.yml
vendor/built_in_modules/new_blog/test/dummy/config/mongoid.yml
vendor/built_in_modules/new_blog/test/dummy/config/routes.rb
vendor/built_in_modules/new_blog/test/dummy/lib/assets/.gitkeep
vendor/built_in_modules/new_blog/test/dummy/log/.gitkeep
vendor/built_in_modules/new_blog/test/dummy/public/404.html
vendor/built_in_modules/new_blog/test/dummy/public/422.html
vendor/built_in_modules/new_blog/test/dummy/public/500.html
vendor/built_in_modules/new_blog/test/dummy/public/favicon.ico
vendor/built_in_modules/new_blog/test/dummy/script/rails
vendor/built_in_modules/new_blog/test/integration/navigation_test.rb
vendor/built_in_modules/new_blog/test/test_helper.rb
vendor/plugins/NewBlog/.gitignore
vendor/plugins/NewBlog/Gemfile
vendor/plugins/NewBlog/Gemfile.lock
vendor/plugins/NewBlog/MIT-LICENSE
vendor/plugins/NewBlog/NewBlog.gemspec
vendor/plugins/NewBlog/README.rdoc
vendor/plugins/NewBlog/Rakefile
vendor/plugins/NewBlog/app/assets/images/NewBlog/.gitkeep
vendor/plugins/NewBlog/app/assets/javascripts/NewBlog/.gitkeep
vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/.gitkeep
vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/application.css
vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/production.css
vendor/plugins/NewBlog/app/controllers/.gitkeep
vendor/plugins/NewBlog/app/helpers/.gitkeep
vendor/plugins/NewBlog/app/mailers/.gitkeep
vendor/plugins/NewBlog/app/models/.gitkeep
vendor/plugins/NewBlog/app/views/.gitkeep
vendor/plugins/NewBlog/app/views/layouts/edit_view.html.erb
vendor/plugins/NewBlog/app/views/layouts/production.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/index.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/latest_post.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/new.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/show.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_index.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_latest_post.html.erb
vendor/plugins/NewBlog/config/locales/en.yml
vendor/plugins/NewBlog/lib/NewBlog/version.rb
vendor/plugins/NewBlog/lib/tasks/NewBlog_tasks.rake
vendor/plugins/NewBlog/script/rails
vendor/plugins/NewBlog/test/NewBlog_test.rb
vendor/plugins/NewBlog/test/dummy/Rakefile
vendor/plugins/NewBlog/test/dummy/app/assets/javascripts/application.js
vendor/plugins/NewBlog/test/dummy/app/assets/stylesheets/application.css
vendor/plugins/NewBlog/test/dummy/app/controllers/application_controller.rb
vendor/plugins/NewBlog/test/dummy/app/mailers/.gitkeep
vendor/plugins/NewBlog/test/dummy/app/models/.gitkeep
vendor/plugins/NewBlog/test/dummy/app/views/layouts/application.html.erb
vendor/plugins/NewBlog/test/dummy/config.ru
vendor/plugins/NewBlog/test/dummy/config/application.rb
vendor/plugins/NewBlog/test/dummy/config/boot.rb
vendor/plugins/NewBlog/test/dummy/config/database.yml
vendor/plugins/NewBlog/test/dummy/config/environment.rb
vendor/plugins/NewBlog/test/dummy/config/environments/development.rb
vendor/plugins/NewBlog/test/dummy/config/environments/production.rb
vendor/plugins/NewBlog/test/dummy/config/environments/test.rb
vendor/plugins/NewBlog/test/dummy/config/initializers/secret_token.rb
vendor/plugins/NewBlog/test/dummy/config/initializers/session_store.rb
vendor/plugins/NewBlog/test/dummy/config/initializers/wrap_parameters.rb
vendor/plugins/NewBlog/test/dummy/config/locales/en.yml
vendor/plugins/NewBlog/test/dummy/config/mongoid.yml
vendor/plugins/NewBlog/test/dummy/config/routes.rb
vendor/plugins/NewBlog/test/integration/navigation_test.rb
vendor/plugins/NewBlog/test/test_helper.rb
2012-01-12 18:15:43 +08:00
c0efb5d1bc
Listing for Module-apps
2012-01-12 14:13:41 +08:00
ec235bcaa3
merge with master
2012-01-11 20:31:52 +08:00
cae3daa9c4
Change NewBlog to new_blog
2012-01-10 18:29:11 +08:00
79f778ad8c
creating for disabling widgets and frontend
2012-01-05 16:21:33 +08:00
7b40706aed
fixing for app_auth
2012-01-05 16:20:51 +08:00
7ebfe3a7f9
Add missing id in site_editor.html.erb and comment out in parser_back_end.rb because of a loading bug
2011-12-29 18:08:08 +08:00
d85f29e65c
Fix missing modification for "panel_main" to "back_main"
2011-12-29 17:49:48 +08:00
c1238a7043
Prefix ids with "back_" in back-end layout to avoid conflict with site's ids
2011-12-29 15:35:13 +08:00
ea19f11fe2
Integrate Harry's modifications to reload pop-up content
2011-12-29 14:09:06 +08:00
b002c411ce
Merge branch 'design_team'
2011-12-28 21:03:35 +08:00
75c9851dbc
Ray's back-end modifications for sub-roles
2011-12-28 20:57:18 +08:00
090493fd51
Re-commit
2011-12-28 20:51:52 +08:00
245def9cb6
Integration of pop-up and generic js.erb
2011-12-28 20:49:53 +08:00
62aaf79491
Merge with sub_roles
2011-12-23 18:34:21 +08:00
fc591ee308
Ray's back_end modification before sub_roles
2011-12-23 18:02:45 +08:00
d3ca1647be
fix page form bugs
2011-12-23 13:54:28 +08:00
a9f06b9517
Divide parser into sub-parsers
2011-12-22 16:23:48 +08:00
d465febca7
merge with november_presentation
2011-12-22 15:43:38 +08:00
e7c9816139
Move NewBlog to built_in_modules and delete "vendor/templates"
2011-12-22 01:38:27 +08:00
a09f8e4551
merge with november_presentation
2011-12-20 16:47:17 +08:00
afbffe37d5
Users can now be saved with sub_roles
2011-12-20 14:35:28 +08:00
4108ebf06d
Fix mongoid deeply nested polimorphic
...
Got the commit from github. The roles and sub_roles save.
2011-12-19 21:22:26 +08:00
d27d7a623c
Changes for sub_roles
...
Issues: update doesn't create new i18n_variables, role form has bugs
2011-12-18 10:07:42 +08:00
d23cf152da
Merge 'standardization' and 'role structure modification'
2011-12-10 18:21:59 +08:00
b7ac5478b4
Change role structure
...
Still needs to: change the views and create sub_roles in the dev.rake
2011-12-10 18:12:39 +08:00
f774084e9a
Back-end standardization
2011-12-10 18:03:32 +08:00
e0cdedfa2e
Remove useless controller and view
...
user_attributes_controller and user_attributes views
2011-12-06 18:12:12 +08:00
b77282c643
Test redmine service-hook
2011-12-05 19:28:06 +08:00
69a8fce64a
Fix double loading bug
...
On an html load, the page was reload by the js "popstate"
2011-12-05 11:22:32 +08:00
26b49dcf02
Remove js from html
2011-12-05 10:36:25 +08:00
962bf03af2
Remove snippet
2011-12-05 10:27:22 +08:00
f3f405c1b4
Remove useless files in items
2011-12-05 09:56:26 +08:00
75a3c4d5b1
Modify assets
...
Each layout has a manifest for css and js
2011-12-05 09:54:41 +08:00
a0ec38ca99
Merge with branch november_presentation
2011-12-01 13:50:49 +08:00
b68f5e11e5
Final modifications for the presentation
2011-11-22 18:54:10 +08:00
66bc0ce560
Modified dev.rake
2011-11-20 03:16:35 +08:00
a03e9bada8
Add missing translations
2011-11-20 02:14:51 +08:00
ad9f9bbf5c
Final Ray's modifications
2011-11-19 21:47:18 +08:00
dac6348402
Integration of module_app workflow
2011-11-19 14:33:26 +08:00
65349796d0
Ray's modifications
2011-11-18 16:43:14 +08:00
861237d65b
Integration of Ray' modifications
2011-11-17 20:02:58 +08:00
c4810274ec
Rescue nil values for attribute_values in User
2011-11-16 18:41:09 +08:00
bcf487f264
Merge branch 'november_presentation' of github.com:Rulingcom/orbit into november_presentation
2011-11-16 18:37:29 +08:00
0556dc9297
ika's modification to the backend
2011-11-16 18:34:54 +08:00
5c3ae104f0
Add log info for asking restart after app module installed
2011-11-16 17:01:44 +08:00
84ebc8306b
APP zip package placed in lib now can be unzip into vendor
...
APP zip package placed in lib now can be unzip into vendor,however
server can not restart
2011-11-16 15:21:31 +08:00
c1d77fa6d6
Changes for purchases - handle different type of purchases
2011-11-14 10:22:31 +08:00
d9d7099da6
Fix bug: users can now be saved
2011-11-12 17:54:45 +08:00
cb07a35cc9
Revert ff82391b7d0d17c17568ed21176b8b0112a34e31^..HEAD
2011-10-20 10:06:06 +08:00
ff82391b7d
Revert "Merge with new_blog"
...
This reverts commit 64c68fcdeb
2011-10-20 10:01:39 +08:00
64c68fcdeb
Merge with new_blog
2011-10-18 11:36:01 +08:00
2e86d8081f
Modifications for images in html code
2011-10-18 11:21:24 +08:00
0ca354cfd0
Clean code and new image uploader
2011-09-14 15:11:50 +08:00
f2e3cb00db
Fix bug when editing a page, the theme wasn't including blank
2011-09-13 14:03:03 +08:00
4db88282a1
Modification in Design structure_css -> default_css
2011-09-13 11:57:20 +08:00
07ccacb7d7
Modifications of the JS in Design
2011-09-09 15:40:13 +08:00
77b8fcdd1d
Fix previous workaround for the uploaded Design
2011-09-09 13:44:43 +08:00
a571d1dcff
Clean code and workaround mongoid embedded with carrierwave
2011-09-08 18:12:04 +08:00
a1391493a3
Revert change in layout/admin.html.erb
2011-09-07 14:03:53 +08:00
0956e9784a
Fix bug in layout, parser and change lib/fraisier
2011-09-07 11:53:16 +08:00
22c9ca4c74
Handle "reset.css" and add link in the generated menu
2011-09-05 16:06:17 +08:00
151f005815
structure.css -> default.css
...
Themes are optional, a theme overrides style in default.css
2011-09-05 15:18:36 +08:00
f4b1d1e182
Modifications in Layout
...
In the layout file we can have "contents" (for editable content) and
"layout_parts" (for when the layout is created from scratch)
2011-09-05 01:14:49 +08:00
b2c0047d0f
Modification in parse_urls in both layout.rb and theme.rb
2011-09-02 19:19:34 +08:00
25355e9c7f
Force encoding and stip filename in Theme::parse_urls
2011-09-01 19:14:34 +08:00
9101a2921e
Modifications for image urls
...
Find and replace the urls by the file urls in DB, in the theme files and
layout.html file. Save a copy of those files under "file_orig".
2011-09-01 19:08:45 +08:00
f78400c274
Clean code
...
Moved the unzip_design method as protected
2011-09-01 19:06:49 +08:00
492f691469
Modifications for menu in Design
2011-09-01 09:12:49 +08:00
294e06d630
Change "RulingSite" into "Orbit"
2011-08-25 17:59:49 +08:00
983c86e653
Merge branch 'rails_3_1' of github.com:Rulingcom/orbit into rails_3_1
2011-08-25 16:04:47 +08:00
8b576cac48
Fix bug when selecting theme
2011-08-25 15:44:52 +08:00
230842d26a
Ika fix bug
2011-08-25 15:44:51 +08:00
32849f1d1b
Set default design to first design
2011-08-25 15:08:42 +08:00
c248b729db
CSS problem for page
2011-08-25 15:08:23 +08:00
f898a29fdf
Add site link in menu
2011-08-25 08:56:01 +08:00
2afe961416
Modify check if site is up-to-date
2011-08-25 08:30:18 +08:00
4540f23a3f
Merge branch 'rails_3_1' of github.com:Rulingcom/orbit into rails_3_1
2011-08-25 08:18:22 +08:00
c427e2af14
Page form with drop down. Modifications for Designs
2011-08-25 08:13:38 +08:00
c678545160
Merge branch 'rails_3_1' of github.com:Rulingcom/orbit into rails_3_1
2011-08-25 08:08:09 +08:00
4cd9854706
Ika's changes
2011-08-25 08:07:18 +08:00
27d47215e9
Modify edit page. Still need to handle "form" with drop down lists
2011-08-24 02:34:24 +08:00
1d214bedec
Revert "Revert "Clean code and add 'name' in theme.rb""
...
This reverts commit 00813c9060
2011-08-24 02:06:27 +08:00
00813c9060
Revert "Clean code and add 'name' in theme.rb"
...
This reverts commit 608180646b
2011-08-24 02:04:54 +08:00
608180646b
Clean code and add 'name' in theme.rb
2011-08-24 01:39:28 +08:00
118455aa81
Check if site is up-to-date
2011-08-23 19:40:49 +08:00
e0e14ddfac
Modify purchases list
2011-08-23 16:33:01 +08:00
09cdb9a852
CSS modifications for design team
2011-08-23 15:59:07 +08:00
2842001a3b
Update source: pull from git
2011-08-23 15:01:22 +08:00
4f38074932
content.css -> content.css.erb
2011-08-23 10:05:16 +08:00
2cdb5a756d
Set store_ip in config.yml
2011-08-22 14:01:51 +08:00
7a4ad240a8
Clean code for layout and modifications in dev.rake
2011-08-22 13:45:21 +08:00
e74f2931b1
Modifications asset pipeline
2011-08-20 22:54:07 +08:00
20afb23a5f
Embed layout_parts in layout and correct typo
2011-08-18 16:27:04 +08:00
86443661e9
Merge server and rails_3_1
2011-08-18 13:43:33 +08:00
d2c2e174ac
uploading is ok,checking parsing result is needed
2011-08-16 17:10:16 +08:00
d75dd4f936
completing the code with segment fault
2011-08-16 12:14:01 +08:00
8895b9fe20
automate get files with anyname
2011-08-15 18:47:02 +08:00
16001fb2c9
fix segment fault
2011-08-12 18:11:51 +08:00
f6ae58cef4
Trying to create Design from upload package
2011-08-12 17:47:03 +08:00
e0811c14db
adding upload package for design. bugs in
2011-08-11 18:20:16 +08:00
34d0b8fac1
complete new parser for layout_part
2011-08-10 17:28:10 +08:00
278938a52d
Fixed: layout.file is saved when the design is created
2011-08-08 17:51:37 +08:00
9cea77430f
dealing with layout file bug
2011-08-08 17:23:20 +08:00
37633ac23d
put layout object as embeded obj in design. have bug with solving uploading file
2011-08-08 12:29:32 +08:00
706ec745c3
modified V,C,M related with layout and have bug between layout and design
2011-08-08 09:30:44 +08:00
c8d58e30aa
make design work with layout and testing with package andreas05 within r tag
2011-08-01 18:17:28 +08:00
b6db304579
add nokogiri into Gemfile and fixing dup bug again...
2011-07-29 17:49:10 +08:00
c9e4d0f345
in design,after online editing,return json url,callback not finish
2011-07-28 18:54:31 +08:00
1839269581
finishing saving edited file online and redo dev.rake modification
2011-07-28 18:08:16 +08:00
9eb80d7424
Made r_editor into class style add functions
2011-07-27 17:23:01 +08:00
dabd6dd5b5
Fixing upload bug
2011-07-26 18:22:17 +08:00
1ac10e70a2
redo lost code....
2011-07-22 16:28:41 +08:00
a272b871e2
complete del and destroy funciton for desgin
2011-07-22 15:54:38 +08:00
6903dc3037
adding modified design.rb for sloving dup prob
2011-07-22 11:10:14 +08:00
9898bd9df7
Modification in JS to upload more than 2 files
2011-07-21 11:22:31 +08:00
Christophe Vilayphiou
Matthew K. Fu JuYuan
Harry Bomrah
devin
Christophe Vilayphiou
unknown
Matt
nccu
unknown
Matthew Kaito Juyuan Fu