Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Kill filesync.php in files/appinfo | Morris Jobke | 2014-08-13 | 2 | -65/+0 | |
| | |/ / / / | |/| | | | | ||||||
* / | | | | | Cast file id's to int so we can compare them properly | Robin Appelman | 2014-08-13 | 1 | -2/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #9754 from owncloud/enc_support_aes_256 | Vincent Petry | 2014-08-13 | 14 | -167/+498 | |
|\ \ \ \ \ | ||||||
| * | | | | | 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 | 10 | -84/+334 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-13 | 12 | -8/+62 | |
* | | | | | | fixes from git push force | Morris Jobke | 2014-08-12 | 1 | -2/+0 | |
* | | | | | | 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 #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 | 17 | -14/+3 | |
|/ / / / / | ||||||
* | | | | | Transifex suggestion by mnestis | Volkan Gezer | 2014-08-11 | 1 | -1/+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 #10303 from owncloud/sharing-breadcrumb-folder-name | Robin Appelman | 2014-08-11 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | use OC_Util::basename | Robin Appelman | 2014-01-15 | 1 | -1/+1 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-11 | 10 | -2/+17 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-10 | 16 | -0/+20 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-09 | 9 | -2/+53 | |
* | | | | | | Merge pull request #10290 from owncloud/check_quota_on_new_via_web | Thomas Müller | 2014-08-08 | 1 | -0/+23 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | check quota when trying to download a file via new -> web | Jörn Friedrich Dreyer | 2014-08-08 | 1 | -0/+23 | |
* | | | | | | only show "share with others" and "share by link" navigation bar entries if u... | Bjoern Schiessle | 2014-08-08 | 1 | -18/+22 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #10280 from owncloud/lazyloading-earlier | Morris Jobke | 2014-08-08 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | trigger lazy loading earlier, fix #9823 | Jan-Christoph Borchardt | 2014-08-08 | 1 | -1/+1 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-08 | 42 | -79/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #10248 from owncloud/enc_remove_keys_from_session | Morris Jobke | 2014-08-07 | 4 | -4/+19 | |
|\ \ \ \ \ | ||||||
| * | | | | | add logout hook to remove keys from session | Bjoern Schiessle | 2014-08-07 | 4 | -4/+19 | |
* | | | | | | Merge pull request #10261 from owncloud/fix-9829 | Thomas Müller | 2014-08-07 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | ldap_ prefix will be added in invokeLDAPMethod(), having it would lead to a u... | Arthur Schiwon | 2014-08-07 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #10238 from owncloud/fix-public-download-with-encryption-m... | Thomas Müller | 2014-08-07 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | we can only close the session if encryption is not used | Thomas Müller | 2014-08-07 | 1 | -1/+4 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #10184 from owncloud/getbyid-node | Robin Appelman | 2014-08-07 | 1 | -19/+5 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | trim leading slash | Robin Appelman | 2014-08-06 | 1 | -1/+1 | |
| * | | | | | | | Fix SharedCache::getPathById | Robin Appelman | 2014-08-06 | 1 | -20/+6 | |
* | | | | | | | | Merge pull request #10223 from dannosaur/patch-1 | Jan-Christoph Borchardt | 2014-08-07 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | fix tiny thumbnails in public preview/share mode | Dan Jones | 2014-08-06 | 1 | -0/+1 | |
* | | | | | | | | | Merge pull request #10218 from owncloud/pzy-master | Thomas Müller | 2014-08-07 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Update public.php | pzy | 2014-08-07 | 1 | -0/+5 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #8915 from owncloud/MorrisJobke-travis | Thomas Müller | 2014-08-07 | 4 | -3/+62 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Disable encryption migration tests | Morris Jobke | 2014-08-05 | 1 | -0/+8 | |
| * | | | | | | | mark tests as skipped - TODO travis | Morris Jobke | 2014-08-05 | 1 | -0/+49 | |
| * | | | | | | | Minor fixes | Morris Jobke | 2014-08-05 | 2 | -3/+5 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-07 | 3 | -5/+5 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #10186 from owncloud/versioning_fix_path | Thomas Müller | 2014-08-06 | 2 | -2/+36 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | add unit test to make sure getVersions returns the correct result | Bjoern Schiessle | 2014-08-05 | 1 | -0/+34 | |
| * | | | | | | make sure that the versions array contains the correct path | Bjoern Schiessle | 2014-08-05 | 1 | -2/+2 |