Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4481 from owncloud/fix_versioning_size_check | Björn Schießle | 2013-08-17 | 1 | -10/+9 |
|\ | |||||
| * | first check if file exists before checking the files size | Bjoern Schiessle | 2013-08-17 | 1 | -10/+9 |
* | | Merge pull request #4352 from owncloud/encryption_clean_up | Björn Schießle | 2013-08-17 | 5 | -445/+50 |
|\ \ | |||||
| * | | change decryptUnknownKeyfile() to decryptKeyfile(), we always use openssl_seal | Bjoern Schiessle | 2013-08-12 | 1 | -30/+6 |
| * | | Merge branch 'encryption_clean_up' of github.com:owncloud/core into encryptio... | Bjoern Schiessle | 2013-08-09 | 2 | -7/+7 |
| |\ \ | |||||
| | * | | fixing typos and PHPDoc | Thomas Müller | 2013-08-08 | 2 | -7/+7 |
| * | | | remove old comments, TODos, etc. | Bjoern Schiessle | 2013-08-09 | 2 | -66/+0 |
| |/ / | |||||
| * | | remove todo item | Bjoern Schiessle | 2013-08-08 | 1 | -4/+0 |
| * | | adapt tests to the changes in crypt.php | Bjoern Schiessle | 2013-08-08 | 2 | -244/+31 |
| * | | make methods private which are not used from outside | Bjoern Schiessle | 2013-08-08 | 1 | -101/+13 |
* | | | LDAP: only connect to LDAP once on login | Arthur Schiwon | 2013-08-17 | 2 | -6/+18 |
* | | | Merge pull request #4480 from owncloud/remove-ru_RU-master | Thomas Müller | 2013-08-17 | 8 | -56/+0 |
|\ \ \ | |||||
| * | | | remove ru_RU - fixes #3135 | Thomas Müller | 2013-08-17 | 8 | -56/+0 |
| | |/ | |/| | |||||
* | | | Merge pull request #4193 from owncloud/versions_fix_css | Morris Jobke | 2013-08-17 | 2 | -9/+6 |
|\ \ \ | |/ / |/| | | |||||
| * | | increase width of versions dialog | Bjoern Schiessle | 2013-08-17 | 1 | -0/+4 |
| * | | css for button no longer needed | Björn Schießle | 2013-07-25 | 1 | -3/+0 |
| * | | remove unused code; use jquery | Björn Schießle | 2013-07-25 | 1 | -6/+2 |
| * | | fix css | Björn Schießle | 2013-07-25 | 1 | -1/+1 |
* | | | Merge pull request #4442 from owncloud/no-smb-client-on-windows-master | Morris Jobke | 2013-08-16 | 1 | -10/+16 |
|\ \ \ | |||||
| * | | | no files external for SMB on windows | Thomas Müller | 2013-08-15 | 1 | -10/+16 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-16 | 74 | -155/+123 |
* | | | | Merge pull request #4113 from owncloud/delete-fix | Jan-Christoph Borchardt | 2013-08-15 | 3 | -15/+10 |
|\ \ \ \ | |||||
| * | | | | fix loading.gif size for both upload and deletion, force visiblity | Jan-Christoph Borchardt | 2013-07-30 | 1 | -1/+1 |
| * | | | | Replace delete icon with spinner | Victor Dubiniuk | 2013-07-29 | 1 | -5/+3 |
| * | | | | Merge branch 'master' into delete-fix | Thomas Müller | 2013-07-23 | 765 | -262/+70811 |
| |\ \ \ \ | |||||
| * | | | | | fix delete button not showing in IE8 | Jan-Christoph Borchardt | 2013-07-22 | 1 | -4/+4 |
| * | | | | | use new delete icon for deleted files as well | Jan-Christoph Borchardt | 2013-07-18 | 1 | -1/+1 |
| * | | | | | remove unnecessary tipsy for Files delete | Jan-Christoph Borchardt | 2013-07-18 | 1 | -1/+1 |
| * | | | | | use background image instead of img for Files delete icon | Jan-Christoph Borchardt | 2013-07-18 | 1 | -4/+1 |
* | | | | | | Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_fir... | Thomas Müller | 2013-08-15 | 2 | -4/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix #2711 using a custom event, also use css selectors over filterAttr | Jörn Friedrich Dreyer | 2013-08-08 | 2 | -4/+8 |
* | | | | | | | fixing all broken translation files | Thomas Müller | 2013-08-15 | 132 | -332/+332 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-15 | 134 | -475/+337 |
* | | | | | | Merge pull request #4302 from synchrone/master | Morris Jobke | 2013-08-14 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fixing owncloud/core#4301 | Alexander Bogdanov | 2013-08-02 | 1 | -0/+1 |
* | | | | | | | Merge pull request #4393 from owncloud/fix_4326 | Andreas Fischer | 2013-08-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | use __DIR__ instead of realpath | Bjoern Schiessle | 2013-08-14 | 1 | -1/+1 |
| * | | | | | | | provide correct path for require_once | Bjoern Schiessle | 2013-08-12 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #4376 from owncloud/use_plurals | Jörn Friedrich Dreyer | 2013-08-14 | 3 | -23/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Reword a phrase | kondou | 2013-08-14 | 1 | -1/+1 |
| * | | | | | | | | Use plural translations | kondou | 2013-08-09 | 3 | -23/+8 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #4363 from owncloud/fix-4355 | Thomas Müller | 2013-08-14 | 1 | -11/+16 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use multiple lines for the JSON data array. | Andreas Fischer | 2013-08-08 | 1 | -1/+5 |
| * | | | | | | | | Adjust JSON code to stable5. | Andreas Fischer | 2013-08-08 | 1 | -1/+2 |
| * | | | | | | | | Do not repeat JSON success code. | Andreas Fischer | 2013-08-08 | 1 | -8/+7 |
| * | | | | | | | | Do not repeat definition of $target. | Andreas Fischer | 2013-08-08 | 1 | -5/+6 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-13 | 14 | -4/+51 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-11 | 10 | -0/+13 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-09 | 500 | -522/+1549 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #3912 from owncloud/css_cleanup_kondou | Jan-Christoph Borchardt | 2013-08-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ |