| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | | | | | | | | | | | Merge branch 'master' into external_storage_ui_feedback | Michael Gapczynski | 2013-02-11 | 1552 | -42741/+125927 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | Change wordings | Michael Gapczynski | 2013-02-11 | 1 | -3/+3 |
| * | | | | | | | | | | | | Merge branch 'master' into external_storage_ui_feedback | Michael Gapczynski | 2013-01-09 | 585 | -9876/+18963 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | Set status to waiting for Dropbox and Google Drive while authenticating | Michael Gapczynski | 2013-01-09 | 2 | -0/+6 |
| * | | | | | | | | | | | | | Remove accidentally included file | Michael Gapczynski | 2013-01-02 | 1 | -5/+0 |
| * | | | | | | | | | | | | | Listen to checkbox changes as well | Michael Gapczynski | 2013-01-02 | 1 | -0/+4 |
| * | | | | | | | | | | | | | Fix 'Grant Access' button for multiple Google Drive mount points and prevent ... | Michael Gapczynski | 2013-01-02 | 3 | -11/+25 |
| * | | | | | | | | | | | | | Turn off async for saving mount points, improve input detection for Google an... | Michael Gapczynski | 2013-01-01 | 3 | -71/+123 |
| * | | | | | | | | | | | | | Fix problems with chosen multiselect | Michael Gapczynski | 2012-12-28 | 1 | -15/+31 |
| * | | | | | | | | | | | | | Fix some of the default mount points creating sub folders i.e. SMB / CIFS, ow... | Michael Gapczynski | 2012-12-28 | 1 | -1/+6 |
| * | | | | | | | | | | | | | Move storage backend tests from constructor to test function | Michael Gapczynski | 2012-12-28 | 9 | -26/+26 |
| * | | | | | | | | | | | | | Fix last commit's variable | Michael Gapczynski | 2012-12-26 | 1 | -2/+1 |
| * | | | | | | | | | | | | | Listen to paste events for dropbox configuration | Michael Gapczynski | 2012-12-26 | 1 | -4/+15 |
| * | | | | | | | | | | | | | Change callback url for dropbox as well | Michael Gapczynski | 2012-12-26 | 1 | -1/+1 |
| * | | | | | | | | | | | | | Save configuration after paste events and 2 seconds after typing | Michael Gapczynski | 2012-12-26 | 1 | -2/+17 |
| * | | | | | | | | | | | | | Prevent javascript error if no value is set for the multiselect | Michael Gapczynski | 2012-12-24 | 1 | -1/+6 |
| * | | | | | | | | | | | | | Change callback url to path only in case oauth parameters are still in url | Michael Gapczynski | 2012-12-24 | 1 | -1/+1 |
| * | | | | | | | | | | | | | Show status icons for mount points in external storage UI | Michael Gapczynski | 2012-12-24 | 15 | -107/+203 |
* | | | | | | | | | | | | | | Merge pull request #1967 from eMerzh/refix_1931 | Thomas Müller | 2013-02-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|_|/ / / /
|/| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Refix #1931 | Brice Maron | 2013-02-27 | 1 | -1/+1 |
|/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge pull request #1964 from owncloud/versions_cleanup | Frank Karlitschek | 2013-02-27 | 5 | -42/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | remove admin settings from app.php | Björn Schießle | 2013-02-27 | 1 | -2/+0 |
| * | | | | | | | | | | | | | Merge branch 'master' into versions_cleanup | Björn Schießle | 2013-02-27 | 217 | -4884/+4992 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | rename History to Versions | Björn Schießle | 2013-02-27 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | remove admin settings for versions | Björn Schießle | 2013-02-27 | 4 | -38/+0 |
* | | | | | | | | | | | | | | | Merge pull request #1962 from owncloud/big_upload_fix | Bernhard Posselt | 2013-02-27 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / / / / / / /
|/| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | timeout after a longer time | Bernhard Posselt | 2013-02-27 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | [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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | 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 instead o... | Bernhard Posselt | 2013-02-27 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | 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 | 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 | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | 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 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / / / / / / /
|/| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | remove general CSS from IE specific rules, displays Shared state permanently ... | Jan-Christoph Borchardt | 2013-02-26 | 1 | -6/+0 |
| * | | | | | | | | | | | | | | 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 |
| | |_|_|_|_|_|_|_|/ / / / /
| |/| | | | | | | | | | | | |
|