Commit Graph

2229 Commits (e993ad36010dcfcca51b631f336fd2cf72bddd53)

Author SHA1 Message Date
harshanl 7dc93ff010 MSSQL script fixes and added the /users/count REST API
8 years ago
Imesh Chandrasiri 690bd7de5c modal popup changes
8 years ago
Rasika Perera 940f2aaede Merge pull request #348 from DimalChandrasiri/theme-migration
8 years ago
harshanl d60daae97f MSSQL fixes to dbscrpits and DAO layer
8 years ago
Imesh Chandrasiri 613d0ff7be Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Imesh Chandrasiri f42215a926 Adding modal code changes
8 years ago
kamidu c2471fc2bb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu 2cd5a0e659 Enable permission check according to the new permissions
8 years ago
Rasika Perera 432c46601b Fixing breadcrumb height issue
8 years ago
Rasika Perera cfa32cf75c Fixing icons background color issue
8 years ago
dilanua 2d864bf02e Removing unnecessary spacing provided for operation-bar - UI
8 years ago
harshanl 1e00a012a8 Removed unnecessary import statements
8 years ago
harshanl 0ee6110b3d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
mharindu ce1f5c5701 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
mharindu 115099c8fe Implemented permission based authorization
8 years ago
dilanua 4fe79be5f8 Updating datatables server-side-paging module
8 years ago
dilanua 9e9f3e859a Updating custom-desktop.css to remove unnecessary bottom border of operation-bar
8 years ago
kamidu f5e1fee561 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu 411641bc57 Enable permission check according to the new permissions
8 years ago
charitha de6f2558c5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
charitha 2fde165b7c Fix SQL error when could happen due to duplicate enrollments.
8 years ago
Rasika Perera 5157cb81f8 Merge pull request #345 from thusithak/theme-migration
8 years ago
thusithakalugamage e80daf7709 responsive small device view defect fixes
8 years ago
harshanl e72d3147f0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua d24ba98643 Updating activate and deactivate policy endpoints from PUT to POST
8 years ago
harshanl b7ffaf0b0f Fixed issues in DAO implementations and MSSQL db script
8 years ago
dilanua a74862d73b Updating policy module - UI
8 years ago
Rasika Perera f37c2c6de8 Fixing requesting invalid url for Roboto-Regular web font
8 years ago
Rasika Perera 887322b716 Merge pull request #344 from DimalChandrasiri/theme-migration
8 years ago
dilanua 795fbcb366 Updating ios operation endpoints - UI
8 years ago
Imesh Chandrasiri f898ed838c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Imesh Chandrasiri 2786c576ea Merge Conflicts Fixed
8 years ago
harshanl 0479742bc4 Fixed a minor issue in GCM notification provider
8 years ago
Imesh Chandrasiri fe0bdb9ba6 Merge Conflicts Fixed
8 years ago
Imesh Chandrasiri d1acfe1503 Modal Changes added
8 years ago
harshanl bdb5b970fd Removed access modifiers from Interface APIs
8 years ago
harshanl 8e6c15acf2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua e881aa6da4 Fixing Role Editing UI
8 years ago
dilanua c57e9eba3a Updating Roles listing UI to dynamically fetch app-context
8 years ago
dilanua 0427a6dd4b Refactoring Role Create UI - moving units to page
8 years ago
dilanua 934c45cd95 Adding role creation UI
8 years ago
dilanua 746a4d4372 Refactoring roles listing UI - merging srcs in units to page
8 years ago
dilanua fd6ddf7a52 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua 677385920e Updating User Listing UI
8 years ago
Rasika Perera ad5c97e354 Temporary resolving WARN logs for css fonts on the theme.
8 years ago
dilanua 687efa97b1 Updating Role Listing UI
8 years ago
dilanua eedb66ec45 Updating User Listing UI
8 years ago
dilanua 6f28bf1d94 Updating User Listing UI
8 years ago
dilanua 32fc58c917 Updating User Listing UI
8 years ago
dilanua 54807b99ee Updating role listing UI
8 years ago
Rasika Perera 8148b5b06c Separating CDMF base app and uuf-template app
8 years ago
Imesh Chandrasiri 4a69e162b3 Modal Changes added
8 years ago
Imesh Chandrasiri 1ed6213916 Modal Changes added
8 years ago
harshanl 54112a3f3d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
charitha 3575c9a33d Fix issue in get devices with since parameter.
8 years ago
Chatura Dilan Perera f29b9e84f2 Fixed 200 returns when activities are empty and since is a future date
8 years ago
harshanl 6554368bfa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
harshanl 551d77bd62 Refactored OperationMgr code
8 years ago
kamidu cd77ce692e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu abb3aea9a9 fixes for notification isses
8 years ago
harshanl 675843d7f7 Added Valid device list to Activity response
8 years ago
harshanl a77564ac2d Added status for each device in Activity response
8 years ago
Chatura Dilan Perera 9aa5f2793f return date format as UTC in APIs
8 years ago
Chatura Dilan Perera 475b832c59 Changed return date format to UTC date
8 years ago
Chatura Dilan Perera 83442b0bca Fixed issue in activity retrival
8 years ago
Chatura Dilan Perera 29d6b38d15 Fixed issue in activity getting with response
8 years ago
Chatura Dilan Perera 40cabd0064 Merge branch 'master' of github.com:wso2/carbon-device-mgt
8 years ago
Chatura Dilan Perera 549a2773f2 Fixed issue releated to activity api since
8 years ago
harshanl 624bf7c7b4 Fixed EMM-1518
8 years ago
harshanl 56f23a83fc changed comments
8 years ago
hasuniea 1ebf4e2c7c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
hasuniea d1e058ce8e fixing api-mgt upgrading issues
8 years ago
Imesh Chandrasiri e02264099b Adding user menu update
8 years ago
thusithakalugamage 00bf595cb2 moving wso2 theme to emm - removing duplicated styles for buttons and links, navbar style update
8 years ago
thusithakalugamage 42a3d5f7e5 moving wso2 theme to emm - modal window content positioning and background fixes
8 years ago
thusithakalugamage b5fda80377 emm login page layouts updated to wso2 theme markup
8 years ago
thusithakalugamage b67b34e831 cdmf navbar hamburger menu and menu open state icons correction
8 years ago
thusithakalugamage 6b5d884fd5 vertical tab component bottom margin defect fix
8 years ago
thusithakalugamage 333e05dcc5 Merge branch 'theme-migration' of https://github.com/DimalChandrasiri/carbon-device-mgt into theme-migration
8 years ago
thusithakalugamage ee856d6b8b moving wso2 theme to emm - link hover defect fix
8 years ago
thusithakalugamage cd6cf9f6b3 moving wso2 theme to emm - navbar cllapse color fixes
8 years ago
thusithakalugamage 849c2a4f55 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Imesh Chandrasiri 5cdafa04a6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Imesh Chandrasiri 802d5e5fe9 Markup change to suite the padding
8 years ago
thusithakalugamage aa23239f40 moving wso2 theme to emm - layout color update
8 years ago
Charitha Goonetilleke 9e0edf84ab Merge pull request #337 from charithag/master
8 years ago
harshanl 811d225bc3 Fixed adding operations to invalid devices
8 years ago
charitha 0fe827ca9f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
charitha 579d91bd79 Fix issue in get devices with since parameter.
8 years ago
Imesh Chandrasiri 4bebb77d5f Merge branch 'theme-migration' of https://github.com/thusithak/carbon-device-mgt into theme-migration
8 years ago
thusithakalugamage 1a2c6ec8eb moving wso2 theme to emm - layout
8 years ago
Imesh Chandrasiri 8a17ec9e48 Changing the login button to new theme
8 years ago
charitha 9246cdcf30 Return empty array when results not found with since parameter
8 years ago
Chatura Dilan Perera 763993263c Merge branch 'master' of github.com:wso2/carbon-device-mgt
8 years ago
Chatura Dilan Perera 16e6e12436 Fixed issue in Activity API returning one activity
8 years ago
thusithakalugamage 1f7b618d5a moving wso2 theme to emm - layout
8 years ago
Saad Sahibjan a72b47f6f7 Fixing incorrect response for remove policy
8 years ago
harshanl f3aefcca77 Fixed EMM-1450
8 years ago
hasuniea e723761344 fixing code conflicts
8 years ago
Chatura Dilan Perera 8b17cbb339 Fix conflicts
8 years ago
hasuniea b3582f9d47 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua 7bc927fbd0 Removing obsolete constants from constants.js - UI
8 years ago
dilanua fbd51e31c0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua 13e2381293 Updating OAuth Utils - UI
8 years ago
Chatura Dilan Perera 654e1d9938 [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera aa24821667 [maven-release-plugin] prepare release v1.1.2
8 years ago
harshanl 67942d5c1d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua 0ba6edf36d Updating utility.js and removing unused config files - UI
8 years ago
dilanua e32c9c0bdb Updating init.js module - UI
8 years ago
dilanua f61b929bfd Updating data-tables API - UI
8 years ago
dilanua 78b5cf9fb3 Updating user APIs - UI
8 years ago
dilanua 4eaa3be491 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua 83498b1039 Updating operation APIs
8 years ago
kamidu 8eeabcee2c Fix for Jira issue EMM-1418
8 years ago
hasuniea 1ba598a93e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua 6b4ab635af Fixing jiras: EMM-1472, EMM-1505
8 years ago
charitha 3d19d9ed2e Add MySQLOperationDAOImpl for row locking.
8 years ago
hasuniea 6db619317c fixing app-install issue
8 years ago
harshanl 2cb8f0b313 Fixed EMM-1392
8 years ago
harshanl d81733a4d6 Removed unused class
8 years ago
kamidu 4506db3647 Fix notification view issue
8 years ago
kamidu 77a8fed7de Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
hasuniea 5c57b664ad fixing getAllActivity H2 issue
8 years ago
Ruwan 6134f94e3c Merge pull request #332 from ayyoob/com
8 years ago
hasuniea 282f53bf09 Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.3
8 years ago
hasuniea c269f35ef2 fixing getAllActivity H2 issue
8 years ago
harshanl d628699e8b Fixed repeating task operations.
8 years ago
mharindu af286b8aaf Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
mharindu 7346313d27 Modified scope management service
8 years ago
harshanl 2bf6f562df Fixed repeating task operations.
8 years ago
kamidu 28760d2bee Enable advanced search for devices
8 years ago
dilanua b37687cb58 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua 8cb26b3264 Fixing no api resource found issue: changing user credentials
8 years ago
ayyoob a7c201363c logged exception trace
8 years ago
ayyoob 442c2b86da fixed formatting issues
8 years ago
ayyoob 892d5cee20 avoided lazy inialization
8 years ago
harshanl a7d7c689e8 Removed unsupported roleName parameter from device API
8 years ago
harshanl 671ba46fae Removed unnecessary properties from EnrollmentInfo object
8 years ago
harshanl d401741d9b Fixed EMM-1492
8 years ago
Ace e5a4c0f795 Adding role add/update/delete related changes
8 years ago
ayyoob e45ba68a90 changing the context of device-types api
8 years ago
ayyoob 3b56668af0 merged with upstream
8 years ago
ayyoob c04edef151 Added Certificate Configuration
8 years ago
dilanua fcff1f0854 Fixing user menu reg exp issue
8 years ago
dilanua 106051a0a5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua e07991174d Adding user password change UI
8 years ago
kamidu 83cbd56b03 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu 0be419d6cc Fix ui issues in device view section
8 years ago
dilanua f71106d011 Fixing issues on Password Reset UI
8 years ago
dilanua 0836b2c99e Fixing user create page QR-generation issues
8 years ago