summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12420 from owncloud/sqlite-wal-2Morris Jobke2014-11-265-21/+36
|\ | | | | adding new config parameter for sqlite to specify the journal mode
| * fix failing unit test for the temp manager - concurrently executed unit ↵Thomas Müller2014-11-251-2/+2
| | | | | | | | tests influence each other
| * adding new config parameter for sqlite to specify the journal modeThomas Müller2014-11-254-19/+34
| |
* | Merge pull request #12410 from owncloud/no_session_for_public_share_keyThomas Müller2014-11-254-34/+15
|\ \ | | | | | | don't store private public-share-key in session
| * | replace \OC:: with \OC::->getSession()Bjoern Schiessle2014-11-251-2/+2
| | |
| * | we no longer need to keep the session open for encryptionBjoern Schiessle2014-11-252-14/+3
| | |
| * | don't store private public-share-key in sessionBjoern Schiessle2014-11-251-17/+10
| | |
| * | remove unused variableBjoern Schiessle2014-11-251-1/+0
| | |
* | | Merge pull request #12416 from owncloud/app-info-xml-parser-2Thomas Müller2014-11-259-61/+223
|\ \ \ | | | | | | | | App info xml parser 2
| * | | handle invalid xml fileThomas Müller2014-11-253-7/+45
| | | |
| * | | simplify xml parser codeThomas Müller2014-11-253-64/+55
| | | |
| * | | Introduce app info xml parser including basic unit test - necessary for #10777Thomas Müller2014-11-257-61/+194
| | |/ | |/|
* | | Merge pull request #12313 from oparoz/patch-2Thomas Müller2014-11-253-3/+3
|\ \ \ | |/ / |/| | The class name is Movie NOT Movies
| * | The class name is Movie NOT MoviesOlivier Paroz2014-11-253-3/+3
|/ /
* | 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