summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | use new delete icon for deleted files as wellJan-Christoph Borchardt2013-07-181-1/+1
| * | | | | remove unnecessary tipsy for Files deleteJan-Christoph Borchardt2013-07-182-2/+1
| * | | | | use background image instead of img for Files delete iconJan-Christoph Borchardt2013-07-182-4/+5
| * | | | | make delete icon less intrusive again, only on hoverJan-Christoph Borchardt2013-07-185-10/+20
* | | | | | Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_fir...Thomas Müller2013-08-153-7/+11
|\ \ \ \ \ \
| * | | | | | fix #2711 using a custom event, also use css selectors over filterAttrJörn Friedrich Dreyer2013-08-083-7/+11
* | | | | | | Merge pull request #4443 from owncloud/remove-jplayer-from-core-cssThomas Müller2013-08-152-6/+3
|\ \ \ \ \ \ \
| * | | | | | | remove jPlayer css rules from core css fileMorris Jobke2013-08-152-6/+3
|/ / / / / / /
* | | | | | | Merge pull request #4448 from owncloud/fixing-4444-masterMorris Jobke2013-08-15289-957/+957
|\ \ \ \ \ \ \
| * | | | | | | fixing all broken translation filesThomas Müller2013-08-15288-956/+956
| * | | | | | | fixing call to joinThomas Müller2013-08-151-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #4441 from guruz/checkServer_cache_resultMarkus Goetz2013-08-151-0/+7
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Cache OC_Util::checkServer() result in sessionMarkus Goetz2013-08-151-0/+7
|/ / / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-15615-8868/+8099
* | | | | | Merge pull request #4302 from synchrone/masterMorris Jobke2013-08-141-0/+1
|\ \ \ \ \ \
| * | | | | | Fixing owncloud/core#4301Alexander Bogdanov2013-08-021-0/+1
* | | | | | | Merge pull request #4393 from owncloud/fix_4326Andreas Fischer2013-08-141-1/+1
|\ \ \ \ \ \ \
| * | | | | | | use __DIR__ instead of realpathBjoern Schiessle2013-08-141-1/+1
| * | | | | | | provide correct path for require_onceBjoern Schiessle2013-08-121-1/+1
* | | | | | | | Merge pull request #4304 from tripflex/lostpw-themedThomas Müller2013-08-141-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | use getName instead of getTitleMyles McNamara2013-08-081-1/+1
| * | | | | | | | fix syntax errorMyles McNamara2013-08-031-1/+1