Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-14 | 305 | -1338/+1352 |
* | Merge pull request #10396 from owncloud/kill-filesync | Thomas Müller | 2014-08-13 | 2 | -65/+0 |
|\ | |||||
| * | Kill filesync.php in files/appinfo | Morris Jobke | 2014-08-13 | 2 | -65/+0 |
* | | 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 | Morris Jobke | 2014-08-13 | 1 | -0/+4 |
| |/ | |||||
* | | Merge pull request #10403 from owncloud/getid-cast-int | Lukas Reschke | 2014-08-13 | 2 | -2/+3 |
|\ \ | |||||
| * | | Cast file id's to int so we can compare them properly | Robin Appelman | 2014-08-13 | 2 | -2/+3 |
|/ / | |||||
* | | Merge pull request #10323 from gekmihesg/master | blizzz | 2014-08-13 | 1 | -0/+3 |
|\ \ | |/ |/| | |||||
| * | Load authentication backends before tryBasicAuth | gekmihesg | 2014-08-10 | 1 | -0/+3 |
* | | Merge pull request #10387 from owncloud/quick_fix_for_unit_tests | Thomas Müller | 2014-08-13 | 1 | -14/+17 |
|\ \ | |||||
| * | | don't clean up the test environment if a data provider was finished | Bjoern Schiessle | 2014-08-13 | 1 | -14/+17 |
* | | | Merge pull request #9754 from owncloud/enc_support_aes_256 | Vincent Petry | 2014-08-13 | 15 | -167/+501 |
|\ \ \ | |/ / |/| | | |||||
| * | | add unit test for aes256/aes128 | Bjoern Schiessle | 2014-07-23 | 2 | -0/+192 |
| * | | update existing unit tests | Bjoern Schiessle | 2014-07-23 | 5 | -127/+16 |
| * | | support aes 256 | Bjoern Schiessle | 2014-07-23 | 11 | -84/+337 |
* | | | Merge pull request #10333 from owncloud/tar-55 | Thomas Müller | 2014-08-13 | 2 | -6/+0 |
|\ \ \ | |||||
| * | | | Fix Tar support for php >=5.5 | Robin Appelman | 2014-08-11 | 2 | -6/+0 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-13 | 58 | -211/+291 |
* | | | | Merge pull request #10377 from owncloud/git-fixes | Morris Jobke | 2014-08-12 | 1 | -2/+0 |
|\ \ \ \ | |||||
| * | | | | fixes from git push force | Morris Jobke | 2014-08-12 | 1 | -2/+0 |
|/ / / / | |||||
* | | | | fix broken variable name, recoveryPasswordSupported is now recoveryEnabledFor... | Bjoern Schiessle | 2014-08-12 | 1 | -3/+3 |
* | | | | add unit tests | Bjoern Schiessle | 2014-08-12 | 1 | -0/+49 |
* | | | | fix detection of system wide mount points | Bjoern Schiessle | 2014-08-12 | 1 | -8/+33 |
* | | | | Merge pull request #9762 from owncloud/owner-public | Robin Appelman | 2014-08-12 | 2 | -0/+16 |
|\ \ \ \ | |||||
| * | | | | Add test for homestorage getOwner | Robin Appelman | 2014-07-22 | 1 | -0/+6 |
| * | | | | Return the proper owner for home storages | Robin Appelman | 2014-07-21 | 1 | -0/+10 |
* | | | | | Merge pull request #10357 from owncloud/l10n-alert-fix | Volkan Gezer | 2014-08-12 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix alert text | Volkan Gezer | 2014-08-12 | 1 | -1/+1 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-12 | 449 | -11284/+11486 |
|/ / / / / | |||||
* | | | | | Merge pull request #10347 from owncloud/fix-grammar | Volkan Gezer | 2014-08-11 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Transifex suggestion by mnestis | Volkan Gezer | 2014-08-11 | 1 | -1/+1 |
* | | | | | | Merge pull request #10335 from owncloud/fix-emptyapplist | Clark Tomlinson | 2014-08-11 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix issue when no apps are enabled | Vincent Petry | 2014-08-11 | 1 | -0/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #9890 from owncloud/check-php-charset-master | Thomas Müller | 2014-08-11 | 3 | -6/+28 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | 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 | 4 | -6/+31 |
* | | | | | | Merge pull request #10336 from owncloud/fix_share_drop_down | Björn Schießle | 2014-08-11 | 1 | -12/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | remove 'no people found' entry | Bjoern Schiessle | 2014-08-11 | 1 | -12/+1 |
* | | | | | | | Merge pull request #9848 from dupondje/master | blizzz | 2014-08-11 | 1 | -12/+18 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix initializing in #9848 | Jean-Louis Dupond | 2014-08-11 | 1 | -0/+1 |
| * | | | | | | | Fix remarks in #9848 | Jean-Louis Dupond | 2014-08-11 | 1 | -11/+13 |
| * | | | | | | | Fix memberOf detection. Fixes: #9835 | Jean-Louis Dupond | 2014-07-24 | 1 | -7/+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 | marc0s | 2014-07-30 | 1 | -2/+2 |
* | | | | | | | | | 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 | 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 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add scrollto to the url if sharing a file for long file lists | Tom Needham | 2014-08-09 | 1 | -3/+9 |
| * | | | | | | | | | Fix link to files and folders in internal share emails | Tom Needham | 2014-08-09 | 1 | -4/+3 |
* | | | | | | | | | | Merge pull request #10096 from owncloud/fix-6971-master | Jörn Friedrich Dreyer | 2014-08-11 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ |