Commit Graph

2315 Commits (359bd8f3177b652e0960ee7d24746c087445f92c)

Author SHA1 Message Date
Ace 5f90587564 Synching with master
8 years ago
Chatura Dilan Perera 7395c76408 Merge branch 'master' of github.com:wso2/carbon-device-mgt
8 years ago
Ace 33d8829540 Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
8 years ago
dilanua 81c684be50 Refactoring user-menu - UI
8 years ago
dilanua d8e057abdd Fix for JIRA: https://wso2.org/jira/browse/EMM-1582
8 years ago
dilanua 6fea974c90 Refactoring notifications side-pane - UI
8 years ago
dilanua ce1a063688 Refactoring notifications side-pane - UI
8 years ago
dilanua 9a095fa670 Refactoring change password modal - UI
8 years ago
Ace 87ad1e0e71 Fixing intermittent jackson bind issue
8 years ago
dilanua b16f0fd592 Refactoring change password modal - UI
8 years ago
Ace 099ffd6a74 Updating velocity dependencies to OSGI enabled bundle version
8 years ago
Chatura Dilan Perera 50d8885f8b [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera a00d6aafd4 [maven-release-plugin] prepare release v1.2.1
8 years ago
harshanl 75df243a33 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Ace 6a8a5cbd5a Merging with master
8 years ago
harshanl 4169d3b2bd Fixed EMM-1554
8 years ago
dilanua b4e4b114a5 Updating dashboard title
8 years ago
dilanua e8571b7b65 Updating operation-mod with windows operation apis
8 years ago
dilanua 408e10a890 Changing admin dashboard name to 'Navigating Dashboard' - UI
8 years ago
dilanua 713c8ac4d8 Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations
8 years ago
dilanua cd66f64945 Correcting typo: diableScreenCapture to disableScreenCapture - Operation-mod & Policy UI
8 years ago
dilanua 37131afb4a Adding radio:checked and input[type=hidden] support to operation mod - UI
8 years ago
dilanua e4dae67fea Changing permissions - /devices/any to /devices/any-device
8 years ago
dilanua 58f8656e94 Changing permissions - /devices/owning to /devices/owning-device
8 years ago
Rasika Perera d9b25eda08 Adding deviceName into notifications
8 years ago
Dilan U. Ariyaratne 1651ade4a7 Merge pull request #357 from thusithak/master
8 years ago
Dilan U. Ariyaratne df7c54b1af Merge pull request #356 from DimalChandrasiri/theme-migration
8 years ago
thusithakalugamage 2f5d90cb6c [EMM-1571] Add policies page wizard styling and layout defects
8 years ago
harshanl 5b0e99aeff Fixed EMM-1562
8 years ago
harshanl 78cab76101 Fixed EMM-1531
8 years ago
Imesh Chandrasiri 1599b84e54 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Imesh Chandrasiri e2576b21a8 Adding default button class to modal popups
8 years ago
kamidu a448959fe0 Fix for EMM-1548
8 years ago
Ace 1dfb8e22e1 Updating to latest appm/apim/identity dependencies
8 years ago
kamidu e2d0f7d040 Fix for EMM-1559
8 years ago
Imesh Chandrasiri 3e5064feed Fix for datatable icon size change on pagination
8 years ago
Imesh Chandrasiri 9573bce48f Fix for datatable icon size change on pagination
8 years ago
Imesh Chandrasiri 317252ebb0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Rasika Perera 1d7546916c Changes to the policiesCount, rolesCount, usersCount methods
8 years ago
Rasika Perera 0fab418187 Fixing invalid device count and group count
8 years ago
Imesh Chandrasiri b56fb667b7 Modal fixes
8 years ago
kamidu d7c7315f16 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu 70dd5ded77 Fix for the policy edit internal server issue
8 years ago
Dilan U. Ariyaratne 3cbaecfbbf Merge pull request #355 from DimalChandrasiri/theme-migration
8 years ago
thusithakalugamage 144dd92c47 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
thusithakalugamage d2a44647dd [EMM-1549] - Heading defect fix
8 years ago
dilanua 00d79c9ece Changing certificates breadcrumb name from certificate to certificates - UI
8 years ago
Imesh Chandrasiri 7a452d09ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Imesh Chandrasiri e3b230937e Remove data table styles
8 years ago
thusithakalugamage 4cb5238112 [EMM-1543] styling defect fix
8 years ago
thusithakalugamage 3b3962b772 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
thusithakalugamage 0273a6e369 responsive tab panel component - markup rewrite for uuf
8 years ago
dilanua 6aa01d2e7a Fixing NPE issue in token-protected-service-invokers - UI
8 years ago
Chatura Dilan Perera de23a8cf27 [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera 8905fae0d9 [maven-release-plugin] prepare release v1.2.0
8 years ago
Rasika Perera ae7f4b8373 Adding permission update error message box
8 years ago
Rasika Perera 7edc7f29db Fixing role add permission update issue
8 years ago
harshanl 0eaf33aa5c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
harshanl 87a5b09266 Added users/count API
8 years ago
thusithakalugamage 6825a87bb9 button component - active and focus style defect fix
8 years ago
thusithakalugamage c871fbcdad Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
thusithakalugamage b2cde2228f wizard component - layout defect fixes
8 years ago
thusithakalugamage 0d02e88955 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Imesh Chandrasiri b08aeefbbc Modal Changes
8 years ago
kamidu 2ec2600471 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
harshanl 671ef77b63 Fixed EMM-1107 issue
8 years ago
Imesh Chandrasiri 8f68a3658e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Imesh Chandrasiri f908738659 Modal Changes
8 years ago
Rasika Perera 8e247bda62 Fixing font warning on page load
8 years ago
Rasika Perera 4d0fd67539 Adding missing woff2 fonts
8 years ago
kamidu 0fdcbae817 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu 878daae5c5 Permission modifications
8 years ago
Imesh Chandrasiri 47b46c50b0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
thusithakalugamage 42c6500a31 adding responsive, date addition and version number update
8 years ago
Chatura Dilan Perera 2d5262e21e [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera 5ccd752404 [maven-release-plugin] prepare release v1.2.0
8 years ago
thusithakalugamage ef646800fa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
thusithakalugamage dc23e55444 responsive tab panel component - style changes
8 years ago
Imesh Chandrasiri d182c194ed removing data table css from custom.desktop.css
8 years ago
harshanl 2f1c03ae1f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua 7a0e52e8f9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua 6a9225d249 Updating device module for permissions - Ui
8 years ago
harshanl 97cb3cc015 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
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
mharindu 24930b3042 Partial commit of migration
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