summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into versions_cleanupBjörn Schießle2013-02-27217-4884/+4992
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-02-27201-4833/+4927
| * Merge pull request #1956 from owncloud/session-error-formatBart Visscher2013-02-271-0/+1
| |\
| | * only add style.css to initsessionBernhard Posselt2013-02-271-1/+2
| | * add css and scripts before session initBernhard Posselt2013-02-271-1/+1
| * | Merge pull request #1961 from owncloud/trans_fixBart Visscher2013-02-271-1/+1
| |\ \
| | * | fixed bug that would cause a failure because of undefined variable instead o...Bernhard Posselt2013-02-271-1/+1
| | |/
| * | Merge pull request #1953 from owncloud/escape_regular_expressionsFrank Karlitschek2013-02-272-4/+3
| |\ \
| | * | escape regular expressions; fix typo in variable nameBjörn Schießle2013-02-272-4/+3
| * | | Merge pull request #1955 from owncloud/login-button-alignmentBernhard Posselt2013-02-271-0/+1
| |\ \ \
| | * | | quick fix for log in button not being aligned with input fieldsJan-Christoph Borchardt2013-02-271-0/+1
| | |/ /
| * | | Merge pull request #1958 from owncloud/fixing-1933-masterBjörn Schießle2013-02-271-1/+4
| |\ \ \
| | * | | fixes 1933 - the locale name is no longer part of the translation stringThomas Mueller2013-02-271-1/+4
| * | | | Merge pull request #1957 from owncloud/fix-895Bernhard Posselt2013-02-275-27/+26
| |\ \ \ \
| | * | | | properly align triangle and unshare icons to text, also fixes line hoppingJan-Christoph Borchardt2013-02-271-0/+5
| | * | | | fix ugly giant trianglesJan-Christoph Borchardt2013-02-274-26/+18
| | * | | | fix shared by text going out of box, fix #895Jan-Christoph Borchardt2013-02-271-1/+3
| * | | | | Merge pull request #1948 from owncloud/improve_user_sortingBernhard Posselt2013-02-273-4/+13
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | sort users according to display nameArthur Schiwon2013-02-262-3/+3
| | * | | | LDAP: sort users on server-sideArthur Schiwon2013-02-261-1/+10
| | | |_|/ | | |/| |
| * | | | Merge pull request #1905 from owncloud/fix-share-iconsThomas Müller2013-02-272-12/+6
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | remove general CSS from IE specific rules, displays Shared state permanently ...Jan-Christoph Borchardt2013-02-261-6/+0
| | * | | Move spaceMichael Gapczynski2013-02-251-4/+4
| | * | | Fix adding share icons to share actionMichael Gapczynski2013-02-251-6/+6
| * | | | Merge pull request #1800 from raghunayyar/sharing-dropdown-fixesJan-Christoph Borchardt2013-02-272-2/+10
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Reduced email input width by 10% to increase space.raghunayyar2013-02-201-1/+1
| | * | | Hovering on the unshare doesnt spoil lookraghunayyar2013-02-201-0/+4
| | * | | Fixes the Email Button and the email input Width.raghunayyar2013-02-201-2/+2
| | * | | Merge branch 'sharing-css-fix' into sharing-dropdown-fixesraghunayyar2013-02-201-0/+4
| | |\ \ \
| | | * | | Text stays inside the sharing dropdownraghunayyar2013-02-191-0/+4
* | | | | | rename History to VersionsBjörn Schießle2013-02-271-2/+2
* | | | | | remove admin settings for versionsBjörn Schießle2013-02-274-38/+0
|/ / / / /
* | | | | Merge pull request #1949 from owncloud/fix-dropboxMichael Gapczynski2013-02-261-2/+2
|\ \ \ \ \
| * | | | | Fix undefined root parameter in Dropbox storageMichael Gapczynski2013-02-261-2/+2
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-2775-440/+2891
|/ / / / /
* | | | | Merge pull request #1931 from owncloud/fastcgiThomas Müller2013-02-261-0/+1
|\ \ \ \ \
| * | | | | add cgi pathinfo when fcgi is enabled #1189Bernhard Posselt2013-02-261-0/+1
* | | | | | Merge pull request #1942 from owncloud/fix-1925-wrong-quotesThomas Müller2013-02-265-20/+20
|\ \ \ \ \ \
| * | | | | | Fix using wrong quotes for breaking long linesBart Visscher2013-02-265-20/+20
* | | | | | | Merge pull request #1929 from owncloud/htaccess-utf8Thomas Müller2013-02-261-0/+1
|\ \ \ \ \ \ \
| * | | | | | | added defaultcharset to utf-8 in htaccessBernhard Posselt2013-02-261-0/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #1941 from owncloud/session_heartbeatBart Visscher2013-02-261-1/+1
|\ \ \ \ \ \ \
| * | | | | | | generate url only onceBernhard Posselt2013-02-261-1/+1
* | | | | | | | Merge pull request #1939 from owncloud/session_heartbeatLukas Reschke2013-02-261-1/+1
|\| | | | | | | | |_|/ / / / / |/| | | | | |
| * | | | | | use 15 min instead of 15 sec timeoutBernhard Posselt2013-02-261-1/+1
* | | | | | | Merge pull request #1938 from owncloud/session_heartbeatFrank Karlitschek2013-02-262-0/+20
|\| | | | | | | |_|_|_|_|/ |/| | | | |
| * | | | | implemented a heartbeat request which is calls the server every 15 minutes to...Bernhard Posselt2013-02-262-0/+20
| |/ / / /
* | | | | Merge pull request #1920 from owncloud/catch_vcategories_exceptionsLukas Reschke2013-02-261-18/+34
|\ \ \ \ \
| * | | | | Catch exceptions on malformed categories.Thomas Tanghus2013-02-261-18/+34
* | | | | | Merge pull request #1922 from owncloud/missing_Thomas Müller2013-02-261-1/+1
|\ \ \ \ \ \