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 #4471 from owncloud/password-icon | Thomas Müller | 2013-08-17 | 4 | -4/+7 |
|\ \ \ | |||||
| * | | | use proper password icon, three dots are 'more' | Jan-Christoph Borchardt | 2013-08-16 | 4 | -4/+7 |
| | |/ | |/| | |||||
* | | | Merge pull request #4476 from owncloud/doc-on-master | Thomas Müller | 2013-08-17 | 3 | -2/+2 |
|\ \ \ | |||||
| * | | | fix difference between packaged version and master | Morris Jobke | 2013-08-17 | 3 | -2/+2 |
| |/ / | |||||
* | | | Merge pull request #4480 from owncloud/remove-ru_RU-master | Thomas Müller | 2013-08-17 | 23 | -2633/+0 |
|\ \ \ | |||||
| * | | | remove ru_RU - fixes #3135 | Thomas Müller | 2013-08-17 | 23 | -2633/+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 |
* | | | | Merge pull request #4314 from owncloud/css-fixes | Jan-Christoph Borchardt | 2013-08-16 | 5 | -42/+21 |
|\ \ \ \ | |||||
| * | | | | tixing width and position of wider error messages | Thomas Müller | 2013-08-16 | 2 | -1/+6 |
| * | | | | merge master into css-fixes | Jan-Christoph Borchardt | 2013-08-16 | 1473 | -14328/+24962 |
| |\ \ \ \ | |||||
| * | | | | | change long couldn't be determined string to question mark again | Jan-Christoph Borchardt | 2013-08-04 | 1 | -1/+1 |
| * | | | | | wrap code output in error messages, fix #4231 | Jan-Christoph Borchardt | 2013-07-31 | 1 | -0/+4 |
| * | | | | | remove table layout for background jobs | Jan-Christoph Borchardt | 2013-07-31 | 1 | -14/+6 |
| * | | | | | remove unused and never to be used pagination | Jan-Christoph Borchardt | 2013-07-31 | 1 | -22/+0 |
| * | | | | | remove ugly inset shadow from header | Jan-Christoph Borchardt | 2013-07-30 | 1 | -1/+4 |
| * | | | | | reduce z-index of settings popup, fix #4212 | Jan-Christoph Borchardt | 2013-07-30 | 1 | -1/+1 |
* | | | | | | Merge pull request #4032 from owncloud/more-whitespace | Morris Jobke | 2013-08-16 | 1 | -47/+82 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | merge master into more-whitespace | Jan-Christoph Borchardt | 2013-08-15 | 2568 | -39800/+129181 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| * | | | | | | prevent ugly selection effect on accidental selection, fix #3713 | Jan-Christoph Borchardt | 2013-07-09 | 1 | -0/+4 |
| * | | | | | | more whitespace for user menu | Jan-Christoph Borchardt | 2013-07-09 | 1 | -4/+19 |
| * | | | | | | more small whitespace fixes for the app list | Jan-Christoph Borchardt | 2013-07-09 | 1 | -5/+5 |
| * | | | | | | more whitespace WIP 2 | Jan-Christoph Borchardt | 2013-07-09 | 1 | -3/+23 |
| * | | | | | | more whitespace WIP | Jan-Christoph Borchardt | 2013-07-09 | 1 | -25/+38 |
| * | | | | | | app styles: remove bottom padding. Settings should be last in list instead of... | Jan-Christoph Borchardt | 2013-07-09 | 1 | -1/+0 |
| * | | | | | | Removes Borders from the left navigation. | raghunayyar | 2013-07-09 | 1 | -11/+0 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-16 | 214 | -1749/+1447 |
* | | | | | | | Merge pull request #4113 from owncloud/delete-fix | Jan-Christoph Borchardt | 2013-08-15 | 9 | -26/+46 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | force show loading icon also for IE | Jan-Christoph Borchardt | 2013-08-16 | 1 | -0/+2 |
| * | | | | | | fix loading.gif size for both upload and deletion, force visiblity | Jan-Christoph Borchardt | 2013-07-30 | 2 | -2/+8 |
| * | | | | | | Replace delete icon with spinner | Victor Dubiniuk | 2013-07-29 | 2 | -7/+5 |
| * | | | | | | Merge branch 'master' into delete-fix | Thomas Müller | 2013-07-23 | 1389 | -12870/+80511 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Explicit ie8 fallback | Victor Dubiniuk | 2013-07-23 | 1 | -0/+4 |
| * | | | | | | | fix delete button not showing in IE8 | Jan-Christoph Borchardt | 2013-07-22 | 1 | -4/+4 |