| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-28 | 526 | -1049/+1060 |
| | | |||||
| * | Merge pull request #3872 from bantu/phpunit-xml-dist | Jörn Friedrich Dreyer | 2013-06-27 | 2 | -1/+4 |
| |\ | | | | | Use phpunit.xml.dist instead of phpunit.xml ... | ||||
| | * | gitignore: Fix typo + adjust comment format. | Andreas Fischer | 2013-06-27 | 1 | -1/+1 |
| | | | |||||
| | * | PHPUnit: Add tests/phpunit.xml to gitignore. | Andreas Fischer | 2013-06-27 | 1 | -0/+3 |
| | | | |||||
| | * | PHPUnit: Allow developers to use their own custom phpunit.xml file. | Andreas Fischer | 2013-06-27 | 1 | -0/+0 |
| | | | | | | | | | | | | | The order of precedence of configuration files for PHPUnit is: - phpunit.xml (allowing custom user defined configuration) - phpunit.xml.dist (configuration distributed with the software) | ||||
| * | | Merge pull request #3576 from owncloud/jquery.multiselect-1.13 | Thomas Tanghus | 2013-06-27 | 2 | -54/+101 |
| |\ \ | |/ |/| | Update to jquery.multiselect 1.13 | ||||
| | * | Forgot the css. | Thomas Tanghus | 2013-06-04 | 1 | -1/+1 |
| | | | |||||
| | * | Update to jquery.multiselect 1.13 | Thomas Tanghus | 2013-06-02 | 1 | -53/+100 |
| | | | |||||
| * | | Merge pull request #3847 from bantu/phpunit-json-listener-removal | Thomas Müller | 2013-06-27 | 1 | -3/+0 |
| |\ \ | | | | | | | phpunit: Remove PHPUnit_Util_Log_JSON which spammed to stdout on console | ||||
| | * | | phpunit: Remove PHPUnit_Util_Log_JSON which spammed to stdout on console. | Andreas Fischer | 2013-06-25 | 1 | -3/+0 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-27 | 543 | -3481/+3525 |
| | | | | |||||
| * | | | Merge pull request #3855 from owncloud/fixing-3853-master | VicDeo | 2013-06-26 | 2 | -3/+4 |
| |\ \ \ | | | | | | | | | move javascript variables 'oc_current_user' and 'oc_requesttoken' to js.... | ||||
| | * | | | move javascript variables 'oc_current_user' and 'oc_requesttoken' to js.js - ↵ | Thomas Mueller | 2013-06-26 | 2 | -3/+4 |
| |/ / / | | | | | | | | | | fixes #3853 | ||||
| * / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-26 | 545 | -1201/+1273 |
| |/ / | |||||
| * | | log as index, not remote | Jörn Friedrich Dreyer | 2013-06-25 | 1 | -2/+2 |
| | | | |||||
| * | | Merge pull request #3750 from owncloud/dummy_session_for_errors | Thomas Müller | 2013-06-25 | 1 | -3/+3 |
| |\ \ | | | | | | | Init dummy session to render error pages | ||||
| | * | | Init dummy session first | Victor Dubiniuk | 2013-06-17 | 1 | -3/+3 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-25 | 544 | -1141/+1237 |
| | | | | |||||
| * | | | Merge pull request #3826 from owncloud/fix_webdav_locking_for_oracle | Thomas Müller | 2013-06-24 | 2 | -2/+6 |
| |\ \ \ | | | | | | | | | use to_char when comparing clob to string on oracle, use execute audited | ||||
| | * | | | use to_char when comparing clob to string on oracle, use execute audited | Jörn Friedrich Dreyer | 2013-06-24 | 2 | -2/+6 |
| |/ / / | |||||
| * | | | Merge pull request #3818 from owncloud/update-trigger-cli | Thomas Müller | 2013-06-24 | 1 | -0/+22 |
| |\ \ \ | | | | | | | | | Add a CLI script for manually triggering checking a folder for updates | ||||
| | * | | | Add a CLI script for manually triggering checking a folder for updates | Robin Appelman | 2013-06-23 | 1 | -0/+22 |
| | | | | | |||||
| * | | | | Merge pull request #3822 from owncloud/graceful_teardown_of_cache | Thomas Müller | 2013-06-24 | 1 | -1/+3 |
| |\ \ \ \ | | | | | | | | | | | graceful teardown of cache | ||||
| | * | | | | graceful teardown of cache | Jörn Friedrich Dreyer | 2013-06-24 | 1 | -1/+3 |
| |/ / / / | |||||
| * / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-24 | 534 | -1110/+1111 |
| |/ / / | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-23 | 479 | -1465/+1489 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-22 | 240 | -1018/+1678 |
| | | | | |||||
| * | | | Merge pull request #3766 from owncloud/fix_display_name_edit | Thomas Müller | 2013-06-21 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Correct new user display name output | ||||
| | * | | | Replace display name only | Victor Dubiniuk | 2013-06-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #3810 from owncloud/improve_webdavauth | Thomas Müller | 2013-06-21 | 1 | -4/+4 |
| |\ \ \ \ | | | | | | | | | | | improve error handling of webdavauth | ||||
| | * | | | | improve error handling of webdavauth | Georg Ehrke | 2013-06-21 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | Merge pull request #3811 from owncloud/string_fixes_encryption_settings | Lukas Reschke | 2013-06-21 | 1 | -5/+5 |
| |\ \ \ \ \ | | | | | | | | | | | | | fix some strings in the admin settings of the encryption app | ||||
| | * | | | | | fix some strings in the admin settings, it's not a 'recovery account' but a ↵ | Björn Schießle | 2013-06-21 | 1 | -5/+5 |
| |/ / / / / | | | | | | | | | | | | | | | | 'recovery key' | ||||
| * | | | | | encryption is LDAP compatible | Björn Schießle | 2013-06-21 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Squashed commit of the following: | Björn Schießle | 2013-06-21 | 2 | -9/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 1345201c9da99a82f198e41fba24da6b0d7ae59a Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 16:27:46 2013 +0200 add l10n support commit bf2c79c8de8710e839a4a55642a91874c374fa1c Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 16:19:10 2013 +0200 only init session if openssl extension is loaded commit cbd52af6afbaa310bb1a534db64ff5e476dfd5d7 Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 12:25:40 2013 +0200 first disable app and than show error page commit 55baf593179c433642de59552592e6b0f1932880 Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 12:17:34 2013 +0200 typo fixed commit 1d9bef0b058e7cc3d511b81ae12d5a07660c75b2 Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 12:15:40 2013 +0200 move dependency check to the encryption app commit c186e95da526f0470e20f014f1bd9513db5518ff Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 11:13:11 2013 +0200 make sure that openssl is installed and loaded | ||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-21 | 295 | -605/+753 |
| | | | | | | |||||
| * | | | | | Merge pull request #3796 from ↵ | Thomas Müller | 2013-06-20 | 1 | -4/+6 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/gracefully_handle_teardown_in_scanner_test skip teardown if cache has not been set up | ||||
| | * | | | | | skip teardown if cache has not been set up | Jörn Friedrich Dreyer | 2013-06-20 | 1 | -4/+6 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #3792 from owncloud/scanfolder-remove | Thomas Müller | 2013-06-20 | 2 | -0/+35 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | remove deleted files when re-scanning a folder | ||||
| | * | | | | | | adding unit test for folder remove: testRemovedFolder() | Thomas Mueller | 2013-06-20 | 1 | -0/+11 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'rescan-all' into scanfolder-remove | Thomas Mueller | 2013-06-20 | 2 | -15/+45 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | remove deleted files when re-scanning a folder | Robin Appelman | 2013-06-20 | 2 | -0/+24 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #3779 from shkdee/patch-1 | blizzz | 2013-06-20 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Update user.php | ||||
| | * | | | | | | | Update user.php | shkdee | 2013-06-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes $_setupedBackends[] into self::$_setupedBackends[] so that setuped backends are REALLY remembered and not instanciated many times. | ||||
| * | | | | | | | | Merge pull request #3788 from owncloud/more_error_messages | Björn Schießle | 2013-06-20 | 2 | -26/+28 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | add some more error messages, in case something went wrong | ||||
| | * | | | | | | | | always have a defined return value | Björn Schießle | 2013-06-19 | 1 | -4/+4 |
| | | | | | | | | | | |||||
| | * | | | | | | | | some more error messages | Björn Schießle | 2013-06-19 | 1 | -5/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | add some more error messages, in case something went wrong | Björn Schießle | 2013-06-19 | 2 | -24/+28 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #3784 from owncloud/rescan-all | Thomas Müller | 2013-06-20 | 2 | -15/+45 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | Give admins the ability to rescan the filesystem for multiple users at once | ||||
| | * | | | | | | | | use json to encode user list | Robin Appelman | 2013-06-19 | 2 | -2/+2 |
| | | | | | | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |