Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #10347 from owncloud/fix-grammar | Volkan Gezer | 2014-08-11 | 1 | -1/+1 |
|\ | |||||
| * | Transifex suggestion by mnestis | Volkan Gezer | 2014-08-11 | 1 | -1/+1 |
* | | Merge pull request #10335 from owncloud/fix-emptyapplist | Clark Tomlinson | 2014-08-11 | 1 | -0/+1 |
|\ \ | |||||
| * | | Fix issue when no apps are enabled | Vincent Petry | 2014-08-11 | 1 | -0/+1 |
| |/ | |||||
* | | Merge pull request #9890 from owncloud/check-php-charset-master | Thomas Müller | 2014-08-11 | 3 | -6/+28 |
|\ \ | |/ |/| | |||||
| * | Removing ini charset override due to shared hosting issues | Clark Tomlinson | 2014-08-11 | 1 | -3/+0 |
| * | setting and checking default_charset in php.ini to be UTF-8 | Thomas Müller | 2014-07-25 | 4 | -6/+31 |
* | | Merge pull request #10336 from owncloud/fix_share_drop_down | Björn Schießle | 2014-08-11 | 1 | -12/+1 |
|\ \ | |||||
| * | | remove 'no people found' entry | Bjoern Schiessle | 2014-08-11 | 1 | -12/+1 |
* | | | Merge pull request #9848 from dupondje/master | blizzz | 2014-08-11 | 1 | -12/+18 |
|\ \ \ | |||||
| * | | | Fix initializing in #9848 | Jean-Louis Dupond | 2014-08-11 | 1 | -0/+1 |
| * | | | Fix remarks in #9848 | Jean-Louis Dupond | 2014-08-11 | 1 | -11/+13 |
| * | | | Fix memberOf detection. Fixes: #9835 | Jean-Louis Dupond | 2014-07-24 | 1 | -7/+10 |
* | | | | Merge pull request #10066 from marc0s/issues/10065-fix-null-check | Clark Tomlinson | 2014-08-11 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Fix checking of NULL or empty OC::$THIRDPARTYROOT/OC::$THIRDPARTYWEBROOT | marc0s | 2014-07-30 | 1 | -2/+2 |
* | | | | | Merge pull request #10251 from owncloud/fix-dav-attributes-master | Thomas Müller | 2014-08-11 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | shared files/folders are not mounted | Thomas Müller | 2014-08-07 | 1 | -1/+1 |
* | | | | | | Merge pull request #10301 from owncloud/fix-internal-mail-share-links | Vincent Petry | 2014-08-11 | 1 | -5/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add scrollto to the url if sharing a file for long file lists | Tom Needham | 2014-08-09 | 1 | -3/+9 |
| * | | | | | | Fix link to files and folders in internal share emails | Tom Needham | 2014-08-09 | 1 | -4/+3 |
* | | | | | | | Merge pull request #10096 from owncloud/fix-6971-master | Jörn Friedrich Dreyer | 2014-08-11 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | in case $_POST['itemSourceName'] does not exist we simply default it to null | Thomas Müller | 2014-08-01 | 1 | -1/+2 |
* | | | | | | | | Merge pull request #10303 from owncloud/sharing-breadcrumb-folder-name | Robin Appelman | 2014-08-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | use OC_Util::basename | Robin Appelman | 2014-01-15 | 1 | -1/+1 |
* | | | | | | | | | Merge pull request #10249 from mroi/patch-1 | Thomas Müller | 2014-08-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | file size on non-(Linux/BSD/Windows)-installations | Michael Roitzsch | 2014-08-07 | 1 | -1/+1 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #10312 from owncloud/fix-old-japanese | Thomas Müller | 2014-08-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | fix old Japanese language code redirection | Volkan Gezer | 2014-08-09 | 1 | -1/+1 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #10285 from owncloud/sharing_set_correct_min_date | Morris Jobke | 2014-08-11 | 2 | -5/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | update unit test, min date should be always today + 1 | Bjoern Schiessle | 2014-08-08 | 1 | -3/+5 |
| * | | | | | | | | set minDate always to today + one day | Bjoern Schiessle | 2014-08-08 | 1 | -2/+8 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-11 | 45 | -206/+312 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-10 | 221 | -3345/+1595 |
* | | | | | | | | | Merge pull request #10302 from owncloud/remove-logon-rejected | Lukas Reschke | 2014-08-09 | 1 | -8/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | remove confusing 'automatic logon rejected' message, fix #8591 | Jan-Christoph Borchardt | 2014-08-09 | 1 | -8/+0 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #10293 from owncloud/fix-headers-being-sent | Jan-Christoph Borchardt | 2014-08-09 | 3 | -3/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | using flush() here is pointless as we render the layout into a memory buffer ... | Thomas Müller | 2014-08-08 | 3 | -3/+0 |
* | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-09 | 146 | -1199/+1830 |
| |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge pull request #10290 from owncloud/check_quota_on_new_via_web | Thomas Müller | 2014-08-08 | 1 | -0/+23 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | check quota when trying to download a file via new -> web | Jörn Friedrich Dreyer | 2014-08-08 | 1 | -0/+23 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #10288 from owncloud/sharing_dont_show_share_dialog | Björn Schießle | 2014-08-08 | 2 | -18/+32 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | remove share permissions if user is excluded from sharing | Bjoern Schiessle | 2014-08-08 | 1 | -0/+10 |
| * | | | | | | | only show "share with others" and "share by link" navigation bar entries if u... | Bjoern Schiessle | 2014-08-08 | 1 | -18/+22 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #10280 from owncloud/lazyloading-earlier | Morris Jobke | 2014-08-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | trigger lazy loading earlier, fix #9823 | Jan-Christoph Borchardt | 2014-08-08 | 1 | -1/+1 |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-08 | 194 | -1837/+1772 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #10248 from owncloud/enc_remove_keys_from_session | Morris Jobke | 2014-08-07 | 4 | -4/+19 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | add logout hook to remove keys from session | Bjoern Schiessle | 2014-08-07 | 4 | -4/+19 |
* | | | | | | | | Merge pull request #9953 from owncloud/fix_text_preview_for_systems_without_ttf | Morris Jobke | 2014-08-07 | 1 | -1/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | implement a txt preview fallback for the case that ttf is not support | Georg Ehrke | 2014-07-28 | 1 | -1/+8 |