Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #12941 from owncloud/wave-accessibility-compliance | Morris Jobke | 2014-12-19 | 1 | -6/+15 |
|\ | | | | | Wave accessibility compliance | ||||
| * | more alt text and label fixes in Personal settings | Jan-Christoph Borchardt | 2014-12-18 | 1 | -6/+15 |
| | | |||||
* | | Merge pull request #12759 from owncloud/core-reduce-js-and-css | Jörn Friedrich Dreyer | 2014-12-18 | 2 | -0/+2 |
|\ \ | | | | | | | make sure styles and scripts are only loaded once | ||||
| * | | load showpassord.js conditionally in the template only if needed | Thomas Müller | 2014-12-16 | 2 | -0/+2 |
| | | | |||||
* | | | Merge pull request #12870 from owncloud/send-mail-new-user | Thomas Müller | 2014-12-18 | 7 | -10/+169 |
|\ \ \ | |_|/ |/| | | Send mail for new users | ||||
| * | | add unit tests for new user create mail | Morris Jobke | 2014-12-16 | 1 | -2/+8 |
| | | | |||||
| * | | Send mail for new users | Morris Jobke | 2014-12-16 | 7 | -10/+163 |
| |/ | | | | | | | | | | | * supply mail address * send mail with username and URL to that mail address * option to temporary enable this feature | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-18 | 4 | -6/+14 |
| | | |||||
* | | Merge pull request #12820 from owncloud/user-management-on-large-screens | Robin McCorkell | 2014-12-18 | 1 | -4/+16 |
|\ \ | | | | | | | fix initial loading limit of user management on large screens | ||||
| * | | fix initial loading limit of user management on large screens | Morris Jobke | 2014-12-12 | 1 | -4/+16 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-17 | 2 | -0/+20 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-16 | 4 | -0/+20 |
| | | |||||
* | | Merge pull request #12625 from owncloud/app-dependencies-libs-and-commands | Bernhard Posselt | 2014-12-15 | 3 | -7/+12 |
|\ \ | | | | | | | adding dependencies for command line tools and php libraries | ||||
| * | | rework api of DependencyAnalyzer | Thomas Müller | 2014-12-12 | 1 | -3/+3 |
| | | | |||||
| * | | adjust styling of missing dependencies in apps management | Thomas Müller | 2014-12-11 | 2 | -4/+9 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-15 | 4 | -0/+14 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-14 | 16 | -0/+46 |
| | | | |||||
* | | | Merge pull request #12726 from owncloud/add-filter-for-backend-to-rest-index | Morris Jobke | 2014-12-13 | 1 | -17/+41 |
|\ \ \ | |_|/ |/| | | Add filter for backend to rest index | ||||
| * | | Make comment clear | Lukas Reschke | 2014-12-12 | 1 | -1/+1 |
| | | | |||||
| * | | Comment code path | Lukas Reschke | 2014-12-12 | 1 | -0/+1 |
| | | | |||||
| * | | Use limit and offset | Lukas Reschke | 2014-12-12 | 1 | -1/+1 |
| | | | |||||
| * | | Use array key instead of value | Lukas Reschke | 2014-12-12 | 1 | -1/+1 |
| | | | |||||
| * | | Break loop | Lukas Reschke | 2014-12-11 | 1 | -0/+1 |
| | | | |||||
| * | | Add filter for 'backend' to user REST route | Lukas Reschke | 2014-12-10 | 1 | -17/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | This adds a "backend" type filter to the index REST route which is a pre-requisite for https://github.com/owncloud/core/issues/12620 For example when calling `index.php/settings/users/users?offset=0&limit=10&gid=&pattern=&backend=OC_User_Database` only users within the backend `OC_User_Database` would be shown. (requires sending a CSRF token as well) Depends upon https://github.com/owncloud/core/pull/12711 | ||||
* | | | Show user backend in user management | Morris Jobke | 2014-12-12 | 5 | -22/+47 |
| | | | | | | | | | | | | | | | | | | | | | * add switch to settings to show user backend * user classes for headers and rows to unify the show/hide statement * add user backend to response of user create request * proper markup in settings area | ||||
* | | | Merge pull request #12790 from owncloud/user-mngt-js-only | Morris Jobke | 2014-12-12 | 4 | -112/+70 |
|\ \ \ | | | | | | | | | remove PHP generated user list and move all to the existing JS part | ||||
| * | | | add comments to user list JS for better understanding | Morris Jobke | 2014-12-12 | 1 | -0/+26 |
| | | | | |||||
| * | | | move loading of JS and CSS to template | Morris Jobke | 2014-12-12 | 2 | -8/+13 |
| | | | | |||||
| * | | | remove PHP generated user list and move all to the existing JS part | Morris Jobke | 2014-12-12 | 3 | -104/+31 |
| | |/ | |/| | |||||
* / | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-12 | 8 | -0/+56 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-11 | 16 | -6/+44 |
| | | |||||
* | | Merge pull request #12611 from owncloud/use-uid-instead-of-loginname | Lukas Reschke | 2014-12-10 | 1 | -1/+1 |
|\ \ | |/ |/| | Use UID instead of login name | ||||
| * | Use UID instead of login name | Lukas Reschke | 2014-12-04 | 1 | -1/+1 |
| | | | | | | | | Login name can be something different and thus I'm pretty sure this will break in combination with external auth providers such as LDAP. | ||||
* | | Merge pull request #12711 from owncloud/add-backend-to-rest-index | Lukas Reschke | 2014-12-10 | 2 | -51/+52 |
|\ \ | | | | | | | Expose backend type via REST API | ||||
| * | | Expose backend type via REST API | Lukas Reschke | 2014-12-09 | 2 | -51/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change will expose the user backend via the REST API which is a pre-requisite for https://github.com/owncloud/core/issues/12620. For example: ````json [{"name":"9707A09E-CA9A-4ABE-A66A-3F632F16C409","displayname":"Document Conversion User Account","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/9707A09E-CA9A-4ABE-A66A-3F632F16C409","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"ED86733E-745C-4E4D-90CB-278A9737DB3C","displayname":"Hacker","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/ED86733E-745C-4E4D-90CB-278A9737DB3C","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"71CDF45B-E125-450D-983C-D9192F36EC88","displayname":"admin","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/71CDF45B-E125-450D-983C-D9192F36EC88","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"admin","displayname":"admin","groups":["admin"],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/admin","lastLogin":"1418057287","backend":"OC_User_Database"},{"name":"test","displayname":"test","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/test","lastLogin":0,"backend":"OC_User_Database"}] ``` | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-10 | 70 | -70/+156 |
| | | | |||||
* | | | Merge pull request #11214 from owncloud/issue/10836 | Morris Jobke | 2014-12-09 | 2 | -1/+7 |
|\ \ \ | | | | | | | | | Add an option to disallow sending sharing emails to non-owncloud users | ||||
| * | | | Add an option to disallow sending sharing emails to non-owncloud users | Joas Schilling | 2014-12-09 | 2 | -1/+7 |
| | | | | | | | | | | | | | | | | Fix #10836 | ||||
* | | | | Fix namespace of Files_Encryption outside of the app | Joas Schilling | 2014-12-09 | 2 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #12406 from owncloud/drop-getApps-getUsers | Thomas Müller | 2014-12-09 | 5 | -12/+15 |
|\ \ \ | | | | | | | | | Config cleanup - OC_Preferences refactoring | ||||
| * | | | reduce OC_Preferences, OC_Config and \OCP\Config usage | Morris Jobke | 2014-12-08 | 5 | -12/+15 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * files_encryption * files_versions * files_trashbin * tests * status.php * core * server container | ||||
* / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-09 | 118 | -600/+2 |
|/ / | |||||
* | | Merge pull request #12618 from owncloud/initial-work-migrate-to-appframework | Lukas Reschke | 2014-12-08 | 16 | -358/+589 |
|\ \ | | | | | | | Add REST route for managing groups and users | ||||
| * | | React on other statuscodes than 200 | Lukas Reschke | 2014-12-08 | 4 | -67/+45 |
| | | | |||||
| * | | Merge branch 'initial-work-migrate-to-appframework' of ↵ | Lukas Reschke | 2014-12-08 | 1 | -7/+5 |
| |\ \ | | | | | | | | | | | | | https://github.com/owncloud/core into initial-work-migrate-to-appframework | ||||
| | * | | fix updated URL schema in JS unit tests | Morris Jobke | 2014-12-08 | 1 | -7/+5 |
| | | | | |||||
| * | | | Add statuscodes | Lukas Reschke | 2014-12-08 | 2 | -13/+27 |
| | | | | |||||
| * | | | Fix url | Lukas Reschke | 2014-12-08 | 1 | -1/+1 |
| |/ / | |||||
| * | | Add REST route for user & group management | Lukas Reschke | 2014-12-08 | 15 | -301/+542 |
| | | | | | | | | | | | | First step of a somewhat testable user management. - I know, the JSON returns are in an ugly format but the JS expects it that way. So let's keep it that way until we have time to fix the JS in the future. | ||||
* | | | Remove unexisting `htAccessWorkinght` | Lukas Reschke | 2014-12-08 | 1 | -1/+1 |
|/ / | | | | | | | Partially fixes https://github.com/owncloud/core/issues/12690 - remark to myself: improve grep skills. |