Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-27 | 201 | -4833/+4927 |
| | |||||
* | Merge pull request #1956 from owncloud/session-error-format | Bart Visscher | 2013-02-27 | 1 | -0/+1 |
|\ | | | | | add styles before session init | ||||
| * | only add style.css to initsession | Bernhard Posselt | 2013-02-27 | 1 | -1/+2 |
| | | |||||
| * | add css and scripts before session init | Bernhard Posselt | 2013-02-27 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1961 from owncloud/trans_fix | Bart Visscher | 2013-02-27 | 1 | -1/+1 |
|\ \ | | | | | | | fixed bug that would cause a failure because of undefined variable inst... | ||||
| * | | fixed bug that would cause a failure because of undefined variable instead ↵ | Bernhard Posselt | 2013-02-27 | 1 | -1/+1 |
| |/ | | | | | | | of %s in a translation string | ||||
* | | Merge pull request #1953 from owncloud/escape_regular_expressions | Frank Karlitschek | 2013-02-27 | 2 | -4/+3 |
|\ \ | | | | | | | escape regular expressions; fix typo in variable name | ||||
| * | | escape regular expressions; fix typo in variable name | Björn Schießle | 2013-02-27 | 2 | -4/+3 |
| | | | |||||
* | | | Merge pull request #1955 from owncloud/login-button-alignment | Bernhard Posselt | 2013-02-27 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | quick fix for log in button not being aligned with input fields | ||||
| * | | | quick fix for log in button not being aligned with input fields | Jan-Christoph Borchardt | 2013-02-27 | 1 | -0/+1 |
| |/ / | |||||
* | | | Merge pull request #1958 from owncloud/fixing-1933-master | Björn Schießle | 2013-02-27 | 1 | -1/+4 |
|\ \ \ | | | | | | | | | the locale name is no longer part of the translation string | ||||
| * | | | fixes 1933 - the locale name is no longer part of the translation string | Thomas Mueller | 2013-02-27 | 1 | -1/+4 |
| | | | | |||||
* | | | | Merge pull request #1957 from owncloud/fix-895 | Bernhard Posselt | 2013-02-27 | 5 | -27/+26 |
|\ \ \ \ | | | | | | | | | | | Fix 895 | ||||
| * | | | | properly align triangle and unshare icons to text, also fixes line hopping | Jan-Christoph Borchardt | 2013-02-27 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | fix ugly giant triangles | Jan-Christoph Borchardt | 2013-02-27 | 4 | -26/+18 |
| | | | | | |||||
| * | | | | fix shared by text going out of box, fix #895 | Jan-Christoph Borchardt | 2013-02-27 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | Merge pull request #1948 from owncloud/improve_user_sorting | Bernhard Posselt | 2013-02-27 | 3 | -4/+13 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Sort after display name + LDAP server side sorting | ||||
| * | | | | sort users according to display name | Arthur Schiwon | 2013-02-26 | 2 | -3/+3 |
| | | | | | |||||
| * | | | | LDAP: sort users on server-side | Arthur Schiwon | 2013-02-26 | 1 | -1/+10 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1905 from owncloud/fix-share-icons | Thomas Müller | 2013-02-27 | 2 | -12/+6 |
|\ \ \ \ | |_|/ / |/| | | | Fix adding share icons to share action | ||||
| * | | | remove general CSS from IE specific rules, displays Shared state permanently ↵ | Jan-Christoph Borchardt | 2013-02-26 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | again | ||||
| * | | | Move space | Michael Gapczynski | 2013-02-25 | 1 | -4/+4 |
| | | | | |||||
| * | | | Fix adding share icons to share action | Michael Gapczynski | 2013-02-25 | 1 | -6/+6 |
| | | | | |||||
* | | | | Merge pull request #1800 from raghunayyar/sharing-dropdown-fixes | Jan-Christoph Borchardt | 2013-02-27 | 2 | -2/+10 |
|\ \ \ \ | |_|_|/ |/| | | | Various Layout Fixes for Sharing Dropdown. | ||||
| * | | | Reduced email input width by 10% to increase space. | raghunayyar | 2013-02-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Hovering on the unshare doesnt spoil look | raghunayyar | 2013-02-20 | 1 | -0/+4 |
| | | | | |||||
| * | | | Fixes the Email Button and the email input Width. | raghunayyar | 2013-02-20 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'sharing-css-fix' into sharing-dropdown-fixes | raghunayyar | 2013-02-20 | 1 | -0/+4 |
| |\ \ \ | |||||
| | * | | | Text stays inside the sharing dropdown | raghunayyar | 2013-02-19 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | Merge pull request #1949 from owncloud/fix-dropbox | Michael Gapczynski | 2013-02-26 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix undefined root parameter in Dropbox storage | ||||
| * | | | | | Fix undefined root parameter in Dropbox storage | Michael Gapczynski | 2013-02-26 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-27 | 75 | -440/+2891 |
|/ / / / / | |||||
* | | | | | Merge pull request #1931 from owncloud/fastcgi | Thomas Müller | 2013-02-26 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | add cgi pathinfo when fcgi is enabled #1189 | ||||
| * | | | | | add cgi pathinfo when fcgi is enabled #1189 | Bernhard Posselt | 2013-02-26 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #1942 from owncloud/fix-1925-wrong-quotes | Thomas Müller | 2013-02-26 | 5 | -20/+20 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix using wrong quotes for breaking long lines | ||||
| * | | | | | | Fix using wrong quotes for breaking long lines | Bart Visscher | 2013-02-26 | 5 | -20/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1925 | ||||
* | | | | | | | Merge pull request #1929 from owncloud/htaccess-utf8 | Thomas Müller | 2013-02-26 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | added defaultcharset to utf-8 in htaccess | ||||
| * | | | | | | | added defaultcharset to utf-8 in htaccess | Bernhard Posselt | 2013-02-26 | 1 | -0/+1 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #1941 from owncloud/session_heartbeat | Bart Visscher | 2013-02-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | generate url only once for heartbeat | ||||
| * | | | | | | | generate url only once | Bernhard Posselt | 2013-02-26 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #1939 from owncloud/session_heartbeat | Lukas Reschke | 2013-02-26 | 1 | -1/+1 |
|\| | | | | | | | |_|/ / / / / |/| | | | | | | use 15 min instead of 15 sec timeout | ||||
| * | | | | | | use 15 min instead of 15 sec timeout | Bernhard Posselt | 2013-02-26 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1938 from owncloud/session_heartbeat | Frank Karlitschek | 2013-02-26 | 2 | -0/+20 |
|\| | | | | | | |_|_|_|_|/ |/| | | | | | implemented a heartbeat request which is calls the server every 15 minut... | ||||
| * | | | | | implemented a heartbeat request which is calls the server every 15 minutes ↵ | Bernhard Posselt | 2013-02-26 | 2 | -0/+20 |
| |/ / / / | | | | | | | | | | | | | | | | to prevent a session timeout | ||||
* | | | | | Merge pull request #1920 from owncloud/catch_vcategories_exceptions | Lukas Reschke | 2013-02-26 | 1 | -18/+34 |
|\ \ \ \ \ | | | | | | | | | | | | | Catch exceptions on malformed categories. | ||||
| * | | | | | Catch exceptions on malformed categories. | Thomas Tanghus | 2013-02-26 | 1 | -18/+34 |
| | | | | | | |||||
* | | | | | | Merge pull request #1922 from owncloud/missing_ | Thomas Müller | 2013-02-26 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add missing echo | ||||
| * | | | | | | Add missing echo | Lukas Reschke | 2013-02-26 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1915 from owncloud/fix_webdav_mount | Frank Karlitschek | 2013-02-26 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | cleanPath needs to be public | ||||
| * | | | | | | cleanPath needs to be public | Björn Schießle | 2013-02-26 | 1 | -1/+1 |
| |/ / / / / |