Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | move hardcoded color to CSS class - for themeability | Morris Jobke | 2014-08-29 | 2 | -2/+6 |
| | |||||
* | also add minimum width for quota bar so it’s apparent how it will look | Jan-Christoph Borchardt | 2014-08-29 | 1 | -0/+1 |
| | |||||
* | color quota bar yellow for feedback if usage is over 90% | Jan-Christoph Borchardt | 2014-08-29 | 1 | -1/+2 |
| | |||||
* | set quota bar maximum to 100% to prevent overflow | Jan-Christoph Borchardt | 2014-08-29 | 1 | -1/+3 |
| | |||||
* | Merge pull request #9214 from owncloud/wizard_email_detection | Morris Jobke | 2014-08-29 | 5 | -41/+273 |
|\ | | | | | LDAP: Wizard email attribute detection | ||||
| * | adjust static method vars as well | Arthur Schiwon | 2014-08-29 | 1 | -2/+4 |
| | | |||||
| * | trigger email detection by Wizard upon any user filter filter change. before ↵ | Arthur Schiwon | 2014-08-29 | 5 | -13/+30 |
| | | | | | | | | it happenend only upon user automatic list filter creation, but not on manual editing | ||||
| * | undo falsely changed log file | Arthur Schiwon | 2014-08-29 | 1 | -1/+1 |
| | | |||||
| * | write log message, if original value was changed | Arthur Schiwon | 2014-08-29 | 1 | -0/+8 |
| | | |||||
| * | add unit test for mail detection | Arthur Schiwon | 2014-08-29 | 3 | -3/+140 |
| | | |||||
| * | remove Access as hard dependency, inject it instead | Arthur Schiwon | 2014-08-29 | 3 | -37/+41 |
| | | |||||
| * | Wizad: email attribute detection | Arthur Schiwon | 2014-08-29 | 1 | -0/+64 |
| | | |||||
* | | Merge pull request #9684 from owncloud/fix-9367 | Morris Jobke | 2014-08-29 | 5 | -46/+72 |
|\ \ | | | | | | | Ability to show/hide last log in and storage location in user management | ||||
| * | | user mgmt: move 'Show storage location' and 'Show last log in' to settings area | Jan-Christoph Borchardt | 2014-08-29 | 4 | -56/+46 |
| | | | |||||
| * | | Adds 2 checkboxes at the top of userlist in the settings, to display/hide ↵ | Stephane V | 2014-08-28 | 3 | -1/+37 |
| | | | | | | | | | | | | | | | | | | optional columns This fixes #9367. | ||||
* | | | Merge pull request #10724 from owncloud/min-size-for-icons | Morris Jobke | 2014-08-29 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | define min height/width for icon classes to make sure they show | ||||
| * | | | define min height/width for icon classes to make sure they show | Jan-Christoph Borchardt | 2014-08-29 | 1 | -0/+2 |
|/ / / | |||||
* | | | Merge pull request #10719 from owncloud/files-external-personal-undefined | Thomas Müller | 2014-08-29 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Prevent undefined index error loading external storages | ||||
| * | | | Add missing 'personal' mount configuration option | Robin McCorkell | 2014-08-29 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #9681 from owncloud/kill_oc_session | Lukas Reschke | 2014-08-29 | 28 | -95/+142 |
|\ \ \ \ | | | | | | | | | | | kill OC::$session | ||||
| * | | | | be correct in deprecation documentation | Jörn Friedrich Dreyer | 2014-08-29 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | kill OC::$session | Jörn Friedrich Dreyer | 2014-08-29 | 28 | -95/+142 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maintain deprecated \OC::$session when getting or setting the session via the server container or UserSession restore order os OC::$session and OC::$CLI remove unneded initialization of dummy session write back session when $useCustomSession is true log warning when deprecated app is used | ||||
* | | | | Merge pull request #10701 from owncloud/tests-momentjsinclude | Thomas Müller | 2014-08-29 | 1 | -1/+2 |
|\ \ \ \ | |/ / / |/| | | | Include momentjs for unit tests | ||||
| * | | | Include momentjs for unit tests | Vincent Petry | 2014-08-29 | 1 | -1/+2 |
| | |/ | |/| | |||||
* | | | Merge pull request #10637 from owncloud/fixing-js-issues | Thomas Müller | 2014-08-29 | 2 | -0/+4 |
|\ \ \ | | | | | | | | | Init vars with a value if none is provided | ||||
| * | | | Init vars with a value if none is provided | Clark Tomlinson | 2014-08-28 | 2 | -0/+4 |
| | | | | |||||
* | | | | Merge pull request #10703 from owncloud/sometimes-allow-horizontal-scrollbar | Thomas Müller | 2014-08-29 | 1 | -0/+4 |
|\ \ \ \ | |_|_|/ |/| | | | allow horizontal scrollbar for personal and admin settings | ||||
| * | | | allow horizontal scrollbar for personal and admin settings | Jan-Christoph Borchardt | 2014-08-28 | 1 | -0/+4 |
| | |/ | |/| | |||||
* / | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-29 | 729 | -11741/+4273 |
|/ / | |||||
* | | Merge pull request #10647 from owncloud/implementing_momentjs | Clark Tomlinson | 2014-08-28 | 4 | -32/+30 |
|\ \ | | | | | | | Implementing momentjs | ||||
| * | | Implementing moment.js | Clark Tomlinson | 2014-08-28 | 4 | -32/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | Updating Usages Removing unused method Adding JS Doc | ||||
* | | | Merge pull request #10658 from owncloud/sftp_prevent_error | Vincent Petry | 2014-08-28 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | Prevent errors on broken SFTP config | ||||
| * | | | Prevent errors on broken SFTP config | Robin McCorkell | 2014-08-27 | 1 | -0/+3 |
| | | | | |||||
* | | | | Merge pull request #10696 from owncloud/inputdate | Bernhard Posselt | 2014-08-28 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Enhancement: Adds input styles to input type dates too. | ||||
| * | | | | Enhancement: Adds input styles to input type dates too. | raghunayyar | 2014-08-28 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Merge pull request #8507 from owncloud/ajaxify_user_list_for_files_external | blizzz | 2014-08-28 | 67 | -58/+5681 |
|\ \ \ \ | | | | | | | | | | | Ajaxify user list for files external | ||||
| * | | | | Use AppFramework instead of custom controller | Lukas Reschke | 2014-08-25 | 5 | -40/+88 |
| | | | | | |||||
| * | | | | use displayname lookup route in files_external settings | Jörn Friedrich Dreyer | 2014-08-25 | 1 | -31/+14 |
| | | | | | |||||
| * | | | | add lookup route for displaynames | Jörn Friedrich Dreyer | 2014-08-25 | 2 | -0/+35 |
| | | | | | |||||
| * | | | | no need to load user display names | Jörn Friedrich Dreyer | 2014-08-25 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | fix deletion of shares | Jörn Friedrich Dreyer | 2014-08-25 | 1 | -21/+22 |
| | | | | | |||||
| * | | | | replace chosen with select2 to provide ajaxified user and group selection ↵ | Jörn Friedrich Dreyer | 2014-08-25 | 8 | -62/+188 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for files_external, fixes #7499 remove minified select2 js show avatars for users, simpler results remove unneeded users and groups from settings template fix css, escape user and group names | ||||
| * | | | | add select2 to app specific thirdparty | Jörn Friedrich Dreyer | 2014-08-25 | 60 | -0/+5431 |
| | | | | | |||||
* | | | | | fix wizard test, adjust to changed parameters of the tested method, ↵ | Arthur Schiwon | 2014-08-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | introduced by 9caa354cfc1f73159f335646ca89be4db72b125e | ||||
* | | | | | Port of #8623 | Arthur Schiwon | 2014-08-28 | 2 | -1/+79 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set result entry identifier earlier, i.e. before a continue for the same level can happen. otherwise will always get the same value and we end up in an infinite loop add unit test to make sure the infinite loop never comes back Conflicts: apps/user_ldap/tests/wizard.php | ||||
* | | | | | Merge pull request #10670 from owncloud/encodeExceptions | Lukas Reschke | 2014-08-28 | 1 | -4/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Escape error messages | ||||
| * | | | | | Escape error messages | Lukas Reschke | 2014-08-27 | 1 | -4/+4 |
| | |_|/ / | |/| | | | |||||
* / | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-28 | 495 | -2230/+2370 |
|/ / / / | |||||
* | | | | Merge pull request #10653 from owncloud/x-forwarded-for | Clark Tomlinson | 2014-08-27 | 6 | -6/+72 |
|\ \ \ \ | | | | | | | | | | | Add support for getting the real client IP behind proxies | ||||
| * | | | | Add support for getting the real client IP behind proxies | Lukas Reschke | 2014-08-27 | 6 | -6/+72 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/10624 Fix copy paste fail Add unittest for comma separated headers Revert 3rdparty |