summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4993 from michaelletzgus/emit_css-tagsMorris Jobke2017-06-144-19/+34
|\
| * Streamline templates, more DRYMichael Letzgus2017-05-254-19/+34
* | Merge pull request #5409 from nextcloud/1param2muchJoas Schilling2017-06-141-2/+1
|\ \
| * | a parameter too muchArthur Schiwon2017-06-141-2/+1
* | | Merge pull request #5400 from nextcloud/fix/contactsmenu-l10n-search-placeholderJoas Schilling2017-06-141-1/+1
|\ \ \ | |/ / |/| |
| * | Localize contacts menu search input placeholderChristoph Wurst2017-06-141-1/+1
* | | Merge pull request #5013 from nextcloud/update-integration-tests-composer-cacheLukas Reschke2017-06-141-30/+30
|\ \ \
| * | | Update integration tests composer cacheMorris Jobke2017-06-141-30/+30
* | | | Merge pull request #5392 from nextcloud/maintenance-mode-styleLukas Reschke2017-06-142-10/+1
|\ \ \ \
| * | | | Use the guest.css for the maintenance page as wellMorris Jobke2017-06-132-10/+1
* | | | | Merge pull request #5207 from nextcloud/ldap-remove-userwebdavauth-checkblizzz2017-06-142-9/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | remove check, user_webdavauth is not an app anymore for longArthur Schiwon2017-06-012-9/+1
* | | | | Merge pull request #5361 from nextcloud/exclude-files-external-dir-from-encry...Lukas Reschke2017-06-141-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | don't try to encrypt/decrypt the certificate bundleBjoern Schiessle2017-06-131-0/+1
* | | | | [tx-robot] updated from transifexNextcloud bot2017-06-14118-228/+256
* | | | | Merge pull request #5295 from nextcloud/bugfix/5077/allow_proppatches_to_birt...Morris Jobke2017-06-132-0/+11
|\ \ \ \ \
| * | | | | allow PropPatch requests to contact_birthdaysGeorg Ehrke2017-06-082-0/+11
* | | | | | Merge pull request #5072 from mjmunger/masterMorris Jobke2017-06-131-1/+1
|\ \ \ \ \ \
| * | | | | | Fixed a crash caused by Local::copyFromStorage() not conforming to Common::co...Michael Munger2017-05-231-1/+1
* | | | | | | Merge pull request #5061 from nextcloud/example-theme-guestMorris Jobke2017-06-131-0/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Move styles.css to server.cssJulius Härtl2017-05-231-0/+0
* | | | | | | Merge pull request #5367 from nextcloud/better-share-errorMorris Jobke2017-06-132-2/+7
|\ \ \ \ \ \ \
| * | | | | | | Fix unknown share tokenJoas Schilling2017-06-132-2/+7
* | | | | | | | Merge pull request #5380 from nextcloud/global-scale-settingsMorris Jobke2017-06-132-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | fix 'add to your nextcloud' input field, this is not an email addressBjoern Schiessle2017-06-132-2/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #5383 from nextcloud/revert-5259Morris Jobke2017-06-133-8/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "allow admin to disable groups on personal page"Morris Jobke2017-06-133-8/+0
* | | | | | | | | Merge pull request #5372 from nextcloud/we-shall-monkey-patch-auth-headers-fo...Morris Jobke2017-06-133-5/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Prevent sending second WWW-Authenticate headerLukas Reschke2017-06-133-5/+25
* | | | | | | | | | Merge pull request #5378 from patschi/fix-5349Morris Jobke2017-06-131-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix #5349, no themed icon when dragging folderPatrik Kernstock2017-06-131-1/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5305 from nextcloud/add-quota-to-files-viewMorris Jobke2017-06-138-8/+93
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Do not show icon for quota barMorris Jobke2017-06-132-5/+2
| * | | | | | | | | | Remove unused elementJoas Schilling2017-06-131-2/+1
| * | | | | | | | | | Put the quota bar to the bottomMorris Jobke2017-06-133-8/+15
| * | | | | | | | | | Adjust the unit testJoas Schilling2017-06-131-0/+8
| * | | | | | | | | | Remove the colored cornersJoas Schilling2017-06-131-0/+1
| * | | | | | | | | | Add an event so apps can add hidden fields to the files pageJoas Schilling2017-06-132-1/+8
| * | | | | | | | | | Only set the active item when there is one (not the case for quota)Joas Schilling2017-06-131-1/+3
| * | | | | | | | | | Content will come from the external appJoas Schilling2017-06-131-1/+0
| * | | | | | | | | | Remove useless translation and make it better on unlimitedJoas Schilling2017-06-131-5/+8
| * | | | | | | | | | Style quota entry in files viewJan-Christoph Borchardt2017-06-133-17/+38
| * | | | | | | | | | Add quota to the files viewJoas Schilling2017-06-134-0/+41
* | | | | | | | | | | Merge pull request #5369 from nextcloud/fix-user-group-name-escapingMorris Jobke2017-06-131-2/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix escaping of user and group names in "shared by" messageJoas Schilling2017-06-131-2/+6
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #5373 from nextcloud/i-like-you-all-but-would-like-you-mor...Lukas Reschke2017-06-131-4/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove duplicate dependencies entryLukas Reschke2017-06-131-4/+0
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5364 from nextcloud/fix-stringsMorris Jobke2017-06-131-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | fix config switch description, this is only about searching for users, to ena...Bjoern Schiessle2017-06-131-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #5370 from nextcloud/update-third-party-refLukas Reschke2017-06-131-0/+0
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-21 16:56:10 +0000