aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* move hardcoded color to CSS class - for themeabilityMorris Jobke2014-08-292-2/+6
|
* also add minimum width for quota bar so it’s apparent how it will lookJan-Christoph Borchardt2014-08-291-0/+1
|
* color quota bar yellow for feedback if usage is over 90%Jan-Christoph Borchardt2014-08-291-1/+2
|
* set quota bar maximum to 100% to prevent overflowJan-Christoph Borchardt2014-08-291-1/+3
|
* Merge pull request #9214 from owncloud/wizard_email_detectionMorris Jobke2014-08-295-41/+273
|\ | | | | LDAP: Wizard email attribute detection
| * adjust static method vars as wellArthur Schiwon2014-08-291-2/+4
| |
| * trigger email detection by Wizard upon any user filter filter change. before ↵Arthur Schiwon2014-08-295-13/+30
| | | | | | | | it happenend only upon user automatic list filter creation, but not on manual editing
| * undo falsely changed log fileArthur Schiwon2014-08-291-1/+1
| |
| * write log message, if original value was changedArthur Schiwon2014-08-291-0/+8
| |
| * add unit test for mail detectionArthur Schiwon2014-08-293-3/+140
| |
| * remove Access as hard dependency, inject it insteadArthur Schiwon2014-08-293-37/+41
| |
| * Wizad: email attribute detectionArthur Schiwon2014-08-291-0/+64
| |
* | Merge pull request #9684 from owncloud/fix-9367Morris Jobke2014-08-295-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 areaJan-Christoph Borchardt2014-08-294-56/+46
| | |
| * | Adds 2 checkboxes at the top of userlist in the settings, to display/hide ↵Stephane V2014-08-283-1/+37
| | | | | | | | | | | | | | | | | | optional columns This fixes #9367.
* | | Merge pull request #10724 from owncloud/min-size-for-iconsMorris Jobke2014-08-291-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 showJan-Christoph Borchardt2014-08-291-0/+2
|/ / /
* | | Merge pull request #10719 from owncloud/files-external-personal-undefinedThomas Müller2014-08-291-0/+1
|\ \ \ | | | | | | | | Prevent undefined index error loading external storages
| * | | Add missing 'personal' mount configuration optionRobin McCorkell2014-08-291-0/+1
| | | |
* | | | Merge pull request #9681 from owncloud/kill_oc_sessionLukas Reschke2014-08-2928-95/+142
|\ \ \ \ | | | | | | | | | | kill OC::$session
| * | | | be correct in deprecation documentationJörn Friedrich Dreyer2014-08-291-1/+1
| | | | |
| * | | | kill OC::$sessionJörn Friedrich Dreyer2014-08-2928-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-momentjsincludeThomas Müller2014-08-291-1/+2
|\ \ \ \ | |/ / / |/| | | Include momentjs for unit tests
| * | | Include momentjs for unit testsVincent Petry2014-08-291-1/+2
| | |/ | |/|
* | | Merge pull request #10637 from owncloud/fixing-js-issuesThomas Müller2014-08-292-0/+4
|\ \ \ | | | | | | | | Init vars with a value if none is provided
| * | | Init vars with a value if none is providedClark Tomlinson2014-08-282-0/+4
| | | |
* | | | Merge pull request #10703 from owncloud/sometimes-allow-horizontal-scrollbarThomas Müller2014-08-291-0/+4
|\ \ \ \ | |_|_|/ |/| | | allow horizontal scrollbar for personal and admin settings
| * | | allow horizontal scrollbar for personal and admin settingsJan-Christoph Borchardt2014-08-281-0/+4
| | |/ | |/|
* / | [tx-robot] updated from transifexJenkins for ownCloud2014-08-29729-11741/+4273
|/ /
* | Merge pull request #10647 from owncloud/implementing_momentjsClark Tomlinson2014-08-284-32/+30
|\ \ | | | | | | Implementing momentjs
| * | Implementing moment.jsClark Tomlinson2014-08-284-32/+30
| | | | | | | | | | | | | | | | | | | | | | | | Updating Usages Removing unused method Adding JS Doc
* | | Merge pull request #10658 from owncloud/sftp_prevent_errorVincent Petry2014-08-281-0/+3
|\ \ \ | | | | | | | | Prevent errors on broken SFTP config
| * | | Prevent errors on broken SFTP configRobin McCorkell2014-08-271-0/+3
| | | |
* | | | Merge pull request #10696 from owncloud/inputdateBernhard Posselt2014-08-281-0/+1
|\ \ \ \ | | | | | | | | | | Enhancement: Adds input styles to input type dates too.
| * | | | Enhancement: Adds input styles to input type dates too.raghunayyar2014-08-281-0/+1
|/ / / /
* | | | Merge pull request #8507 from owncloud/ajaxify_user_list_for_files_externalblizzz2014-08-2867-58/+5681
|\ \ \ \ | | | | | | | | | | Ajaxify user list for files external
| * | | | Use AppFramework instead of custom controllerLukas Reschke2014-08-255-40/+88
| | | | |
| * | | | use displayname lookup route in files_external settingsJörn Friedrich Dreyer2014-08-251-31/+14
| | | | |
| * | | | add lookup route for displaynamesJörn Friedrich Dreyer2014-08-252-0/+35
| | | | |
| * | | | no need to load user display namesJörn Friedrich Dreyer2014-08-251-1/+0
| | | | |
| * | | | fix deletion of sharesJörn Friedrich Dreyer2014-08-251-21/+22
| | | | |
| * | | | replace chosen with select2 to provide ajaxified user and group selection ↵Jörn Friedrich Dreyer2014-08-258-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 thirdpartyJörn Friedrich Dreyer2014-08-2560-0/+5431
| | | | |
* | | | | fix wizard test, adjust to changed parameters of the tested method, ↵Arthur Schiwon2014-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | introduced by 9caa354cfc1f73159f335646ca89be4db72b125e
* | | | | Port of #8623Arthur Schiwon2014-08-282-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/encodeExceptionsLukas Reschke2014-08-281-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Escape error messages
| * | | | | Escape error messagesLukas Reschke2014-08-271-4/+4
| | |_|/ / | |/| | |
* / | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-28495-2230/+2370
|/ / / /
* | | | Merge pull request #10653 from owncloud/x-forwarded-forClark Tomlinson2014-08-276-6/+72
|\ \ \ \ | | | | | | | | | | Add support for getting the real client IP behind proxies
| * | | | Add support for getting the real client IP behind proxiesLukas Reschke2014-08-276-6/+72
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/10624 Fix copy paste fail Add unittest for comma separated headers Revert 3rdparty