saurabhbhatia
|
93909eeca0
|
Get data from database
Conflicts:
app/controllers/admin/import_data_controller.rb
Conflicts:
app/controllers/admin/import_data_controller.rb
app/views/admin/import_data/get_teacher_data.html.erb
|
2013-09-17 11:36:02 +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 |
chris
|
8456a91968
|
Fix structure edit
|
2013-09-14 17:26:16 +08:00 |
|
Harry Bomrah
|
789e02e313
|
ad_banner banner load fixed for test site
|
2013-09-13 14:23:44 +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 |
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 |
|
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 |
|
chris
|
45e987d6f5
|
Fix for authorization
Dashboard and page authorisation
|
2013-08-23 12:08:33 +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 |
|
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 |
|
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
|
7dfd5d7e00
|
Generate Breadcrumb for only for modules where module_apps are clearly defined
|
2013-08-19 09:39:45 +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 |
|
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
|
771ec0b8f6
|
css fixed for plugins and types and also some other css problem fixed
|
2013-08-12 12:28:51 +08:00 |