Commit Graph

3338 Commits (931b4ee05b451977c02d16bf3f166fe8ab5f4951)

Author SHA1 Message Date
Madawa Soysa 62141db52e Merge pull request #922 from menakaj/master
7 years ago
Menaka Jayawardena a32cf89757 Fixed formatting issues.
7 years ago
Menaka Jayawardena adce200842 Typo fix in policy create js.
7 years ago
Menaka Jayawardena 85b437a0f0 Redirect to Policy Listing page after editing a policy.
7 years ago
Menaka Jayawardena c754b64653 Redirect to Role Listing page after editing a Role.
7 years ago
Menaka Jayawardena 80a08a2744 Redirect to Group Listing page after creating a Group.
7 years ago
Menaka Jayawardena d8a8f6adf7 Restructured the setTimeout function.
7 years ago
Menaka Jayawardena e238cfd2f9 Redirect to user listing after editing the user.
7 years ago
Menaka Jayawardena bf789b91f3 Added user creation success modal.
7 years ago
Menaka Jayawardena 9ee5056967 Redirect to Permission listing after creating permission.
7 years ago
WSO2 Builder 463b843b8b [WSO2 Release] [Jenkins #2597] [Release 3.0.84] prepare for next development iteration
7 years ago
WSO2 Builder aed8496a2b [WSO2 Release] [Jenkins #2597] [Release 3.0.84] prepare release v3.0.84
7 years ago
GDLMadushanka 78d60b1a92 Refactoring
7 years ago
GDLMadushanka d7220d39af logging errors in devmgt service and groupmgt service
7 years ago
WSO2 Builder 0c6eab198c Merge commit '68a49d7e666f0b4895de3b6048d599c579bf9429' into d6a2ef64-9f2a-4574-b4e9-d995eb90a0c9
7 years ago
Harshan Liyanage 2d8139cc18 Changed the group related messages which resolves wso2/product-iots#984
7 years ago
WSO2 Builder 68a49d7e66 [WSO2 Release] [Jenkins #2596] [Release 3.0.83] prepare for next development iteration
7 years ago
WSO2 Builder 3c319811ef [WSO2 Release] [Jenkins #2596] [Release 3.0.83] prepare release v3.0.83
7 years ago
Menaka Jayawardena 815d92bd27 Removed repeated 'be' in policy create.
7 years ago
Milan Perera eda93ad6aa Merge pull request #921 from menakaj/master
7 years ago
Menaka Jayawardena 31448ec07c Set redirection to policy listing page after creating policy.
7 years ago
WSO2 Builder 2d6393a2c5 [WSO2 Release] [Jenkins #2594] [Release 3.0.82] prepare for next development iteration
7 years ago
WSO2 Builder 887102d822 [WSO2 Release] [Jenkins #2594] [Release 3.0.82] prepare release v3.0.82
7 years ago
WSO2 Builder 778528e9c8 Merge commit 'f4cef3817a30c433bc0d3d79c7ba37fe6d175864' into f88e4078-c010-415b-8eca-acfe71205eb5
7 years ago
Dileesha Rajapakse c23809b362 Corrected typos in config files
7 years ago
Dileesha Rajapakse 3ff16ee6d1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
Dileesha Rajapakse 3cdb3439eb Fixing product-iots#1236
7 years ago
WSO2 Builder f4cef3817a [WSO2 Release] [Jenkins #2593] [Release 3.0.81] prepare for next development iteration
7 years ago
WSO2 Builder 02cc2a37c1 [WSO2 Release] [Jenkins #2593] [Release 3.0.81] prepare release v3.0.81
7 years ago
Harshan Liyanage 0cca31dd06 Updated config.json file which resolves wso2/product-iots#1293
7 years ago
WSO2 Builder 8b3feec052 [WSO2 Release] [Jenkins #2590] [Release 3.0.80] prepare for next development iteration
7 years ago
WSO2 Builder 87ac798344 [WSO2 Release] [Jenkins #2590] [Release 3.0.80] prepare release v3.0.80
7 years ago
Ruwan 08a46cbf89 Merge pull request #917 from charithag/master
7 years ago
WSO2 Builder 8c7d23a754 [WSO2 Release] [Jenkins #2588] [Release 3.0.79] prepare for next development iteration
7 years ago
WSO2 Builder c0735b5842 [WSO2 Release] [Jenkins #2588] [Release 3.0.79] prepare release v3.0.79
7 years ago
Ruwan d6dbe5ed8a Merge pull request #918 from menakaj/master
7 years ago
Menaka Jayawardena 7f93ebedb2 Fixes wso2/product-iots#743
7 years ago
charitha b9abacfc61 Revert automatic reformatting
7 years ago
charitha 7b266fc64e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
charitha 3bce479b4b Fix for https://github.com/wso2/product-iots/issues/1305
7 years ago
WSO2 Builder 709015ea6d [WSO2 Release] [Jenkins #2586] [Release 3.0.78] prepare for next development iteration
7 years ago
WSO2 Builder 22b43af120 [WSO2 Release] [Jenkins #2586] [Release 3.0.78] prepare release v3.0.78
7 years ago
Milan Perera 672b556937 Merge pull request #916 from menakaj/master
7 years ago
Menaka Jayawardena 7c88653bd9 Fixes /wso2/product-iots#745
7 years ago
WSO2 Builder 897f0451e3 [WSO2 Release] [Jenkins #2584] [Release 3.0.77] prepare for next development iteration
7 years ago
WSO2 Builder e810157df4 [WSO2 Release] [Jenkins #2584] [Release 3.0.77] prepare release v3.0.77
7 years ago
amalhub a7e213c9fb Fix issue: https://github.com/wso2/product-iots/issues/1133
7 years ago
WSO2 Builder 6921656997 [WSO2 Release] [Jenkins #2577] [Release 3.0.76] prepare for next development iteration
7 years ago
WSO2 Builder 29af5cfdbb [WSO2 Release] [Jenkins #2577] [Release 3.0.76] prepare release v3.0.76
7 years ago
Harshan Liyanage 8621fb8d90 Updated the theme for adding extra space in error message icon related to wso2/product-iots#1307
7 years ago
WSO2 Builder 8c02393f2f [WSO2 Release] [Jenkins #2574] [Release 3.0.75] prepare for next development iteration
7 years ago
WSO2 Builder 9ef8dbda65 [WSO2 Release] [Jenkins #2574] [Release 3.0.75] prepare release v3.0.75
7 years ago
Dileesha Rajapakse 293eca0620 Fixing product-iots#1313
7 years ago
WSO2 Builder c18f63d607 [WSO2 Release] [Jenkins #2572] [Release 3.0.74] prepare for next development iteration
7 years ago
WSO2 Builder e75d78cd3f [WSO2 Release] [Jenkins #2572] [Release 3.0.74] prepare release v3.0.74
7 years ago
Harshan Liyanage 5b3e88d7d5 Removed top device-name search input from device-listing page which resolves wso2/product-iots#1320
7 years ago
Dileesha Rajapakse f6c93261a1 Refactored device-view.js
7 years ago
Dileesha Rajapakse 4ec8894a3d Fixing product-iots#1308
7 years ago
Dileesha Rajapakse ae4442f4f3 Refactored the device group view
7 years ago
Dileesha Rajapakse 2b8f56e790 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
Dileesha Rajapakse 2e5261b025 Added a Refresh button to the application list tab in the device view
7 years ago
WSO2 Builder 8016ccb3d4 [WSO2 Release] [Jenkins #2567] [Release 3.0.73] prepare for next development iteration
7 years ago
WSO2 Builder 709aad6bd3 [WSO2 Release] [Jenkins #2567] [Release 3.0.73] prepare release v3.0.73
7 years ago
Harshan Liyanage 829bde940d Enabled advacne search - resolves wso2/product-iots#1321
7 years ago
WSO2 Builder 7294298c4b [WSO2 Release] [Jenkins #2565] [Release 3.0.72] prepare for next development iteration
7 years ago
WSO2 Builder 8738d1dde1 [WSO2 Release] [Jenkins #2565] [Release 3.0.72] prepare release v3.0.72
7 years ago
Dileesha Rajapakse d35fa791aa Refactored the device-view.js script
7 years ago
Dileesha Rajapakse 2bea7309fd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
Dileesha Rajapakse c41a704a35 Fixing product-iots#1322
7 years ago
WSO2 Builder a057d4d1e8 [WSO2 Release] [Jenkins #2563] [Release 3.0.71] prepare for next development iteration
7 years ago
WSO2 Builder c9901f480f [WSO2 Release] [Jenkins #2563] [Release 3.0.71] prepare release v3.0.71
7 years ago
Dileesha Rajapakse c6d6d61df6 Fixed formatting issues
7 years ago
Dileesha Rajapakse d518ebd271 Fixing product-iots#1314
7 years ago
WSO2 Builder 9caea327d6 [WSO2 Release] [Jenkins #2558] [Release 3.0.70] prepare for next development iteration
7 years ago
WSO2 Builder e0a0c9618d [WSO2 Release] [Jenkins #2558] [Release 3.0.70] prepare release v3.0.70
7 years ago
Kamidu Sachith Punchihewa dd27c32981 Merge pull request #894 from wso2/rasika-patch-1
7 years ago
WSO2 Builder e358b9106b [WSO2 Release] [Jenkins #2553] [Release 3.0.69] prepare for next development iteration
7 years ago
WSO2 Builder b794b55740 [WSO2 Release] [Jenkins #2553] [Release 3.0.69] prepare release v3.0.69
7 years ago
Rasika Perera 41e9833c5b Merge pull request #892 from Kamidu/master
7 years ago
WSO2 Builder c2406a86c5 [WSO2 Release] [Jenkins #2547] [Release 3.0.68] prepare for next development iteration
7 years ago
WSO2 Builder 2561305378 [WSO2 Release] [Jenkins #2547] [Release 3.0.68] prepare release v3.0.68
7 years ago
Imesh Chandrasiri f4d8b46152 fixes wso2/product-iots#1295
7 years ago
Rasika Perera 04f1f9fb42 Update user-menu.js
7 years ago
WSO2 Builder e795f0e86d [WSO2 Release] [Jenkins #2545] [Release 3.0.67] prepare for next development iteration
7 years ago
WSO2 Builder 2bf79704e5 [WSO2 Release] [Jenkins #2545] [Release 3.0.67] prepare release v3.0.67
7 years ago
megala21 48fa95d7c7 Re-factoring
7 years ago
megala21 1b6dcca408 Fixing geo fencing issue when having multiple devices
7 years ago
WSO2 Builder c4733eb480 [WSO2 Release] [Jenkins #2542] [Release 3.0.66] prepare for next development iteration
7 years ago
WSO2 Builder 47778d40c0 [WSO2 Release] [Jenkins #2542] [Release 3.0.66] prepare release v3.0.66
7 years ago
kamidu 19a4204254 fixes ui related isses
7 years ago
Madawa Soysa 3e13588554 Merge pull request #891 from rasika/master
7 years ago
Rasika Perera 5317b05643 Geo fencing improvements
7 years ago
kamidu 326afc3f06 Enabling ios platform configurations on Device cloud
7 years ago
kamidu b7433ccbbb fixing the ui text issues in device cloud
7 years ago
kamidu 9a12dfb91b enable JS level audit logs for device cloud
7 years ago
WSO2 Builder c92a21b4db [WSO2 Release] [Jenkins #2539] [Release 3.0.65] prepare for next development iteration
7 years ago
WSO2 Builder 1ec11c94e1 [WSO2 Release] [Jenkins #2539] [Release 3.0.65] prepare release v3.0.65
7 years ago
lasantha 1afe61eb48 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
lasantha c2d8c6522b fixing minor issues
7 years ago
lasantha 8376948013 Fixed geo-dashoard stream connection issue
7 years ago
WSO2 Builder b3fac5908f [WSO2 Release] [Jenkins #2537] [Release 3.0.64] prepare for next development iteration
7 years ago
WSO2 Builder bb5fddf56b [WSO2 Release] [Jenkins #2537] [Release 3.0.64] prepare release v3.0.64
7 years ago
Dileesha Rajapakse 83de69a66e Fixing product-iots#1281 (#889)
7 years ago
WSO2 Builder 442e0ab6a6 [WSO2 Release] [Jenkins #2534] [Release 3.0.63] prepare for next development iteration
7 years ago
WSO2 Builder 9680fa8ee1 [WSO2 Release] [Jenkins #2534] [Release 3.0.63] prepare release v3.0.63
7 years ago
WSO2 Builder d78d443b1f [WSO2 Release] [Jenkins #2531] [Release 3.0.62] prepare for next development iteration
7 years ago
WSO2 Builder d604f9048c [WSO2 Release] [Jenkins #2531] [Release 3.0.62] prepare release v3.0.62
7 years ago
Dharmakeerhi Lasantha 919a16affb resolved broken pipe issue (#885)
7 years ago
WSO2 Builder dfad4c3707 [WSO2 Release] [Jenkins #2527] [Release 3.0.61] prepare for next development iteration
7 years ago
WSO2 Builder acf4fb59f1 [WSO2 Release] [Jenkins #2527] [Release 3.0.61] prepare release v3.0.61
7 years ago
WSO2 Builder 4539e47fac [WSO2 Release] [Jenkins #2526] [Release 3.0.60] prepare for next development iteration
7 years ago
WSO2 Builder bba6c32e62 [WSO2 Release] [Jenkins #2526] [Release 3.0.60] prepare release v3.0.60
7 years ago
Lahiru Madushanka c001d96877 Fix for 1261 (#884)
7 years ago
Madawa Soysa db325a637e Truncating applist version if length greater than allowed length (#881)
7 years ago
WSO2 Builder f166be7d54 [WSO2 Release] [Jenkins #2523] [Release 3.0.59] prepare for next development iteration
7 years ago
WSO2 Builder cbdf9ff922 [WSO2 Release] [Jenkins #2523] [Release 3.0.59] prepare release v3.0.59
7 years ago
WSO2 Builder 7abc9e5844 [WSO2 Release] [Jenkins #2520] [Release 3.0.58] prepare for next development iteration
7 years ago
WSO2 Builder b204d2f17d [WSO2 Release] [Jenkins #2520] [Release 3.0.58] prepare release v3.0.58
7 years ago
lasantha 1fc66ed180 Adding generate link api
7 years ago
WSO2 Builder 63a0082c40 [WSO2 Release] [Jenkins #2517] [Release 3.0.57] prepare for next development iteration
7 years ago
WSO2 Builder 534a6b4235 [WSO2 Release] [Jenkins #2517] [Release 3.0.57] prepare release v3.0.57
7 years ago
WSO2 Builder 161657a790 [WSO2 Release] [Jenkins #2515] [Release 3.0.56] prepare for next development iteration
7 years ago
WSO2 Builder 9949209364 [WSO2 Release] [Jenkins #2515] [Release 3.0.56] prepare release v3.0.56
7 years ago
WSO2 Builder 787defbc55 [WSO2 Release] [Jenkins #2513] [Release 3.0.55] prepare for next development iteration
7 years ago
WSO2 Builder c75b82c400 [WSO2 Release] [Jenkins #2513] [Release 3.0.55] prepare release v3.0.55
7 years ago
Imesh Chandrasiri b8e496f57e Fix for tooltip not showing issue in device details page
7 years ago
WSO2 Builder 11c915863c [WSO2 Release] [Jenkins #2510] [Release 3.0.54] prepare for next development iteration
7 years ago
WSO2 Builder 4c5ea04c09 [WSO2 Release] [Jenkins #2510] [Release 3.0.54] prepare release v3.0.54
7 years ago
WSO2 Builder 21f53fc7fe [WSO2 Release] [Jenkins #2507] [Release 3.0.53] prepare for next development iteration
7 years ago
WSO2 Builder 28d9c15b82 [WSO2 Release] [Jenkins #2507] [Release 3.0.53] prepare release v3.0.53
7 years ago
Madhawa Perera 55770caab1 Merge pull request #869 from DimalChandrasiri/master
7 years ago
Rasika Perera 176738b14b Geo Fencing improvements
7 years ago
Imesh Chandrasiri 4427348f69 fixes wso2/product-iot#1243
7 years ago
Imesh Chandrasiri aa6d0da3fd fixes wso2/product-iot#1243
7 years ago
WSO2 Builder 5d603d3bbe [WSO2 Release] [Jenkins #2500] [Release 3.0.52] prepare for next development iteration
7 years ago
WSO2 Builder 941c09fb2d [WSO2 Release] [Jenkins #2500] [Release 3.0.52] prepare release v3.0.52
7 years ago
lasantha e6a7d26ac3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
WSO2 Builder 58880d57bc [WSO2 Release] [Jenkins #2498] [Release 3.0.51] prepare for next development iteration
7 years ago
WSO2 Builder 384debd845 [WSO2 Release] [Jenkins #2498] [Release 3.0.51] prepare release v3.0.51
7 years ago
WSO2 Builder c3de199818 [WSO2 Release] [Jenkins #2497] [Release 3.0.50] prepare for next development iteration
7 years ago
WSO2 Builder 4d215fa3e9 [WSO2 Release] [Jenkins #2497] [Release 3.0.50] prepare release v3.0.50
7 years ago
lasantha 960b3ebc78 Fixing permission issue of creating new device type
7 years ago
Madhawa Perera 831e214f01 Merge pull request #866 from chathurace/rc3
7 years ago
Imesh Chandrasiri 9ce1baa920 change CONFIG keyword to PROFILE
7 years ago
Imesh Chandrasiri 4fe1cd8ccb Fixing device type log not showing issue
7 years ago
Chathura Ekanayake 4092254b19 backend fix for the issue with getting next pending operation of custom devices.
7 years ago
WSO2 Builder 9e10af8abf [WSO2 Release] [Jenkins #2494] [Release 3.0.49] prepare for next development iteration
7 years ago
WSO2 Builder 9e19ca3202 [WSO2 Release] [Jenkins #2494] [Release 3.0.49] prepare release v3.0.49
7 years ago
WSO2 Builder 6969161053 Merge commit '1436561d5dfc66bcf0bac12ee1cc4b12e071816c' into 926f77e3-1750-45d1-a162-eae4b503cf49
7 years ago
WSO2 Builder 1436561d5d [WSO2 Release] [Jenkins #2493] [Release 3.0.48] prepare for next development iteration
7 years ago
WSO2 Builder 67ec2233f7 [WSO2 Release] [Jenkins #2493] [Release 3.0.48] prepare release v3.0.48
7 years ago
Madhawa Perera b4f678870d Merge pull request #863 from Kamidu/master
7 years ago
Rasika Perera b5948b4e58 Fixing text fields alignments
7 years ago
Rasika Perera 54eafe8ac9 Fixing geo fencing issues
7 years ago
WSO2 Builder fd2c6b3341 [WSO2 Release] [Jenkins #2491] [Release 3.0.47] prepare for next development iteration
7 years ago
WSO2 Builder 0eba67108e [WSO2 Release] [Jenkins #2491] [Release 3.0.47] prepare release v3.0.47
7 years ago
Kamidu Sachith Punchihewa 18cf92dc40 Merge pull request #862 from DimalChandrasiri/master
7 years ago
WSO2 Builder e55611e006 [WSO2 Release] [Jenkins #2489] [Release 3.0.46] prepare for next development iteration
7 years ago
WSO2 Builder df463350de [WSO2 Release] [Jenkins #2489] [Release 3.0.46] prepare release v3.0.46
7 years ago
Rasika Perera 669ffcdb94 Fixing Log-in api call per every page load.
7 years ago
kamidu ff18e27ed9 fixing typo in the error message
7 years ago
Imesh Chandrasiri 9a4807b069 Changed code structuring.
7 years ago
Imesh Chandrasiri 13b3f0999d Fixing the issue where bulk actions are shown without bulk action getting triggered in cloud
7 years ago
WSO2 Builder b7d28754c6 [WSO2 Release] [Jenkins #2483] [Release 3.0.45] prepare for next development iteration
7 years ago
WSO2 Builder 7e0a2aceb9 [WSO2 Release] [Jenkins #2483] [Release 3.0.45] prepare release v3.0.45
7 years ago
Madhawa Perera 69eb68afec Merge pull request #859 from geethkokila/master
7 years ago
WSO2 Builder d2900dd395 [WSO2 Release] [Jenkins #2481] [Release 3.0.44] prepare for next development iteration
7 years ago
WSO2 Builder ef8f4acc8c [WSO2 Release] [Jenkins #2481] [Release 3.0.44] prepare release v3.0.44
7 years ago
Dileesha Rajapakse fc5e84796f Fixing Device Status search filter
7 years ago
Dileesha Rajapakse d8ffa23a42 Fixing Device Type search filter
7 years ago
geethkokila fe371ae693 Fixing the activity issue with large data set
7 years ago
WSO2 Builder c7c9432768 [WSO2 Release] [Jenkins #2479] [Release 3.0.43] prepare for next development iteration
7 years ago
WSO2 Builder 75be6d2884 [WSO2 Release] [Jenkins #2479] [Release 3.0.43] prepare release v3.0.43
7 years ago
WSO2 Builder 993c1d7d2c [WSO2 Release] [Jenkins #2478] [Release 3.0.42] prepare for next development iteration
7 years ago
WSO2 Builder e958d0b2a9 [WSO2 Release] [Jenkins #2478] [Release 3.0.42] prepare release v3.0.42
7 years ago
Madhawa Perera 8934dc2055 Merge pull request #857 from rasika/geo-fence-issues
7 years ago
Rasika Perera 575d06f513 Geofencing refactoring
7 years ago
Rasika Perera ba0a869cdd Avoid calling geo service when geoFencing disabled
7 years ago
WSO2 Builder 09607fc4c2 [WSO2 Release] [Jenkins #2475] [Release 3.0.41] prepare for next development iteration
7 years ago
WSO2 Builder 791a85e79b [WSO2 Release] [Jenkins #2475] [Release 3.0.41] prepare release v3.0.41
7 years ago
kamidu 999ca58f7e registry version bump
7 years ago
WSO2 Builder 5b968f4fe5 [WSO2 Release] [Jenkins #2473] [Release 3.0.40] prepare for next development iteration
7 years ago
WSO2 Builder 122678f3d4 [WSO2 Release] [Jenkins #2473] [Release 3.0.40] prepare release v3.0.40
7 years ago
Dileesha Rajapakse 2d050102af Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
Hasunie ac3e110583 fixing updateEnrollment status issue
7 years ago
Dileesha Rajapakse 18ccb8ec03 Refactored device.js
7 years ago
WSO2 Builder 8fd9960913 [WSO2 Release] [Jenkins #2468] [Release 3.0.39] prepare for next development iteration
7 years ago
WSO2 Builder 92aa96ee18 [WSO2 Release] [Jenkins #2468] [Release 3.0.39] prepare release v3.0.39
7 years ago
Dileesha Rajapakse 6cff453b24 Fixing redirection upon user session expiration issues
7 years ago
Dileesha Rajapakse eadb7ea02a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
sameera910409 9db742e95a fixing https://github.com/wso2/product-iots/issues/1136 : DeviceDetailsRetrieverTask attempts to add operations to a device that has been removed
7 years ago
Dileesha Rajapakse 90099449d3 Fixing issue 1184 - Redirection not handled upon session expiration
7 years ago
Imesh Chandrasiri 4bfdec95f9 Temparory remove of device statistics
7 years ago
geethkokila afe312152f Fixing https://github.com/wso2/product-iots/issues/1007
7 years ago
WSO2 Builder 94d270863e [WSO2 Release] [Jenkins #2466] [Release 3.0.38] prepare for next development iteration
7 years ago
WSO2 Builder c29d83afeb [WSO2 Release] [Jenkins #2466] [Release 3.0.38] prepare release v3.0.38
7 years ago
Rasika Perera c6cce05b11 Merge pull request #845 from rasika/cloud-fixes
7 years ago
WSO2 Builder 47ce6f4271 [WSO2 Release] [Jenkins #2464] [Release 3.0.37] prepare for next development iteration
7 years ago
WSO2 Builder 5dc7dc5442 [WSO2 Release] [Jenkins #2464] [Release 3.0.37] prepare release v3.0.37
7 years ago
WSO2 Builder 5acea60aef Merge commit '91456df809816dfecda50082aeafe1192ee09fc0' into 240ffbb1-c967-4109-b74d-1eb6335f277e
7 years ago