Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #12420 from owncloud/sqlite-wal-2 | Morris Jobke | 2014-11-26 | 5 | -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üller | 2014-11-25 | 1 | -2/+2 |
| | | | | | | | | tests influence each other | ||||
| * | adding new config parameter for sqlite to specify the journal mode | Thomas Müller | 2014-11-25 | 4 | -19/+34 |
| | | |||||
* | | Merge pull request #12410 from owncloud/no_session_for_public_share_key | Thomas Müller | 2014-11-25 | 4 | -34/+15 |
|\ \ | | | | | | | don't store private public-share-key in session | ||||
| * | | replace \OC:: with \OC::->getSession() | Bjoern Schiessle | 2014-11-25 | 1 | -2/+2 |
| | | | |||||
| * | | we no longer need to keep the session open for encryption | Bjoern Schiessle | 2014-11-25 | 2 | -14/+3 |
| | | | |||||
| * | | don't store private public-share-key in session | Bjoern Schiessle | 2014-11-25 | 1 | -17/+10 |
| | | | |||||
| * | | remove unused variable | Bjoern Schiessle | 2014-11-25 | 1 | -1/+0 |
| | | | |||||
* | | | Merge pull request #12416 from owncloud/app-info-xml-parser-2 | Thomas Müller | 2014-11-25 | 9 | -61/+223 |
|\ \ \ | | | | | | | | | App info xml parser 2 | ||||
| * | | | handle invalid xml file | Thomas Müller | 2014-11-25 | 3 | -7/+45 |
| | | | | |||||
| * | | | simplify xml parser code | Thomas Müller | 2014-11-25 | 3 | -64/+55 |
| | | | | |||||
| * | | | Introduce app info xml parser including basic unit test - necessary for #10777 | Thomas Müller | 2014-11-25 | 7 | -61/+194 |
| | |/ | |/| | |||||
* | | | Merge pull request #12313 from oparoz/patch-2 | Thomas Müller | 2014-11-25 | 3 | -3/+3 |
|\ \ \ | |/ / |/| | | The class name is Movie NOT Movies | ||||
| * | | The class name is Movie NOT Movies | Olivier Paroz | 2014-11-25 | 3 | -3/+3 |
|/ / | |||||
* | | Merge pull request #12262 from owncloud/removeAbsoluteDirectoryPathFromTemplate | Morris Jobke | 2014-11-25 | 3 | -5/+3 |
|\ \ | |/ |/| | Don't disclose relative directory path for single shared files of user | ||||
| * | Remove unused variable and make Scrutinizer happy. | Lukas Reschke | 2014-11-18 | 1 | -2/+0 |
| | | |||||
| * | Don't disclose relative directory path for single shared files of user | Lukas Reschke | 2014-11-18 | 2 | -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-sensitivity | Lukas Reschke | 2014-11-18 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #12390 from owncloud/use-session-in-case | Morris Jobke | 2014-11-25 | 1 | -2/+8 |
|\ \ | | | | | | | Close session only if encryption app is not enabled | ||||
| * | | Close session only if encryption app is not enabled | Lukas Reschke | 2014-11-24 | 1 | -2/+8 |
| | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/12389 | ||||
* | | | Merge pull request #12402 from owncloud/fix-phpdoc | Morris Jobke | 2014-11-25 | 1 | -25/+17 |
|\ \ \ | | | | | | | | | Fix PHPDoc and deprecated code | ||||
| * | | | Fix PHPDoc and deprecated code | Lukas Reschke | 2014-11-24 | 1 | -25/+17 |
| | | | | | | | | | | | | | | | | Some PHPDocs were incorrect, also used this opportunity to replace some deprecated functions. | ||||
* | | | | Merge pull request #12380 from owncloud/remove-oc-migrate | Lukas Reschke | 2014-11-25 | 4 | -1022/+0 |
|\ \ \ \ | |/ / / |/| | | | Remove OC_Migrate | ||||
| * | | | Remove OC_Migrate | Lukas Reschke | 2014-11-24 | 4 | -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-11328 | Morris Jobke | 2014-11-24 | 7 | -89/+217 |
|\ \ \ \ | | | | | | | | | | | unify count filters and introduce display name attribute detection | ||||
| * | | | | make scrutinizer happier and always count users on assisted mode, even with ↵ | Arthur Schiwon | 2014-11-22 | 2 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | xp'ed mode (would be a regression otherwise) | ||||
| * | | | | make updateCount work properly with new xp'd mode as well as without | Arthur Schiwon | 2014-11-21 | 2 | -7/+25 |
| | | | | | |||||
| * | | | | fix counting when ldapPagingSize is 0 | Arthur Schiwon | 2014-11-21 | 1 | -6/+5 |
| | | | | | |||||
| * | | | | trigger count on the correct filter | Arthur Schiwon | 2014-11-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | phpdoc and mixed up letters | Arthur Schiwon | 2014-11-20 | 2 | -1/+3 |
| | | | | | |||||
| * | | | | better readbility, no effective changes | Arthur Schiwon | 2014-11-20 | 1 | -5/+5 |
| | | | | | |||||
| * | | | | use underscore.js for undefined checks | Arthur Schiwon | 2014-11-20 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | this happens already before counting, no need anymore | Arthur Schiwon | 2014-11-20 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | JS doc | Arthur Schiwon | 2014-11-20 | 2 | -0/+27 |
| | | | | | |||||
| * | | | | a corrected email attribute needs to be saved, not only returned | Arthur Schiwon | 2014-11-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | to reassure that selected attributes still work, do not count all matching ↵ | Arthur Schiwon | 2014-11-20 | 2 | -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 Schiwon | 2014-11-20 | 3 | -34/+81 |
| | | | | | | | | | | | | | | | | | | | | from only 2 places. more reliable structure and flow, saves requests | ||||
| * | | | | consolidate user count filter in wizard and user back end | Arthur Schiwon | 2014-11-20 | 4 | -36/+16 |
| | | | | | |||||
| * | | | | detect user display name attribute and return user count depending on its ↵ | Arthur Schiwon | 2014-11-20 | 3 | -7/+59 |
| | | | | | | | | | | | | | | | | | | | | presence | ||||
* | | | | | Merge pull request #12391 from owncloud/fix_12361 | Björn Schießle | 2014-11-24 | 1 | -1/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | use login name to verify password | ||||
| * | | | | | use login name to verify password | Bjoern Schiessle | 2014-11-24 | 1 | -1/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #12294 from owncloud/route-postfix | Thomas Müller | 2014-11-24 | 2 | -2/+21 |
|\ \ \ \ \ | |/ / / / |/| | | | | Add route postfix to allow url versioning when only the http method changed | ||||
| * | | | | add postfix | Bernhard Posselt | 2014-11-19 | 2 | -2/+21 |
| | | | | | | | | | | | | | | | | | | | | add postfix | ||||
* | | | | | Merge pull request #12303 from owncloud/windows-unknown-command-command | Morris Jobke | 2014-11-24 | 3 | -36/+21 |
|\ \ \ \ \ | | | | | | | | | | | | | Deduplicate findBinaryPath() and do not try "command -v" on windows | ||||
| * | | | | | Simplify the binary finding code in the movie preview class | Joas Schilling | 2014-11-20 | 1 | -11/+3 |
| | | | | | | |||||
| * | | | | | Deduplicate function by moving it to the OC_Helper | Joas Schilling | 2014-11-20 | 3 | -27/+20 |
| | | | | | | |||||
| * | | | | | Remove exec() call with invalid name on windows | Joas Schilling | 2014-11-19 | 1 | -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/DeprecateOldIAPICalls | Morris Jobke | 2014-11-24 | 3 | -0/+7 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Deprecate older API wrappers and calls | ||||
| * | | | | | | Deprecate older API wrappers and calls | Lukas Reschke | 2014-11-12 | 3 | -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_info | Morris Jobke | 2014-11-24 | 4 | -10/+61 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | sharing: make sure that we only find the shares from a given owner |