Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove loadAppScriptFile | Lukas Reschke | 2014-08-19 | 1 | -26/+0 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-18 | 2 | -3/+3 |
| | |||||
* | Merge pull request #10456 from kroimon/skeleton_dir_config | Frank Karlitschek | 2014-08-17 | 1 | -1/+4 |
|\ | | | | | Make skeleton directory configurable. | ||||
| * | Make skeleton directory configurable. | Stefan Rado | 2014-08-16 | 1 | -1/+4 |
| | | |||||
* | | according to PHPDoc this function shall return the entity | Thomas Müller | 2014-08-17 | 1 | -1/+4 |
| | | |||||
* | | Merge pull request #10469 from owncloud/remove-xmailer-header | Thomas Müller | 2014-08-17 | 1 | -0/+1 |
|\ \ | | | | | | | Remove X-Mailer header from mails | ||||
| * | | Remove X-Mailer header from mails | Lukas Reschke | 2014-08-17 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #10407 from owncloud/rm-obsolete-japanese | Lukas Reschke | 2014-08-17 | 1 | -71/+0 |
|\ \ \ | |/ / |/| | | remove obsolete japanese lang code | ||||
| * | | remove obsolete japanese lang code | Volkan Gezer | 2014-08-13 | 1 | -71/+0 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-17 | 2 | -1/+15 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-16 | 1 | -0/+1 |
| |/ |/| | |||||
* | | Merge pull request #10442 from owncloud/move-failed-logins | Lukas Reschke | 2014-08-15 | 2 | -7/+5 |
|\ \ | | | | | | | Move authentication failed logging to checkPassword | ||||
| * | | Fix unit test | Lukas Reschke | 2014-08-15 | 1 | -1/+4 |
| | | | |||||
| * | | Move authentication failed logging to checkPassword | Lukas Reschke | 2014-08-15 | 2 | -7/+2 |
| | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/10366 | ||||
* | | | Merge pull request #10440 from owncloud/enforce-debug | Clark Tomlinson | 2014-08-15 | 1 | -7/+0 |
|\ \ \ | | | | | | | | | Remove ability to trigger DEBUG mode via cookie | ||||
| * | | | Remove ability to trigger DEBUG mode via cookie | Lukas Reschke | 2014-08-15 | 1 | -7/+0 |
| |/ / | | | | | | | | | | | | | Users should not be able to enable debug mode on their own by setting a cookie. Using debug mode might leak too much information about the environment or have other unexpected behaviour. We should backport this. | ||||
* | | | Merge pull request #9275 from NormalRa/master | Lukas Reschke | 2014-08-15 | 3 | -0/+44 |
|\ \ \ | |/ / |/| | | Add .apk mimetype. | ||||
| * | | Remove stray tab characters. | Normal Ra | 2014-08-13 | 1 | -1/+1 |
| | | | |||||
| * | | APK mimetype icon to be a generic package icon. | Normal Ra | 2014-08-12 | 1 | -0/+1 |
| | | | |||||
| * | | Add APK mimetype repair scenario. | Normal Ra | 2014-08-12 | 1 | -0/+42 |
| | | | |||||
| * | | Add .apk mimetype. | Normal Ra | 2014-06-28 | 1 | -0/+1 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-15 | 1 | -14/+14 |
| | | | |||||
* | | | add missing @deprecated annotation to legacy classes | Jörn Friedrich Dreyer | 2014-08-14 | 9 | -2/+22 |
| | | | |||||
* | | | Merge pull request #10417 from owncloud/update_deprecation_doc | Thomas Müller | 2014-08-14 | 4 | -4/+4 |
|\ \ \ | | | | | | | | | update deprecation docs | ||||
| * | | | update deprecation docs | Jörn Friedrich Dreyer | 2014-08-14 | 4 | -4/+4 |
| | | | | |||||
* | | | | Merge pull request #10399 from owncloud/fix_setSendMailStatus | Björn Schießle | 2014-08-14 | 2 | -5/+7 |
|\ \ \ \ | | | | | | | | | | | [sharing] fix mail notification | ||||
| * | | | | we need the recipient as a additional parameter to know for which share the ↵ | Bjoern Schiessle | 2014-08-13 | 2 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | notification was send | ||||
* | | | | | Merge pull request #10414 from owncloud/relax-code-checker | Clark Tomlinson | 2014-08-14 | 1 | -4/+0 |
|\ \ \ \ \ | |_|/ / / |/| | | | | in order to prevent false-positives on the code checker - exec and eval ... | ||||
| * | | | | in order to prevent false-positives on the code checker - exec and eval will ↵ | Thomas Müller | 2014-08-14 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | not longer be grepped for | ||||
* | | | | | Merge pull request #10395 from owncloud/close-filehandle-lib-files | Morris Jobke | 2014-08-14 | 3 | -0/+3 |
|\ \ \ \ \ | |/ / / / |/| | | | | Close open file handles in files library | ||||
| * | | | | Close open file handles in files library | Morris Jobke | 2014-08-13 | 3 | -0/+3 |
| |/ / / | | | | | | | | | | | | | ref #10392 | ||||
* | | | | Merge pull request #10394 from owncloud/close-filehandle-lib-image | Thomas Müller | 2014-08-13 | 1 | -0/+4 |
|\ \ \ \ | |_|_|/ |/| | | | Close file handle if exception occurs in image class | ||||
| * | | | Close file handle if exception occurs in image class | Morris Jobke | 2014-08-13 | 1 | -0/+4 |
| |/ / | | | | | | | | | | ref #10392 | ||||
* | | | Cast file id's to int so we can compare them properly | Robin Appelman | 2014-08-13 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #10323 from gekmihesg/master | blizzz | 2014-08-13 | 1 | -0/+3 |
|\ \ \ | |/ / |/| | | Load authentication backends before tryBasicAuth | ||||
| * | | Load authentication backends before tryBasicAuth | gekmihesg | 2014-08-10 | 1 | -0/+3 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-13 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #9762 from owncloud/owner-public | Robin Appelman | 2014-08-12 | 1 | -0/+10 |
|\ \ \ | | | | | | | | | Return the proper owner for home storages | ||||
| * | | | Return the proper owner for home storages | Robin Appelman | 2014-07-21 | 1 | -0/+10 |
| | | | | |||||
* | | | | Merge pull request #10335 from owncloud/fix-emptyapplist | Clark Tomlinson | 2014-08-11 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Fix issue when no apps are enabled | ||||
| * | | | | Fix issue when no apps are enabled | Vincent Petry | 2014-08-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | Properly initialize $apps array | ||||
* | | | | | Merge pull request #9890 from owncloud/check-php-charset-master | Thomas Müller | 2014-08-11 | 1 | -0/+7 |
|\ \ \ \ \ | |/ / / / |/| | | | | setting and checking default_charset in php.ini to be UTF-8 | ||||
| * | | | | Removing ini charset override due to shared hosting issues | Clark Tomlinson | 2014-08-11 | 1 | -3/+0 |
| | | | | | |||||
| * | | | | setting and checking default_charset in php.ini to be UTF-8 | Thomas Müller | 2014-07-25 | 2 | -0/+10 |
| | | | | | |||||
* | | | | | Merge pull request #10066 from marc0s/issues/10065-fix-null-check | Clark Tomlinson | 2014-08-11 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix checking of NULL or empty OC::$THIRDPARTYROOT/OC::$THIRDPARTYWEBROOT | ||||
| * | | | | | Fix checking of NULL or empty OC::$THIRDPARTYROOT/OC::$THIRDPARTYWEBROOT | marc0s | 2014-07-30 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #10065 | ||||
* | | | | | | Merge pull request #10251 from owncloud/fix-dav-attributes-master | Thomas Müller | 2014-08-11 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | shared files/folders are not mounted | ||||
| * | | | | | | shared files/folders are not mounted | Thomas Müller | 2014-08-07 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #10301 from owncloud/fix-internal-mail-share-links | Vincent Petry | 2014-08-11 | 1 | -5/+10 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Don't use /Shared as a base for links in share email | ||||
| * | | | | | | | Add scrollto to the url if sharing a file for long file lists | Tom Needham | 2014-08-09 | 1 | -3/+9 |
| | | | | | | | |