Spen
|
8fb3b408b4
|
ntu coph sso
|
2014-01-13 15:57:49 +08:00 |
Spen
|
0dff9163bc
|
ntu coph member plugin data sync
|
2014-01-13 15:57:49 +08:00 |
saurabhbhatia
|
07964de968
|
both manual and automatic methods working
Conflicts:
config/routes.rb
|
2014-01-13 15:57:49 +08:00 |
saurabhbhatia
|
43da2eca79
|
Import Data, Sync Data
Conflicts:
config/mongoid.yml
vendor/built_in_modules/personal_book/app/models/writing_book.rb
vendor/built_in_modules/personal_conference/app/models/writing_conference.rb
vendor/built_in_modules/personal_journal/app/models/writing_journal.rb
|
2014-01-13 15:57:48 +08:00 |
Harry Bomrah
|
1a90990311
|
template_store and some changes for the store..
|
2014-01-06 14:56:04 +08:00 |
saurabhbhatia
|
9643de5d56
|
Fixed Forgot password
|
2014-01-02 17:53:05 +08:00 |
Harry Bomrah
|
6f44554822
|
facebook feed for desktop
|
2013-12-27 10:16:32 +08:00 |
Harry Bomrah
|
6c3f4bff8c
|
new stuff for gmail and fb
|
2013-12-27 10:16:29 +08:00 |
saurabhbhatia
|
fd24fbe082
|
Commit for Basic Site
|
2013-12-16 16:08:12 +08:00 |
Harry Bomrah
|
9db4c787c9
|
approve and delete all done with registration approval notification for admin
|
2013-12-05 17:30:33 +08:00 |
Harry Bomrah
|
b10a2edc22
|
redirects are ok now
Conflicts:
app/controllers/application_controller.rb
app/controllers/confirmations_controller.rb
|
2013-11-29 18:52:57 +08:00 |
Harry Bomrah
|
f1c2e29bf1
|
form validations and ajax check plus user approval done
|
2013-11-29 16:40:46 +08:00 |
saurabhbhatia
|
9347cd0463
|
Rake task for confirming and approving existing users
|
2013-11-29 13:06:36 +08:00 |
saurabhbhatia
|
6d5dd4a80f
|
Changed Site Valid Locales to In Use Locales
|
2013-11-27 17:51:48 +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
|
dead52d8ab
|
Changes in Registration Process
|
2013-11-25 17:05:36 +08:00 |
saurabhbhatia
|
03957f565b
|
Added Mobile Web as a separate page
|
2013-11-25 12:43:23 +08:00 |
Manson Wang
|
a885313e75
|
Dashboard with HighChart
|
2013-10-30 18:23:46 +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
|
8ebfac2b99
|
Structure link with json
|
2013-10-23 18:39:40 +08:00 |
chris
|
a4d1c68299
|
Structure page with json
|
2013-10-23 18:39:35 +08:00 |
Spen
|
c76adc1896
|
new ui member account privilege fix
|
2013-10-21 10:42:50 +08:00 |
chris
|
92d2af13f2
|
changes for ad_banner
|
2013-10-19 19:17:04 +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 |
Spen
|
14d2b0cc76
|
fix new ui member account privilege
|
2013-10-18 19:52:36 +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 |
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 |
saurabhbhatia
|
55fa1cef4f
|
Added Enable and disable terms of use, sitemap
|
2013-10-11 13:14:37 +00:00 |
chris
|
21db2a2cba
|
Drag and drop to reorder users
|
2013-10-07 15:53:54 +08:00 |
chris
|
f81894af90
|
User ordering
Run the task new_ui:save_users
|
2013-09-26 19:00: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 |
saurabhbhatia
|
6e032a8757
|
Add Preference and search engine
|
2013-09-06 18:00:23 +08:00 |
saurabhbhatia
|
9e4686a565
|
Fixed Site Info completely and added search engine page
|
2013-09-06 18:00:18 +08:00 |
Spen
|
6c514770bc
|
solved conflict for member_new_ui
|
2013-08-12 15:40:34 +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
|
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 |
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 |
Harry Bomrah
|
f7dbbf1bca
|
new themes added to desktop plus theme uploader created
|
2013-07-30 16:43:32 +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 |
Harry Bomrah
|
ed22a4d303
|
apps update -- app upload and activation
|
2013-07-30 16:42:50 +08:00 |
Harry Bomrah
|
2d616ab7a8
|
solved desktop conflict during cherry pick
|
2013-07-30 16:42:26 +08:00 |
chris
|
6cf249ccfb
|
Change ckeditor gem and kaminari in gemfile
|
2013-07-22 17:26:32 +08:00 |
chris
|
1c4b66f1cb
|
Fix approval in index
|
2013-07-10 16:42:25 +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 |
iCross
|
8c1e65994a
|
Merge branch 'clean_development' into lukas/picked_ques
|
2013-06-06 19:08:59 +08:00 |