summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4481 from owncloud/fix_versioning_size_checkBjörn Schießle2013-08-171-10/+9
|\
| * first check if file exists before checking the files sizeBjoern Schiessle2013-08-171-10/+9
* | Merge pull request #4352 from owncloud/encryption_clean_upBjörn Schießle2013-08-175-445/+50
|\ \
| * | change decryptUnknownKeyfile() to decryptKeyfile(), we always use openssl_sealBjoern Schiessle2013-08-121-30/+6
| * | Merge branch 'encryption_clean_up' of github.com:owncloud/core into encryptio...Bjoern Schiessle2013-08-092-7/+7
| |\ \
| | * | fixing typos and PHPDocThomas Müller2013-08-082-7/+7
| * | | remove old comments, TODos, etc.Bjoern Schiessle2013-08-092-66/+0
| |/ /
| * | remove todo itemBjoern Schiessle2013-08-081-4/+0
| * | adapt tests to the changes in crypt.phpBjoern Schiessle2013-08-082-244/+31
| * | make methods private which are not used from outsideBjoern Schiessle2013-08-081-101/+13
* | | LDAP: only connect to LDAP once on loginArthur Schiwon2013-08-172-6/+18
* | | Merge pull request #4471 from owncloud/password-iconThomas Müller2013-08-174-4/+7
|\ \ \
| * | | use proper password icon, three dots are 'more'Jan-Christoph Borchardt2013-08-164-4/+7
| | |/ | |/|
* | | Merge pull request #4476 from owncloud/doc-on-masterThomas Müller2013-08-173-2/+2
|\ \ \
| * | | fix difference between packaged version and masterMorris Jobke2013-08-173-2/+2
| |/ /
* | | Merge pull request #4480 from owncloud/remove-ru_RU-masterThomas Müller2013-08-1723-2633/+0
|\ \ \
| * | | remove ru_RU - fixes #3135Thomas Müller2013-08-1723-2633/+0
| |/ /
* | | Merge pull request #4193 from owncloud/versions_fix_cssMorris Jobke2013-08-172-9/+6
|\ \ \ | |/ / |/| |
| * | increase width of versions dialogBjoern Schiessle2013-08-171-0/+4
| * | css for button no longer neededBjörn Schießle2013-07-251-3/+0
| * | remove unused code; use jqueryBjörn Schießle2013-07-251-6/+2
| * | fix cssBjörn Schießle2013-07-251-1/+1
* | | Merge pull request #4442 from owncloud/no-smb-client-on-windows-masterMorris Jobke2013-08-161-10/+16
|\ \ \
| * | | no files external for SMB on windowsThomas Müller2013-08-151-10/+16
* | | | Merge pull request #4314 from owncloud/css-fixesJan-Christoph Borchardt2013-08-165-42/+21
|\ \ \ \
| * | | | tixing width and position of wider error messagesThomas Müller2013-08-162-1/+6
| * | | | merge master into css-fixesJan-Christoph Borchardt2013-08-161473-14328/+24962
| |\ \ \ \
| * | | | | change long couldn't be determined string to question mark againJan-Christoph Borchardt2013-08-041-1/+1
| * | | | | wrap code output in error messages, fix #4231Jan-Christoph Borchardt2013-07-311-0/+4
| * | | | | remove table layout for background jobsJan-Christoph Borchardt2013-07-311-14/+6
| * | | | | remove unused and never to be used paginationJan-Christoph Borchardt2013-07-311-22/+0
| * | | | | remove ugly inset shadow from headerJan-Christoph Borchardt2013-07-301-1/+4
| * | | | | reduce z-index of settings popup, fix #4212Jan-Christoph Borchardt2013-07-301-1/+1
* | | | | | Merge pull request #4032 from owncloud/more-whitespaceMorris Jobke2013-08-161-47/+82
|\ \ \ \ \ \
| * \ \ \ \ \ merge master into more-whitespaceJan-Christoph Borchardt2013-08-152568-39800/+129181
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | prevent ugly selection effect on accidental selection, fix #3713Jan-Christoph Borchardt2013-07-091-0/+4
| * | | | | | more whitespace for user menuJan-Christoph Borchardt2013-07-091-4/+19
| * | | | | | more small whitespace fixes for the app listJan-Christoph Borchardt2013-07-091-5/+5
| * | | | | | more whitespace WIP 2Jan-Christoph Borchardt2013-07-091-3/+23
| * | | | | | more whitespace WIPJan-Christoph Borchardt2013-07-091-25/+38
| * | | | | | app styles: remove bottom padding. Settings should be last in list instead of...Jan-Christoph Borchardt2013-07-091-1/+0
| * | | | | | Removes Borders from the left navigation.raghunayyar2013-07-091-11/+0
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-16214-1749/+1447
* | | | | | | Merge pull request #4113 from owncloud/delete-fixJan-Christoph Borchardt2013-08-159-26/+46
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | force show loading icon also for IEJan-Christoph Borchardt2013-08-161-0/+2
| * | | | | | fix loading.gif size for both upload and deletion, force visiblityJan-Christoph Borchardt2013-07-302-2/+8
| * | | | | | Replace delete icon with spinnerVictor Dubiniuk2013-07-292-7/+5
| * | | | | | Merge branch 'master' into delete-fixThomas Müller2013-07-231389-12870/+80511
| |\ \ \ \ \ \
| * | | | | | | Explicit ie8 fallbackVictor Dubiniuk2013-07-231-0/+4
| * | | | | | | fix delete button not showing in IE8Jan-Christoph Borchardt2013-07-221-4/+4