| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #11968 from owncloud/drop-jquery-placeholder | Lukas Reschke | 2014-11-05 | 3 | -218/+0 |
| |\ | |||||
| | * | drop unused jquery.placeholder | Morris Jobke | 2014-11-05 | 3 | -218/+0 |
| * | | Merge pull request #11355 from owncloud/unbold | Thomas Müller | 2014-11-05 | 3 | -7/+5 |
| |\ \ | |||||
| | * | | explicitly unbold text by default, otherwise might be bold | Jan-Christoph Borchardt | 2014-11-05 | 1 | -0/+2 |
| | * | | unbold labels and folders | Jan-Christoph Borchardt | 2014-11-05 | 2 | -7/+3 |
| |/ / | |||||
| * | | Merge pull request #11965 from owncloud/fix-jsonresponse | Thomas Müller | 2014-11-05 | 2 | -2/+2 |
| |\ \ | |||||
| | * | | fix typo in content type | Bernhard Posselt | 2014-11-05 | 2 | -2/+2 |
| * | | | Merge pull request #11928 from owncloud/support-HTML-in-logo | Thomas Müller | 2014-11-05 | 3 | -1/+21 |
| |\ \ \ | |||||
| | * | | | Support HTML in logo claim | Lukas Reschke | 2014-11-03 | 3 | -1/+21 |
| * | | | | Merge pull request #11962 from owncloud/fix-server-sharing-strings | Thomas Müller | 2014-11-05 | 1 | -3/+11 |
| |\ \ \ \ | |_|_|/ |/| | | | |||||
| | * | | | adjust strings - fixed #11930 | Thomas Müller | 2014-11-05 | 1 | -3/+11 |
| | | |/ | |/| | |||||
| * | | | Merge pull request #11966 from owncloud/drop-jquery-inview | Morris Jobke | 2014-11-05 | 5 | -192/+0 |
| |\ \ \ | |||||
| | * | | | drop jquery.inview as it is unused | Morris Jobke | 2014-11-05 | 5 | -192/+0 |
| |/ / / | |||||
| * | | | Merge pull request #11853 from owncloud/close-session-for-trashbin | Vincent Petry | 2014-11-05 | 5 | -0/+6 |
| |\ \ \ | |||||
| | * | | | Close session for files_trashbin | Lukas Reschke | 2014-10-29 | 5 | -0/+6 |
| * | | | | Merge pull request #11953 from owncloud/drop-listview-js | Thomas Müller | 2014-11-05 | 1 | -71/+0 |
| |\ \ \ \ | |_|/ / |/| | | | |||||
| | * | | | drop listview.js | Morris Jobke | 2014-11-04 | 1 | -71/+0 |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-05 | 42 | -92/+220 |
| * | | | | Merge pull request #11949 from owncloud/s2s-fixcertcheckwhennocertfile | Vincent Petry | 2014-11-04 | 1 | -1/+8 |
| |\ \ \ \ | |/ / / |/| | | | |||||
| | * | | | Store curl error message directly | Vincent Petry | 2014-11-04 | 1 | -5/+2 |
| | * | | | Check for cert bundle existence before using it | Vincent Petry | 2014-11-04 | 1 | -1/+11 |
| |/ / / | |||||
| * | | | Merge pull request #11940 from owncloud/fix-underline-convention | Thomas Müller | 2014-11-04 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | fix shortcuts - underline instead of camelCase | Morris Jobke | 2014-11-04 | 1 | -2/+2 |
| * | | | | Merge pull request #11938 from owncloud/jshintrc-laxbreak | Thomas Müller | 2014-11-04 | 1 | -0/+1 |
| |\ \ \ \ | |||||
| | * | | | | enable laxbreak option in jshintrc to comply with our coding guide lines | Arthur Schiwon | 2014-11-04 | 1 | -0/+1 |
| | |/ / / | |||||
| * | | | | Merge pull request #11934 from owncloud/trash-restorefixonlyrescantrashfolder | Vincent Petry | 2014-11-04 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Only rescan trash folder when checking deleted versions | Vincent Petry | 2014-11-04 | 1 | -1/+1 |
| * | | | | | Merge pull request #11362 from mark0n/rm_ldap_conf_cli | blizzz | 2014-11-04 | 3 | -3/+45 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| | * | | | | Add a CLI command that deletes an LDAP config | Martin Konrad | 2014-09-30 | 3 | -3/+45 |
| * | | | | | Merge pull request #11916 from owncloud/introduce-bower | Morris Jobke | 2014-11-04 | 10 | -71/+262 |
| |\ \ \ \ \ | |||||
| | * | | | | | use https ... everywhere :) | Morris Jobke | 2014-11-04 | 1 | -1/+1 |
| | * | | | | | replace moment.js with bower version | Morris Jobke | 2014-11-03 | 7 | -55/+168 |
| | * | | | | | ability to add bower resources | Morris Jobke | 2014-11-03 | 4 | -16/+94 |
| | | |_|_|/ | |/| | | | |||||
| * | | | | | Merge pull request #11931 from owncloud/fix-js-unit-tests | Morris Jobke | 2014-11-04 | 1 | -7/+7 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| | * | | | | JS unit tests fix - use toBeUndefined() instead of toEqual(null) | Morris Jobke | 2014-11-04 | 1 | -7/+7 |
| |/ / / / | |||||
| * | | | | fix config.sample.php linebreak | Morris Jobke | 2014-11-04 | 1 | -6/+8 |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-04 | 68 | -67/+33 |
| * | | | | Merge pull request #11924 from owncloud/firstCheckIfItIsDefaultConfig | Morris Jobke | 2014-11-03 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / |/| | | | |||||
| | * | | | First check whether it is the default config before touchign | Lukas Reschke | 2014-11-03 | 1 | -1/+1 |
| * | | | | update 3rdparty to master | Morris Jobke | 2014-11-03 | 1 | -0/+0 |
| * | | | | update 3rdparty to master | Morris Jobke | 2014-11-03 | 1 | -0/+0 |
| * | | | | Merge pull request #11918 from owncloud/pimple-composer | Thomas Müller | 2014-11-03 | 4 | -15/+17 |
| |\ \ \ \ | |||||
| | * | | | | Update Pimple to V3.0 | Thomas Müller | 2014-11-03 | 4 | -15/+17 |
| |/ / / / | |||||
| * | | | | Merge pull request #11921 from owncloud/symfony-composer | Lukas Reschke | 2014-11-03 | 3 | -2/+1 |
| |\ \ \ \ | |/ / / |/| | | | |||||
| | * | | | Fix ctor call in OC\Core\Command\Upgrade | Thomas Müller | 2014-11-03 | 1 | -0/+1 |
| | * | | | Update Symfony/Console to 2.5 & Update Symfony/Routing to 2.5 | Thomas Müller | 2014-11-03 | 2 | -2/+0 |
| * | | | | Merge pull request #11923 from owncloud/admin-connectivitycheckscapitalized | Thomas Müller | 2014-11-03 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Capitalize Checks in admin page | Vincent Petry | 2014-11-03 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Merge pull request #11172 from owncloud/user-ldap-no-bcmath | blizzz | 2014-11-03 | 3 | -54/+57 |
| |\ \ \ \ | |/ / / |/| | | | |||||
| | * | | | user_ldap: Reimplement convertSID2Str() without BCMath dependency. | Andreas Fischer | 2014-11-03 | 3 | -54/+57 |
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |