Spen
9d45df1c5a
sso for ntu mb all sites
...
Conflicts:
app/assets/stylesheets/basic/global.css
app/views/devise/sessions/new.html.erb
app/views/layouts/devise.html.erb
2014-01-23 12:01:16 +08:00
rulingcom
4c85d62866
ray fix for css and filemanager
2013-12-12 15:39:20 +08:00
rulingcom
a82022c958
ray fix design for filemanager
2013-12-11 17:59:14 +08:00
saurabhbhatia
2a41e90bc1
Ray's fixes for the file manager
2013-12-10 17:40:13 +08:00
Harry Bomrah
f1c2e29bf1
form validations and ajax check plus user approval done
2013-11-29 16:40:46 +08:00
Harry Bomrah
8d7e350c32
facebook login and import done
2013-11-27 09:46:02 +08:00
Harry Bomrah
73b82bc177
second commit for harry.tp
2013-11-27 09:46:00 +08:00
Harry Bomrah
12127a8d6c
commit for harry.tp
2013-11-27 09:45:57 +08:00
saurabhbhatia
44c93c2dde
Updated with Mobile UI working
2013-11-19 11:33:19 +08:00
Harry Bomrah
eaa87b3dd8
new categories for calendar with colors inside.. plus changed the working of calendar. it has now categories like all other modules
2013-11-04 15:17:50 +08:00
chris
62c663d699
Fix for togglebox and menu_enabled_for
2013-10-30 17:26:31 +08:00
chris
16659d79cd
Fix asset:precompile error and delete useless file
2013-10-28 17:04:36 +08:00
chris
a14d69211b
PagePart widgets for "system widget"
...
Delete useless code
2013-10-28 16:29:23 +08:00
chris
218cb03641
PagePart widgets except "system widget"
2013-10-28 16:29:23 +08:00
chris
42d0afe65c
Page form with front end style
2013-10-28 16:29:23 +08:00
chris
f3b3c94b42
Item control iframe dom
...
Css for preview
2013-10-26 18:58:53 +08:00
chris
6d5f1a2f12
Fix in js and css for pageslide and ad_banner
2013-10-23 18:39:30 +08:00
chris
606ac05563
Pageslide fix for error message and focused element
2013-10-20 20:54:23 +08:00
chris
9e74d6d47b
Add missing js and css for mobile and fix ad_banner
2013-10-19 19:35:33 +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
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
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
ff93670949
Updated template editing
2013-10-04 14:41:31 +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
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
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
Harry Bomrah
e4a16eab3a
commit for survey questions
2013-09-17 15:34:23 +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
b004121187
minimize bar updated to new style and more flexible.
2013-08-19 12:59:57 +08:00
Harry Bomrah
a04155963d
all file things are fixed. delete and view and also names
2013-08-14 09:30:48 +08:00
Spen
6c514770bc
solved conflict for member_new_ui
2013-08-12 15:40:34 +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
chris
0f3a8414be
Delete duplicate js and css
...
Close the form in search in orbit bar
2013-07-31 17:30:53 +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
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
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
Harry Bomrah
57a64dc378
mini colors in new ui fixed
2013-07-23 12:12:46 +08:00
chris
0d0f85e7ad
Fix tooltip in form
...
Change form_file
2013-07-22 20:54:40 +08:00