Spen
9a8a2b3061
fix new ui survey module authorization
2013-10-21 16:28:38 +08:00
Spen
c76adc1896
new ui member account privilege fix
2013-10-21 10:42:50 +08:00
chris
f9f2232259
Add setForm and resetForm to pageslide.js
...
Category, AdBanner and Tag are using js to load the values in the form
2013-10-21 06:34:55 +08:00
chris
8e168b0fe1
Remove erro-cover on close and loadComplete
2013-10-20 21:16:17 +08:00
chris
606ac05563
Pageslide fix for error message and focused element
2013-10-20 20:54:23 +08:00
chris
4403ca3504
Add timeout before running script on window load
2013-10-20 19:13:20 +08:00
chris
a9343e9a82
Fix new_ui:save_pages
2013-10-20 19:05:19 +08:00
chris
2530dace02
Change the parser_front_end to be used in the structure for page edit, new_ui:save_pages must be run
2013-10-20 18:44:04 +08:00
chris
1ea8d9faf9
Fix typo for ad_banner
2013-10-20 16:31:34 +08:00
chris
9f5bce9351
Review of the uploaders
...
Rake task to recreate version: uploader:recreate or uploader:recreate name1 name2 ...
2013-10-20 16:07:20 +08:00
chris
cce8f1be9b
Add migration task for ad_banner
2013-10-19 20:20:40 +08:00
chris
1d32552b51
Add missing effect to banner
2013-10-19 19:54:37 +08:00
chris
9e74d6d47b
Add missing js and css for mobile and fix ad_banner
2013-10-19 19:35:33 +08:00
chris
7353b48212
Finalize ad_banner changes: front-end, back-end, mobile
2013-10-19 19:17:59 +08:00
chris
fea86ba3a9
Page slide does not reload from server for ad_banner
2013-10-19 19:17:24 +08:00
chris
92d2af13f2
changes for ad_banner
2013-10-19 19:17:04 +08:00
chris
19bf2f2be5
Modify "can_display" to add "postdate" and "deadline"
2013-10-19 19:14:37 +08:00
chris
68a379f8a4
Some fixes for tags: authorization, translation…
...
can_use now takes all the open_for into account
2013-10-19 19:14:31 +08:00
chris
d2602a3a84
Change code for new page slide.js
...
Conflicts:
app/views/admin/pages/_form.html.erb
2013-10-19 19:14:14 +08:00
chris
f694134150
Remove useless code
...
Add data-title
2013-10-19 19:14:07 +08:00
Spen
00e9a5df5b
new ui member settings account data
...
Conflicts:
app/controllers/admin/users_new_interface_controller.rb
app/views/admin/users_new_interface/show.html.erb
config/locales/en.yml
config/routes.rb
2013-10-18 22:28:27 +08:00
saurabhbhatia
32c1defba0
Updated Site Preferences Templates
2013-10-18 20:03:58 +08:00
Spen
14d2b0cc76
fix new ui member account privilege
2013-10-18 19:52:36 +08:00
saurabhbhatia
e453efeb6b
Revert "add ntu_ga survey init sorting"
...
This reverts commit 9076d5496a
.
2013-10-18 19:51:16 +08:00
saurabhbhatia
3e491380cd
Revert "new ui member settings account data"
...
This reverts commit e1f4ee464b
.
2013-10-18 19:51:02 +08:00
Spen
e1f4ee464b
new ui member settings account data
2013-10-18 19:12:27 +08:00
Spen
9076d5496a
add ntu_ga survey init sorting
2013-10-18 19:10:22 +08:00
saurabhbhatia
14fea3638f
Updated with some locale fixes in site preferences
2013-10-18 15:26:41 +08:00
chris
7b1b1fa2d3
Fix bug in open_for, it now takes all the open_for into account
...
Add open_for_user
2013-10-17 14:20:49 +08:00
Manson Wang
a67be030c5
Fix JS Path
2013-10-17 11:21:46 +08:00
chris
a76164465e
Fix editing a tag module
2013-10-16 23:34:51 +08:00
saurabhbhatia
d2459f42c0
Added Favicon and default image for orbitbar
2013-10-16 18:50:22 +08:00
saurabhbhatia
155039ac16
Updated fixes for site info - desktop openess, title always displayed
2013-10-16 18:33:57 +08:00
Manson Wang
2bcecc322e
Update Ad_Banner for new jQuery
...
Removed loading module.js in module_widget.html.erb
2013-10-16 12:28:21 +08:00
Spen
fbe6017382
new ui ask module lose 2 file
2013-10-16 10:31:16 +08:00
Harry Bomrah
df5cda7a98
new feature added for not loading submenus inside api for desktop
2013-10-16 09:37:39 +08:00
Harry Bomrah
fbea249782
jquery update and also fixed app manager bug .. jquery updated to 1.10.2 and jquery ui updated to 1.10.0 .. gem jquery-rails vs 2.1.4 changed to 3.0.4 and jquery-ui-rails changed to 4.0.5
2013-10-16 09:37:33 +08:00
chris
279ac774d4
Migrate form old ui to new ui (categories, tags and authorizations)
2013-10-15 23:38:44 +08:00
Manson Wang
11b880752d
Fix Ad_Banner backend refresh page after edit banner
2013-10-15 19:50:01 +08:00
Manson Wang
76ba7087b2
Fix Ad_Banner frontend for IE8
...
Fix backend bug in editing banner
Translation Added
2013-10-15 19:37:12 +08:00
Spen
b9fbba2962
fix new ui ask module frontend
2013-10-15 17:01:07 +08:00
saurabhbhatia
96c3be68f7
Fixed Enable and Disable, Sitemap and Terms of Use for header and footer
2013-10-15 10:37:49 +08:00
saurabhbhatia
5fb3731430
Show Custom orbit bar icon only for frontend and desktop
2013-10-15 10:07:46 +08:00
saurabhbhatia
fb34dc673f
Changeable Orbitbar logo
2013-10-14 18:20:26 +08:00
Harry Bomrah
14ea611f8c
fixed file view on server for desktop
2013-10-14 16:49:54 +08:00
Harry Bomrah
4f04eca74f
test for fileview in desktop on server
2013-10-14 16:49:51 +08:00
saurabhbhatia
4120be6f8e
fixes in sitemap, site preference
2013-10-14 16:48:50 +08:00
saurabhbhatia
ae66e7257f
Added Rackprofile to development assets
2013-10-14 10:55:01 +08:00
saurabhbhatia
55fa1cef4f
Added Enable and disable terms of use, sitemap
2013-10-11 13:14:37 +00:00
saurabhbhatia
5c8a57e700
Fixed Sitemap Toggle
2013-10-09 09:06:21 +00:00
saurabhbhatia
7ef2dacf00
Fix links in member module
2013-10-09 05:22:51 +00:00
chris
08a8d668ec
Display de page contexts in the mobile version as set in structure
2013-10-08 18:11:29 +08:00
chris
b4f5fddc5c
Add option to skip authorization
2013-10-08 17:18:58 +08:00
chris
315a24556c
Fix parser common to skip not found module_app
...
Do not show default widget if there's no data
2013-10-08 16:42:20 +08:00
chris
cce68beff1
Quick fix for front end reloading
2013-10-08 14:52:24 +08:00
chris
cf7f7aa29c
Fix tag page slide issues
2013-10-08 12:47:31 +08:00
chris
5328a26440
Fix structure position
2013-10-08 12:33:24 +08:00
chris
fe1869199e
Fix typo, it wasn't executing the filtering on tags
2013-10-07 19:01:59 +08:00
chris
061225f56c
Override mongoid-tree callback condition for default position
2013-10-07 18:23:54 +08:00
saurabhbhatia
b3e16ce23b
Updated desktop widgets controller
2013-10-07 18:13:55 +08:00
saurabhbhatia
fad191aefe
Updated Desktop Inheritence class
2013-10-07 17:47:13 +08:00
chris
2f866891b1
Limit rubyzip version
2013-10-07 16:25:47 +08:00
chris
48aa7ed638
Update rake for resetting position
...
Fix codemirror css
2013-10-07 16:23:07 +08:00
chris
21db2a2cba
Drag and drop to reorder users
2013-10-07 15:53:54 +08:00
saurabhbhatia
1194bdd9b4
Updated Sitemap with UI fixes - checkbox tag pending
2013-10-07 15:05:50 +08:00
Manson Wang
831bd722b8
Fix site preference openness problem
2013-10-07 14:37:52 +08:00
saurabhbhatia
940a915125
Updated Sitemap with new UI
2013-10-07 09:43:47 +08:00
Manson Wang
792785f7ba
Fix relation for Ad_banner and Ad_image
...
Update site.rake for New UI
2013-10-04 19:20:04 +08:00
chris
43cf6b70b7
Fix structure reorder position
2013-10-04 15:07:24 +08:00
saurabhbhatia
ba8da9b6bb
Updated button class in template form
2013-10-04 14:41:48 +08:00
saurabhbhatia
ff93670949
Updated template editing
2013-10-04 14:41:31 +08:00
Spen
f85354c2b6
fix new ui link and archive frontend and widget index
2013-10-04 11:51:36 +08:00
chris
06c48524fd
Fix tag to remove ['0', '1'] from the form
2013-10-02 18:36:08 +08:00
chris
31ef12b3da
Fix approval link in side bar
2013-10-02 15:35:42 +08:00
saurabhbhatia
08907aa8c1
Search Engine Preferences complete
2013-10-02 15:23:12 +08:00
saurabhbhatia
31b55a0635
Revert "Updated Orbit js to latest version"
...
This reverts commit b18e61a6c0
.
2013-10-02 12:32:45 +08:00
chris
433c8d5da6
Fix link in category for authorization, fix update of auth users
2013-10-02 12:18:20 +08:00
saurabhbhatia
b18e61a6c0
Updated Orbit js to latest version
2013-10-02 12:09:44 +08:00
saurabhbhatia
4fe2e31f0e
Updated Global css to fix the line height
2013-10-01 17:51:07 +08:00
saurabhbhatia
31e4fb9f39
Updated sidebar line height
2013-10-01 17:47:58 +08:00
saurabhbhatia
9bdb633157
Updated with UI Changes
2013-10-01 17:39:21 +08:00
Harry Bomrah
caca264b50
isotope fixed for all plugins for list and form.
2013-10-01 15:06:49 +08:00
saurabhbhatia
9a0e9ddc82
Revert "Updated Bulletins controller with announcement approval fix"
...
This reverts commit a9431ad17e
.
2013-10-01 15:03:34 +08:00
saurabhbhatia
9f490c87d2
Fixed issue with member plugin delete label
2013-10-01 10:43:37 +08:00
saurabhbhatia
a9431ad17e
Updated Bulletins controller with announcement approval fix
2013-10-01 10:03:18 +08:00
saurabhbhatia
d9ac24470f
Updated Member plugin names to remove spaces and generate correct links
2013-09-30 18:25:18 +08:00
Harry Bomrah
2f673b20ad
disabling changes in desktop, missed out in last one
2013-09-30 17:25:02 +08:00
Harry Bomrah
0a9fd6a4b5
some needed changes in api for desktop
2013-09-30 16:59:50 +08:00
Harry Bomrah
74ca99a581
delete and sequencing fixed for survey questions
2013-09-30 16:49:27 +08:00
chris
dfec6f7642
Fix for user order
2013-09-27 12:46:19 +08:00
Spen
9186978551
new ui member plugin sort fix and user show avatar fix
2013-09-27 11:04:52 +08:00
chris
622534e5db
Fix user order:
...
- gender color
- add cancel button for input
2013-09-26 20:18:34 +08:00
Harry Bomrah
52c896d8c5
some backend code change for sharing personal plugin module content. Added sharing in desktop for all the modules.
2013-09-26 20:11:45 +08:00
Spen
028c689739
Change User.all to User.not_guest_user
2013-09-26 19:46:14 +08:00
chris
f81894af90
User ordering
...
Run the task new_ui:save_users
2013-09-26 19:00:13 +08:00
Manson Wang
dc3593c162
zh-tw for new ui
2013-09-26 17:13:17 +08:00
Manson Wang
16c26e3273
Fix path of jquery.cycle.all.latest.js
2013-09-26 16:11:08 +08:00
Harry Bomrah
5332162646
small add question fix for survey module.
2013-09-26 09:31:52 +08:00
Harry Bomrah
1d0ea6718f
brief added to desktop for all plugins
2013-09-25 18:23:44 +08:00
Harry Bomrah
04ff345b94
survey edit completed
2013-09-25 17:29:38 +08:00
Harry Bomrah
58fb2d1c73
external links and link widget fixed for development
2013-09-24 15:37:40 +08:00
Spen
a067bcd304
Add Brief intro. for all personal plugins
...
Add Share Setting for Personal Plugins ( if have old data must be add default value "field: is_hidden => false " )
Apply New UI to Member Plugin Edit Page
Personal Plugin Summary fix
Academic Info. list fix
2013-09-18 18:55:40 +08:00
saurabhbhatia
b487740035
Fixed Pagination Errors in member module
2013-09-18 16:11:17 +08:00
Harry Bomrah
1e3cffee0a
add page completed with attributes and reordering
2013-09-17 15:34:34 +08:00
Harry Bomrah
e4a16eab3a
commit for survey questions
2013-09-17 15:34:23 +08:00
Harry Bomrah
e45b7e09a0
half survey module form changed to new ui plus one calendar fix
2013-09-16 12:25:58 +08:00
Harry Bomrah
bd3462df7f
small change left in last commit. commiting for gallery widget
2013-09-16 11:19:24 +08:00
Harry Bomrah
f5f1822f0a
no data file added
2013-09-16 11:19:18 +08:00
Harry Bomrah
d532ded8e4
widget code for gallery rewritten for new_ui
2013-09-16 11:19:11 +08:00
chris
8456a91968
Fix structure edit
2013-09-14 17:26:16 +08:00
chris
ba7ac5d954
Fix [app_name]_category_with_title and change announcement init
2013-09-14 11:54:35 +08:00
Spen
9cc1e95cb1
announcement add new widget bulletins_and_links
...
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_bulletins.html.erb
2013-09-14 11:52:19 +08:00
chris
c1cbfddf4b
Fix for user and role relationship (from role and sub-role side)
2013-09-13 17:39:01 +08:00
Harry Bomrah
3595c59810
some unmerged code i pushd 3 months back not update by chris
2013-09-13 15:58:42 +08:00
Harry Bomrah
789e02e313
ad_banner banner load fixed for test site
2013-09-13 14:23:44 +08:00
Manson Wang
bb8bc9a529
Added missing translation for gallery
2013-09-12 10:10:37 +08:00
Manson
6430e60577
Added the missing translations in config/locales/en.yml and zh_tw.yml
...
Conflicts:
config/locales/en.yml
config/locales/zh_tw.yml
2013-09-12 09:30:07 +08:00
chris
17d7912e07
Ray's js code for status in form
2013-09-11 19:24:58 +08:00
chris
911cfdc980
Move js into a file for status in form
2013-09-11 18:38:56 +08:00
Harry Bomrah
579bc3c245
some very small fix for image alternative text and browse files manager
2013-09-11 14:03:25 +08:00
Harry Bomrah
8c98645a69
small bug fix for inserting and delete button.
2013-09-11 14:03:19 +08:00
Harry Bomrah
9e10a3c944
editing for the assets are done with replacable files and description
2013-09-11 14:03:13 +08:00
Harry Bomrah
f920a4f6ba
filemanager and some update for file uploader . added file uploader to kernel
2013-09-11 14:03:06 +08:00
chris
3328a41b55
Put back js that was deleted by mistake
2013-09-11 14:01:06 +08:00
chris
06203d27b9
Fix for user and role relationship
2013-09-11 14:00:41 +08:00
saurabhbhatia
865be29b37
Updated Preference Page
2013-09-09 11:29:46 +08:00
saurabhbhatia
0eeb7db1a8
Updated preference UI
2013-09-09 11:02:58 +08:00
saurabhbhatia
7216676c40
Updated Sidebar and Preferences
2013-09-09 10:18:14 +08:00
saurabhbhatia
fa857cfeea
Default Locale
2013-09-06 18:00:36 +08:00
saurabhbhatia
a3f1b8d54a
Updated Preferences in Site Info
2013-09-06 18:00:30 +08:00
saurabhbhatia
e9d6fa8787
Preference Page
2013-09-06 18:00:28 +08:00
saurabhbhatia
6e032a8757
Add Preference and search engine
2013-09-06 18:00:23 +08:00
saurabhbhatia
1558cfdb4e
Updated Sitebar with Search Engine
2013-09-06 18:00:21 +08:00
saurabhbhatia
9e4686a565
Fixed Site Info completely and added search engine page
2013-09-06 18:00:18 +08:00
saurabhbhatia
fef7cc4ed2
Updated Site info
2013-09-06 18:00:10 +08:00
saurabhbhatia
7f0821ea84
Updated Site info page to new ui
2013-09-06 17:59:56 +08:00
saurabhbhatia
2c0761aafb
Updated Sitemap to New UI
2013-09-06 17:59:54 +08:00
saurabhbhatia
1e5ad750cd
Updated Site bar with correct links
2013-09-06 17:59:43 +08:00
Harry Bomrah
335991e152
by mistake pushed code with debugger
2013-09-05 12:51:15 +08:00
Harry Bomrah
131dd3fea8
child images tag adding and deleting updated.
2013-09-05 12:51:13 +08:00
chris
6d8698af63
Comment out included css from member front
2013-09-03 17:09:47 +08:00
Matt K. Fu
00ddd94314
fix design index
2013-09-03 15:20:48 +08:00
chris
8045a18230
Change modal delete to take an "remote" option
2013-09-03 15:04:05 +08:00
Spen
81a89d2d7c
new ui member image js fix
2013-09-02 14:37:35 +08:00
Harry Bomrah
4209356e9d
new features in gallery image view.. and also tags for gallery completed.
2013-09-02 11:23:01 +08:00
Spen
3123c5de0a
new ui member bug and interface fix
2013-09-02 11:22:17 +08:00
Harry Bomrah
82b6be483a
isotope embedded inside desktop kernel
2013-08-30 10:58:08 +08:00
Harry Bomrah
ff64fb5230
file title translations fixed
2013-08-30 10:57:54 +08:00
saurabhbhatia
2bc9d3424a
Deleted unused module
2013-08-27 15:10:10 +08:00
saurabhbhatia
5591b06ee6
Ask Module for New UI
2013-08-27 12:38:06 +08:00
saurabhbhatia
b970ea1e0e
Updated Authorization for member, link, tag, archive
2013-08-27 10:14:39 +08:00
saurabhbhatia
155722519b
Module Auth for video
2013-08-23 15:22:21 +08:00
chris
45e987d6f5
Fix for authorization
...
Dashboard and page authorisation
2013-08-23 12:08:33 +08:00
Harry Bomrah
399dfad392
faq authorization completed.
2013-08-22 18:00:05 +08:00
saurabhbhatia
53e5c57970
Commented Dashboard Public Visibility and fall back on no-filter defined authorization
2013-08-22 16:43:11 +08:00
saurabhbhatia
e75873273c
Updated Gallery with authorizations
2013-08-22 16:25:11 +08:00
saurabhbhatia
4c217ec12f
Updated Authorizations for Adbanner, Calendar, Location
2013-08-22 15:20:50 +08:00
saurabhbhatia
452da1b8ec
Updated Desktop Themes controller
2013-08-22 14:14:19 +08:00
chris
ec40591489
Make the filter for authorisation easier for developers
2013-08-22 12:17:50 +08:00
Spen
4078d426a6
new ui personal front_end page(member app) & users_new_interface show sub_roles fix
2013-08-21 14:13:36 +08:00
chris
c474fa063f
New authorization
2013-08-21 13:42:29 +08:00
chris
d24bd176cc
Changes in datetimepicker to accepts formats in options
2013-08-21 13:42:29 +08:00
Harry Bomrah
897ed49d2e
new ui for faq and announcement status fixed.
2013-08-20 18:22:11 +08:00
saurabhbhatia
21a7b5da5c
Icons for sidebar
2013-08-19 17:13:36 +08:00
Harry Bomrah
b004121187
minimize bar updated to new style and more flexible.
2013-08-19 12:59:57 +08:00
saurabhbhatia
bc596614fb
fixed pagnination errors for ask,qa,survey module
2013-08-19 10:16:53 +08:00
Harry Bomrah
88ad59f55a
title and css fix for file view
2013-08-19 09:42:50 +08:00
saurabhbhatia
7dfd5d7e00
Generate Breadcrumb for only for modules where module_apps are clearly defined
2013-08-19 09:39:45 +08:00
Harry Bomrah
bbb765c88d
small fix for file link inside edit form for desktop
2013-08-16 15:49:12 +08:00
Harry Bomrah
6577885761
docx xlsx and pptx file types fixed plus icon provided in edit form for files
2013-08-16 15:49:04 +08:00
Spen
a12e538932
new ui member show plugin profile translation fix
2013-08-14 17:21:40 +08:00
Harry Bomrah
a04155963d
all file things are fixed. delete and view and also names
2013-08-14 09:30:48 +08:00
Harry Bomrah
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
saurabhbhatia
cb070cc537
Updated Desktop with fix for forms for all users
2013-08-13 11:51:59 +08:00
Spen
6c514770bc
solved conflict for member_new_ui
2013-08-12 15:40:34 +08:00
Harry Bomrah
9c7558847a
bilingual fixed for all the plugins in desktop
2013-08-12 12:28:58 +08:00
Harry Bomrah
771ec0b8f6
css fixed for plugins and types and also some other css problem fixed
2013-08-12 12:28:51 +08:00
Harry Bomrah
d0ef862f85
language changes and conferences add/edit bug fixed
2013-08-12 12:28:46 +08:00
Harry Bomrah
b2c3beefe9
icons and colors for themes fixed
2013-08-12 12:28:39 +08:00
Harry Bomrah
55670e6318
icons and theme minicolors fixed
2013-08-12 12:28:32 +08:00
saurabhbhatia
76d25882e8
Added Rake task to update desktop users to new_ui
2013-08-09 18:44:43 +08:00
saurabhbhatia
6269c6d1e6
Updated init.rb
2013-08-09 15:22:12 +08:00
saurabhbhatia
7c64e8c637
Updated AdBanner index page and Ad Image index page, and edit pages
...
Conflicts:
vendor/built_in_modules/ad_banner/config/locales/en.yml
vendor/built_in_modules/ad_banner/init.rb
2013-08-09 15:22:06 +08:00
saurabhbhatia
e14cb3c74c
Updated adimage home page
2013-08-09 15:22:00 +08:00
saurabhbhatia
a2e9aa2e0b
Updated ADBanner with fixes on index page, ADImage with fixes
...
Conflicts:
app/views/admin/ad_banners/index.html.erb
app/views/admin/ad_images/_form.html.erb
vendor/built_in_modules/ad_banner/init.rb
2013-08-09 15:21:51 +08:00
saurabhbhatia
a5c800d3fe
Added video widget to new UI
2013-08-09 10:46:16 +08:00
Harry Bomrah
0b6ace4e26
ok for precompiling
2013-08-07 15:03:08 +08:00
Harry Bomrah
e3d9966f76
bugs fixed for plugins. .. and also css fixed
2013-08-06 17:53:04 +08:00
Harry Bomrah
7d288b4160
some changes in file selection
2013-08-06 17:52:50 +08:00
Harry Bomrah
c2f223b82c
new plugins added for desktop
2013-08-06 17:52:39 +08:00
Harry Bomrah
42615f02ea
new feature in desktop for uploading wallpapers or putting url link
2013-08-02 19:32:41 +08:00
chris
0f3a8414be
Delete duplicate js and css
...
Close the form in search in orbit bar
2013-07-31 17:30:53 +08:00
chris
d632439f80
Add class for Ray's check-box
...
Fix some typos
Change the default index for auth
Add some hard code in object_auth.rb to handle page_context
A user cannot select himself in authorisation
2013-07-31 00:08:15 +08:00
saurabhbhatia
b1755bdc80
Added Stock Backgrounds, Fixed production issue with desktop css
2013-07-30 18:37:36 +08:00
saurabhbhatia
2fea428b67
Changed mongoid production back to test_site
2013-07-30 17:17:17 +08:00
saurabhbhatia
7e67d389b9
Added new orbit bar to compatibility page
2013-07-30 17:15:57 +08:00
saurabhbhatia
094c0f4314
Updated desktop compatibility to fix css paths
2013-07-30 17:15:55 +08:00
saurabhbhatia
d9079d9d7c
Updated with icons, latest js and css for desktop
2013-07-30 16:43:47 +08:00
saurabhbhatia
aeaec79a2c
new themes, apps and widgets for new ui
2013-07-30 16:43:44 +08:00
saurabhbhatia
e12b14311e
Updated Desktop with new UI
2013-07-30 16:43:41 +08:00
saurabhbhatia
55d9aea664
Merged Desktop with New UI
2013-07-30 16:43:38 +08:00
Harry Bomrah
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
Harry Bomrah
f7dbbf1bca
new themes added to desktop plus theme uploader created
2013-07-30 16:43:32 +08:00
Harry Bomrah
6d89eab98a
desktop final fix
2013-07-30 16:43:28 +08:00
Harry Bomrah
c18a8a8c6f
mongoid yml fix
2013-07-30 16:43:22 +08:00
Harry Bomrah
38194311ab
some changes again
2013-07-30 16:43:18 +08:00
Harry Bomrah
bd5f3d1a44
some changes
...
Conflicts:
config/mongoid.yml
2013-07-30 16:43:14 +08:00
Harry Bomrah
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
devin chen
ac58b993c2
simple component update
...
minor update
2013-07-30 16:43:09 +08:00
devin chen
2b12a4775c
Various view update and change #thmbackground tag
2013-07-30 16:43:02 +08:00
devin chen
b085e826a5
fix loading Section page for Chrome
2013-07-30 16:42:59 +08:00
devin chen
ff375f0c5c
minor update
2013-07-30 16:42:56 +08:00
devin chen
3cde26ca4a
gridster update
2013-07-30 16:42:53 +08:00
Harry Bomrah
ed22a4d303
apps update -- app upload and activation
2013-07-30 16:42:50 +08:00
devin chen
f2ada14b7a
app manager's view update
2013-07-30 16:42:46 +08:00
devin chen
9963395b05
'select2' minor update
...
Conflicts:
app/assets/Archive/stylesheets/admin/add_attribute_field.js.erb.bak
2013-07-30 16:42:40 +08:00
Harry Bomrah
66582fb671
fixed saving of positions of the tiles again
2013-07-30 16:42:36 +08:00
devin chen
4ae1fe68cd
app manager view update
2013-07-30 16:42:33 +08:00
Harry Bomrah
2d616ab7a8
solved desktop conflict during cherry pick
2013-07-30 16:42:26 +08:00
devin chen
874819266d
minor update
2013-07-30 16:42:23 +08:00
devin chen
3ded19016a
apps setting view
2013-07-30 16:42:20 +08:00
Harry Bomrah
9478bb13e2
search fixed again according to devin requirements
2013-07-30 16:42:14 +08:00
Harry Bomrah
cff77fbee5
new search for app manager and few javascript fixes
2013-07-30 16:42:11 +08:00
devin chen
ad68f63a7a
style for checkbox, radio button
2013-07-30 16:41:58 +08:00
Harry Bomrah
20521dc8b0
removing duplicate code from js file
2013-07-30 16:41:54 +08:00
devin chen
a458a50e97
publication's view update
2013-07-30 16:41:48 +08:00
Harry Bomrah
ae8033ea1b
duplicate error fixed and css inside widgets fixed, duplicate location fixed
2013-07-30 16:41:44 +08:00
Harry Bomrah
dc94283af9
duplicate error fixed and css inside widgets fixed, duplicate location fixed
2013-07-30 16:41:38 +08:00
Harry Bomrah
78d6e33865
devin branch merge plus minor fixes
2013-07-30 16:41:32 +08:00
Harry Bomrah
b70310c6fe
tiny scrollbar update
2013-07-30 16:41:25 +08:00
devin chen
4215ed5538
minor update
2013-07-30 16:41:16 +08:00
chris
74b2bbf4b7
Fix link in structure when the item is a link
...
Add internal links creation
2013-07-30 11:49:28 +08:00
chris
c85629d3b3
Fix controller js and css loading error
2013-07-30 11:48:14 +08:00
chris
af98f8efce
Fix orbit bar language change
2013-07-29 19:49:07 +08:00
chris
ff59feb2e7
Fix for structure
2013-07-29 18:46:38 +08:00
chris
f332a3191a
Fiix layout for safari
2013-07-29 17:34:29 +08:00
chris
d190a50046
Breadcrumb for dashboard (tags and categories cannot link to original module index)
2013-07-29 17:34:03 +08:00
chris
fe10cc62d9
Fix structure title (page slide)
2013-07-29 14:59:02 +08:00
chris
d434b878a7
Add default delete modal usage:
...
- <%= render 'layouts/delete_modal', delete_options: {title: '', warning: '', cancel: '', submit: '' } %>
- in default index, just set title, warning, cancel and submit in quick_edit if needed
2013-07-29 14:29:37 +08:00
chris
b3cdffb59e
Fix typo
2013-07-27 15:57:14 +08:00
chris
fd432f30ba
Fix cktext_area and removing of files and links
2013-07-27 15:50:34 +08:00
chris
0be8a74fa8
Fix missing condition in index auth
2013-07-25 17:45:39 +08:00
chris
f60c190a11
Page module new UI
2013-07-25 17:37:11 +08:00
chris
da1d70efcb
Change authorization to accept other than category
2013-07-25 17:36:55 +08:00
chris
0c208d0020
Remove some css causing errors in precompile
...
Remove the image in announcement index
Set the db to test_site
2013-07-25 13:15:49 +08:00
chris
1dc7884ec0
Changes for default index:
...
- remove approvable and filterable
- add display_option
- change params
Update web link and gallery index
2013-07-25 11:32:25 +08:00
saurabhbhatia
af0ab9f0d3
removed categories reference in event categories
2013-07-23 19:16:21 +08:00
saurabhbhatia
9144622c41
Fixed index page for categories color
2013-07-23 19:01:56 +08:00
saurabhbhatia
06ab24374b
Gallery - categories, module_authorization and tags to new_ui
2013-07-23 18:16:19 +08:00
saurabhbhatia
c7cf7e1ce4
removed category_customizable
2013-07-23 12:27:01 +08:00
saurabhbhatia
048f553be8
added timedifference gem to Gemfile required for calendar module
2013-07-23 12:18:36 +08:00
saurabhbhatia
7e3993b67f
removed old calendar and updated new calendar event category
...
Conflicts:
vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb
vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/cals_controller.rb
vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/events_controller.rb
2013-07-23 12:13:02 +08:00
saurabhbhatia
8924d4f047
Fixed the sidebar order in calendar module
...
Conflicts:
vendor/built_in_modules/calendar_new/init.rb
2013-07-23 12:12:55 +08:00
Harry Bomrah
57a64dc378
mini colors in new ui fixed
2013-07-23 12:12:46 +08:00
saurabhbhatia
3d3d5ed144
updated with fullcalendar.css, added front end page
...
Conflicts:
vendor/built_in_modules/calendar_new/init.rb
2013-07-23 12:12:34 +08:00
Harry Bomrah
4ff5724379
new ui for calendar fixed.
2013-07-23 12:12:25 +08:00
chris
0d0f85e7ad
Fix tooltip in form
...
Change form_file
2013-07-22 20:54:40 +08:00
chris
de6ce0073f
Fix category migration
2013-07-22 18:39:24 +08:00
Spen
5d3bc07488
archive and web_resouce for new ui
...
Conflicts:
app/assets/stylesheets/lib/main-forms.css
2013-07-22 18:14:33 +08:00
chris
1ba1703e90
Fix get_viewable
2013-07-22 17:41:52 +08:00
chris
2265b0b404
Fix no file in bulletin form
2013-07-22 17:41:21 +08:00
chris
6cf249ccfb
Change ckeditor gem and kaminari in gemfile
2013-07-22 17:26:32 +08:00
chris
92faeccdb6
Revert change in main-form and change class name of form_file
2013-07-22 17:24:58 +08:00
chris
5284571300
Add tooltip to bulletin form and remove file
2013-07-22 16:55:02 +08:00
chris
fe82427baa
Ray's changes for css and js
2013-07-22 16:31:44 +08:00
rulingcom
408bebaa4b
Ray's changes in structure
2013-07-22 14:06:58 +08:00
saurabhbhatia
c8292a7619
Updated zh_tw translation for sidebar labels
...
Conflicts:
vendor/built_in_modules/location/config/locales/zh_tw.yml
2013-07-22 12:17:31 +08:00
saurabhbhatia
7ea9945af0
Location - category fixes
...
Conflicts:
app/models/category.rb
vendor/built_in_modules/location/init.rb
2013-07-22 12:17:29 +08:00
saurabhbhatia
109b891b27
Merge branch 'development' of https://github.com/Rulingcom/orbit into development
2013-07-19 17:39:55 +08:00
saurabhbhatia
b642072cbe
Removed the category reference for now
2013-07-19 17:38:43 +08:00
chris
1db324d1a2
Fix get_sorted_and_filtered
2013-07-19 17:38:43 +08:00
Harry Bomrah
0921d7731b
my favorite update :) lazy loading for theater view plus a very smooth navigation of images.
2013-07-19 17:38:41 +08:00
Harry Bomrah
3c0d2da9a7
description fixed for gallery
2013-07-19 17:38:38 +08:00
saurabhbhatia
e6c411b8e1
Updated tagging with galleries in new ui
2013-07-19 17:38:33 +08:00
saurabhbhatia
1c558a1783
added tags to index page, added html safe for show
2013-07-19 17:38:30 +08:00
Harry Bomrah
3287a2ef17
gallery migrated to new ui
2013-07-19 17:38:27 +08:00
chris
fc09ac3b68
Fix categorizable
2013-07-19 17:09:17 +08:00
chris
5190c1160a
Fix get_sorted_and_filtered, accepts 3 arguments and works for category
2013-07-16 14:43:56 +08:00
chris
62288a71ca
Fix category_id in forms
...
Fix statuses list
2013-07-16 11:41:22 +08:00
saurabhbhatia
91b1cf6edc
Merge branch 'development' of https://github.com/Rulingcom/orbit into development
2013-07-11 17:18:58 +08:00
chris
1c4b66f1cb
Fix approval in index
2013-07-10 16:42:25 +08:00
saurabhbhatia
72861f05a6
Merge branch 'development' of https://github.com/Rulingcom/orbit into development
...
Conflicts:
config/mongoid.yml
2013-07-09 14:40:39 +08:00
chris
2c331bf1a5
Revert non rulingcom email constraint
2013-07-04 14:20:13 +08:00
chris
bec0bd76e4
Replace get_categories by categories
2013-07-04 12:33:28 +08:00
chris
6ce254a24c
Fix no method error in tags
2013-07-04 12:07:09 +08:00
chris
5530419395
Add missing method disable? for categorisable objects
2013-07-04 11:26:57 +08:00
chris
5457afdada
Rename global.css to global.css.erb
2013-07-02 17:42:15 +08:00
chris
65527017ca
Update new UI task to migrate the authorizations.
...
PS: sold must be running for new_ui.rake
2013-07-02 17:26:02 +08:00
chris
856898016b
New UI changes(tags, categories, authorisations, module index…)
...
To run:
- ruby lib/remove_old_tags.rb DB_NAME
- rake new_ui:migrate_tags
- rake new_ui:migrate_categories['APP_KEY,''MODEL_NAME'] (check new_ui.rake for more details)
2013-07-02 16:46:44 +08:00
Matt K. Fu
be6d185be7
Merge branch 'scandary_site_god_setting_feature' into development
2013-06-20 17:55:43 +08:00
Matt K. Fu
113ed17fb5
Merge branch 'solr_god_feature' into development
2013-06-20 17:54:47 +08:00
Matt K. Fu
c5ced8cf16
remove useless setting for solar
2013-06-20 17:50:18 +08:00
Matt K. Fu
e037507b0e
fix solr setting
2013-06-20 17:50:18 +08:00
Matt K. Fu
2f01b72ed0
fix solr name
2013-06-20 17:50:18 +08:00
Matt K. Fu
cd6dd40f45
add god to monit sold
2013-06-20 17:50:18 +08:00
Matt K. Fu
345c471fc9
from now on the rescue namespace will be decided by site object field: resque_namespace
2013-06-20 17:50:17 +08:00
Matt K. Fu
ed06be93d6
fix rescue scheduler space error
2013-06-20 17:50:17 +08:00
Matt K. Fu
1268ce0ae9
remove useless setting for solar
2013-06-20 17:42:00 +08:00
Harry Bomrah
d089822ff3
fixed updated method of events.. was having week error when updating events
2013-06-20 12:47:44 +08:00
Harry Bomrah
777af19abb
small syntax error missed out yesterday fixed.
2013-06-20 11:55:06 +08:00
Matt K. Fu
cd55f2aac2
fix solr setting
2013-06-19 19:23:45 +08:00
Harry Bomrah
07e895fc42
Small change for creating events when calendar is not selected
2013-06-19 17:27:13 +08:00
Harry Bomrah
80bf3499be
Calendar fixed... all views fixed plus event loading fixed and also agenda view fixed.
2013-06-19 17:16:52 +08:00
Matt K. Fu
c4ec6c1ac9
fix solr name
2013-06-19 16:24:56 +08:00
Matt K. Fu
6f46a3f949
add god to monit sold
2013-06-19 16:11:16 +08:00
Matt K. Fu
d78e816b4e
from now on the rescue namespace will be decided by site object field: resque_namespace
2013-06-19 15:45:53 +08:00
Matt K. Fu
e10eb833ed
fix rescue scheduler space error
2013-06-19 15:43:02 +08:00