Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | 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 |
|\ \ | | | | | | | Design fixes | ||||
| * | | 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 |
|\ \ \ \ | | | | | | | | | | | More whitespace | ||||
| * \ \ \ | 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 ↵ | Jan-Christoph Borchardt | 2013-07-09 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | of permanent | ||||
| * | | | | 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 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Delete icon fix | ||||
| * | | | | 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 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/css/styles.css | ||||
| * | | | | | 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 |
| | | | | | | |||||
| * | | | | | 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 | 2 | -2/+1 |
| | | | | | | |||||
| * | | | | | use background image instead of img for Files delete icon | Jan-Christoph Borchardt | 2013-07-18 | 2 | -4/+5 |
| | | | | | | |||||
| * | | | | | make delete icon less intrusive again, only on hover | Jan-Christoph Borchardt | 2013-07-18 | 5 | -10/+20 |
| | | | | | | |||||
* | | | | | | Merge pull request #4354 from ↵ | Thomas Müller | 2013-08-15 | 3 | -7/+11 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/fix_2711_shared_icon_disappears_on_firefox fix #2711 using a custom event, also use css selectors over filterAttr | ||||
| * | | | | | | fix #2711 using a custom event, also use css selectors over filterAttr | Jörn Friedrich Dreyer | 2013-08-08 | 3 | -7/+11 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #4443 from owncloud/remove-jplayer-from-core-css | Thomas Müller | 2013-08-15 | 2 | -6/+3 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | remove jPlayer css rules from core css file | ||||
| * | | | | | | | remove jPlayer css rules from core css file | Morris Jobke | 2013-08-15 | 2 | -6/+3 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #4448 from owncloud/fixing-4444-master | Morris Jobke | 2013-08-15 | 289 | -957/+957 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixing 4444 master | ||||
| * | | | | | | | fixing all broken translation files | Thomas Müller | 2013-08-15 | 288 | -956/+956 |
| | | | | | | | | |||||
| * | | | | | | | fixing call to join | Thomas Müller | 2013-08-15 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #4441 from guruz/checkServer_cache_result | Markus Goetz | 2013-08-15 | 1 | -0/+7 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Cache OC_Util::checkServer() result in session | ||||
| * | | | | | | Cache OC_Util::checkServer() result in session | Markus Goetz | 2013-08-15 | 1 | -0/+7 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | The return value almost never changes but this function is called for every request. | ||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-15 | 615 | -8868/+8099 |
| | | | | | | |||||
* | | | | | | Merge pull request #4302 from synchrone/master | Morris Jobke | 2013-08-14 | 1 | -0/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixing owncloud/core#4301 | ||||
| * | | | | | | Fixing owncloud/core#4301 | Alexander Bogdanov | 2013-08-02 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | Adding a CURLOPT_FOLLOWLOCATION for HTTP 301 support (e.g yandex disk uses those) | ||||
* | | | | | | | Merge pull request #4393 from owncloud/fix_4326 | Andreas Fischer | 2013-08-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | provide correct path for require_once * owncloud/fix_4326: use __DIR__ instead of realpath provide correct path for require_once | ||||
| * | | | | | | | 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 #4304 from tripflex/lostpw-themed | Thomas Müller | 2013-08-14 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | use theme name and title for password reset | ||||
| * | | | | | | | | use getName instead of getTitle | Myles McNamara | 2013-08-08 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | fix syntax error | Myles McNamara | 2013-08-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | accidentally had ; included, and changed concatenating |