summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* autoconfig.php only to be deleted on successful installationThomas Müller2014-11-251-7/+14
|
* Merge pull request #12262 from owncloud/removeAbsoluteDirectoryPathFromTemplateMorris Jobke2014-11-253-5/+3
|\ | | | | Don't disclose relative directory path for single shared files of user
| * Remove unused variable and make Scrutinizer happy.Lukas Reschke2014-11-181-2/+0
| |
| * Don't disclose relative directory path for single shared files of userLukas Reschke2014-11-182-2/+2
| | | | | | | | | | | | | | | | | | The "dir" key is used within the public sharing template to indicate in which directory the user currently is when sharing a directory with subdirectories. This is needed by the JS scripts. However, when not accessing a directory then "dir" was set to the relative path of the file (from the user's home directory), meaning that for every public shared file the sharee can see the path. (For example if you share the file "foo.txt" from "finances/topsecret/" the sharee would still see the path "finances/topsecret/" from the shared HTML template) This is not the excpected behaviour and can be considered a privacy problem, this patch addresses this by setting "dir" to an empty key.
| * Fix case-sensitivityLukas Reschke2014-11-181-1/+1
| |
* | Merge pull request #12390 from owncloud/use-session-in-caseMorris Jobke2014-11-251-2/+8
|\ \ | | | | | | Close session only if encryption app is not enabled
| * | Close session only if encryption app is not enabledLukas Reschke2014-11-241-2/+8
| | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/12389
* | | Merge pull request #12402 from owncloud/fix-phpdocMorris Jobke2014-11-251-25/+17
|\ \ \ | | | | | | | | Fix PHPDoc and deprecated code
| * | | Fix PHPDoc and deprecated codeLukas Reschke2014-11-241-25/+17
| | | | | | | | | | | | | | | | Some PHPDocs were incorrect, also used this opportunity to replace some deprecated functions.
* | | | Merge pull request #12380 from owncloud/remove-oc-migrateLukas Reschke2014-11-254-1022/+0
|\ \ \ \ | |/ / / |/| | | Remove OC_Migrate
| * | | Remove OC_MigrateLukas Reschke2014-11-244-1022/+0
| | | | | | | | | | | | | | | | | | | | | | | | This is unused legacy code. Let it die with ~~~honor~~ fire. Fixes https://github.com/owncloud/core/issues/12346
* | | | Merge pull request #11837 from owncloud/fix-11328Morris Jobke2014-11-247-89/+217
|\ \ \ \ | | | | | | | | | | unify count filters and introduce display name attribute detection
| * | | | make scrutinizer happier and always count users on assisted mode, even with ↵Arthur Schiwon2014-11-222-6/+6
| | | | | | | | | | | | | | | | | | | | xp'ed mode (would be a regression otherwise)
| * | | | make updateCount work properly with new xp'd mode as well as withoutArthur Schiwon2014-11-212-7/+25
| | | | |
| * | | | fix counting when ldapPagingSize is 0Arthur Schiwon2014-11-211-6/+5
| | | | |
| * | | | trigger count on the correct filterArthur Schiwon2014-11-201-1/+1
| | | | |
| * | | | phpdoc and mixed up lettersArthur Schiwon2014-11-202-1/+3
| | | | |
| * | | | better readbility, no effective changesArthur Schiwon2014-11-201-5/+5
| | | | |
| * | | | use underscore.js for undefined checksArthur Schiwon2014-11-201-4/+4
| | | | |
| * | | | this happens already before counting, no need anymoreArthur Schiwon2014-11-201-2/+0
| | | | |
| * | | | JS docArthur Schiwon2014-11-202-0/+27
| | | | |
| * | | | a corrected email attribute needs to be saved, not only returnedArthur Schiwon2014-11-201-1/+1
| | | | |
| * | | | to reassure that selected attributes still work, do not count all matching ↵Arthur Schiwon2014-11-202-11/+16
| | | | | | | | | | | | | | | | | | | | entries but limit it to 1 in order to make it faster
| * | | | detectors (email, displayname..) are now started in one place, triggered ↵Arthur Schiwon2014-11-203-34/+81
| | | | | | | | | | | | | | | | | | | | from only 2 places. more reliable structure and flow, saves requests
| * | | | consolidate user count filter in wizard and user back endArthur Schiwon2014-11-204-36/+16
| | | | |
| * | | | detect user display name attribute and return user count depending on its ↵Arthur Schiwon2014-11-203-7/+59
| | | | | | | | | | | | | | | | | | | | presence
* | | | | Merge pull request #12391 from owncloud/fix_12361Björn Schießle2014-11-241-1/+2
|\ \ \ \ \ | | | | | | | | | | | | use login name to verify password
| * | | | | use login name to verify passwordBjoern Schiessle2014-11-241-1/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #12294 from owncloud/route-postfixThomas Müller2014-11-242-2/+21
|\ \ \ \ \ | |/ / / / |/| | | | Add route postfix to allow url versioning when only the http method changed
| * | | | add postfixBernhard Posselt2014-11-192-2/+21
| | | | | | | | | | | | | | | | | | | | add postfix
* | | | | Merge pull request #12303 from owncloud/windows-unknown-command-commandMorris Jobke2014-11-243-36/+21
|\ \ \ \ \ | | | | | | | | | | | | Deduplicate findBinaryPath() and do not try "command -v" on windows
| * | | | | Simplify the binary finding code in the movie preview classJoas Schilling2014-11-201-11/+3
| | | | | |
| * | | | | Deduplicate function by moving it to the OC_HelperJoas Schilling2014-11-203-27/+20
| | | | | |
| * | | | | Remove exec() call with invalid name on windowsJoas Schilling2014-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently running unit tests prints the following message 3 times: The command "command" is misspelt or could not be found. Instead of trying this, we just skip this now.
* | | | | | Merge pull request #12142 from owncloud/DeprecateOldIAPICallsMorris Jobke2014-11-243-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Deprecate older API wrappers and calls
| * | | | | | Deprecate older API wrappers and callsLukas Reschke2014-11-123-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Those old classes have now non-static pendants and can be deprecated IMHO.
* | | | | | | Merge pull request #12084 from owncloud/sharing_fix_shared_with_infoMorris Jobke2014-11-244-10/+61
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | sharing: make sure that we only find the shares from a given owner
| * | | | | | | also check for the correct owner if it was submittedBjoern Schiessle2014-11-214-10/+61
| | | | | | | |
* | | | | | | | Merge pull request #12359 from owncloud/fix-redirect-url-for-password-changeThomas Müller2014-11-241-1/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use `/` as redirect location if webroot is set to an empty value
| * | | | | | | | Use `/` as redirect location if webroot is set to an empty valueLukas Reschke2014-11-211-1/+5
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the webroot has been set to an empty value or ownCloud has been installed at the root location (`/``) there is a fair chance that the redirect for password resets does not work at all. This means that while the password is getting resetted the user is not redirected to the login page. I'm aware that it might be better to just set the webroot to `/` in those cases but this patch is better in the regard that it cannot break stuff. Thanks to @PVince81 for helping me debugging this. (I'm a moron and assumed it couldn't be THAT easy) Reported by @cdamken
* | | | | | | | Merge pull request #12362 from owncloud/add-ocs-header-per-defaultVincent Petry2014-11-241-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add OCS API header per default
| * | | | | | | | Add OCS API header per defaultLukas Reschke2014-11-211-1/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Relieve @PVince from having to write it all the time ;-)
* | | | | | | | Merge pull request #12374 from owncloud/vagrant_puphpet_gitignoreLukas Reschke2014-11-241-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | add puphpet and vagrant to gitignore
| * | | | | | | | add puphpet and vagrant to gitignoreGeorg Ehrke2014-11-231-0/+6
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-2410-4/+18
| | | | | | | |
* | | | | | | | Merge pull request #12372 from owncloud/preview_tiff_fixLukas Reschke2014-11-242-11/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | remove ugly hack and don't use OC\Preview\Image for tiffs and svgs
| * | | | | | | remove ugly hack and don't use OC\Preview\Image for tiffs and svgsGeorg Ehrke2014-11-232-11/+1
|/ / / / / / /
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-232-0/+2
| | | | | | |
* | | | | | | Merge pull request #12348 from owncloud/rename-to-avoid-complaining-ciMorris Jobke2014-11-222-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Rename providers to not begin with test
| * | | | | | | Rename providers to not begin with testLukas Reschke2014-11-212-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/12347