summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into securityutilsLukas Reschke2014-08-311146-24642/+32646
|\ | | | | | | | | Conflicts: lib/private/util.php
| * Merge pull request #10770 from owncloud/getUserFolderMorris Jobke2014-08-311-1/+2
| |\ | | | | | | update public interface for getUserFolder
| | * update public interface for getUserFolderMorris Jobke2014-08-311-1/+2
| | |
| * | Merge pull request #10768 from owncloud/l10n-use-publicLukas Reschke2014-08-3167-95/+99
| |\ \ | | | | | | | | Use public api for getting l10n
| | * | Also extend public server interfaceRobin Appelman2014-08-311-1/+2
| | | |
| | * | Use public api for getting l10nRobin Appelman2014-08-3166-94/+97
| | | |
| * | | Merge pull request #10766 from owncloud/getUserFolderRobin Appelman2014-08-311-5/+9
| |\ \ \ | | |/ / | |/| / | | |/ Add optional user ID parameter for getUseFolder
| | * Add optional user ID parameter for getUseFolderMorris Jobke2014-08-311-5/+9
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2014-08-31480-5046/+4079
| |
| * Merge pull request #10428 from owncloud/files_external_better_configRobin McCorkell2014-08-304-28/+57
| |\ | | | | | | Improve external storage configuration UI
| | * Improve UI of external storage configurationRobin McCorkell2014-08-304-28/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Highlight fields that need to be filled * Remove (required) and (optional) strings where possible * Focus first configuration field when creating new external storage * Add ability to force external storage re-check * Various jQuery improvements * Prevent wrapping of checkboxes in configuration
| * | [tx-robot] updated from transifexJenkins for ownCloud2014-08-30561-8819/+9815
| | |
| * | Merge pull request #10721 from owncloud/kill-randRobin Appelman2014-08-293-16/+11
| |\ \ | | | | | | | | Kill insecure random number generation
| | * | Don't register the call when rendering error pagesRobin Appelman2014-08-292-5/+8
| | | |
| | * | Remove insecure fallback random number generationRobin Appelman2014-08-291-11/+3
| | | |
| * | | Merge pull request #10734 from owncloud/fix-10268Morris Jobke2014-08-292-4/+4
| |\ \ \ | | | | | | | | | | retrieve local users, groups and group members in a sorted way
| | * | | retrieve local users, groups and group members in a sorted wayArthur Schiwon2014-08-292-4/+4
| | |/ /
| * | | Merge pull request #10738 from owncloud/fix-quotabar-widthjbtbnl2014-08-292-2/+10
| |\ \ \ | | | | | | | | | | Fix quota bar width, and indicate almost full storage
| | * | | 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 #10614 from owncloud/remove-ee-hackLukas Reschke2014-08-291-12/+17
| |\ \ \ | | | | | | | | | | Remove different URL for EE
| | * | | Add isAppstoreEnabled instead of hijacking the URLLukas Reschke2014-08-261-6/+17
| | | | |
| | * | | Remove different URL for EELukas Reschke2014-08-241-7/+1
| | | | | | | | | | | | | | | This can now be achieved by setting `appstoreenabled` to `false` in config.php
| * | | | allow empty hostname and dots in service name for oracle autosetupJörn Friedrich Dreyer2014-08-291-0/+14
| | |/ / | |/| |
| * | | 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
| | | |/ / | | |/| |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-11 19:26:00 +0000