Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #13480 from owncloud/mysql-autocommit | Lukas Reschke | 2015-01-19 | 1 | -4/+9 |
|\ | | | | | set MySQL autocommit on connection setup | ||||
| * | set MySQL autocommit on connection setup | Thomas Müller | 2015-01-19 | 1 | -4/+9 |
| | | |||||
* | | Merge pull request #13478 from owncloud/tags-chunkedquery | Lukas Reschke | 2015-01-19 | 2 | -4/+30 |
|\ \ | | | | | | | Fix chunked query for tags + unit test | ||||
| * | | Fix chunked query for tags + unit test | Vincent Petry | 2015-01-19 | 2 | -4/+30 |
| |/ | |||||
* | | Merge pull request #13471 from owncloud/fix-blog-typo | Lukas Reschke | 2015-01-19 | 2 | -2/+2 |
|\ \ | |/ |/| | fix typo of blog -> changed to block | ||||
| * | fix typo of blog -> changed to block | Morris Jobke | 2015-01-19 | 2 | -2/+2 |
| | | | | | | | | * fixes #13460 | ||||
* | | Merge pull request #13466 from owncloud/Undefined-index-mimetype-cache | Thomas Müller | 2015-01-19 | 1 | -1/+1 |
|\ \ | |/ |/| | check if mimetype is set - fixes #13452 | ||||
| * | check is mimetype is set - fixed #13452 | Thomas Müller | 2015-01-19 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #13419 from owncloud/drop-animation-user-list | Thomas Müller | 2015-01-19 | 1 | -7/+0 |
|\ \ | |/ |/| | Drop the hide and show of new users in user list | ||||
| * | Drop the hide and show of new users in user list | Morris Jobke | 2015-01-16 | 1 | -7/+0 |
| | | | | | | | | | | | | | | * causes the first load after the initial load to hide some users in the viewport and showing them again, but with a scrolled up viewport * causes higher load for nearly never visible effects * fixes #12962 | ||||
* | | Merge pull request #13461 from owncloud/remove-strip-slashes | Thomas Müller | 2015-01-19 | 1 | -2/+1 |
|\ \ | | | | | | | Remove stripslashes() from newfolder.php | ||||
| * | | Remove stripslashes() from newfolder.php | Lukas Reschke | 2015-01-19 | 1 | -2/+1 |
| | | | |||||
* | | | increase version. This time for real | Frank Karlitschek | 2015-01-18 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #13457 from owncloud/enc-skippartfiles | Thomas Müller | 2015-01-19 | 1 | -0/+55 |
|\ \ \ | |/ / |/| | | Skip stray part files during initial encryption | ||||
| * | | Add class attribute types in encryption Util class | Vincent Petry | 2015-01-19 | 1 | -0/+51 |
| | | | |||||
| * | | Skip stray part files during initial encryption | Vincent Petry | 2015-01-19 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #13377 from owncloud/trashbin_storage_wrapper | Morris Jobke | 2015-01-19 | 9 | -53/+109 |
|\ \ \ | | | | | | | | | [trashbin] replace hook with storage wrapper | ||||
| * | | | replace hook with storage wrapper | Bjoern Schiessle | 2015-01-19 | 9 | -53/+109 |
| | | | | |||||
* | | | | Merge pull request #13423 from ↵ | Thomas Müller | 2015-01-19 | 2 | -9/+53 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | owncloud/share-fixfindshareforuserwithmultiplegroups Fix getItemSharedWithUser for groups | ||||
| * | | | | Fix getItemSharedWithUser for groups | Vincent Petry | 2015-01-16 | 2 | -9/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed SQL query for whenever a user has more than one group. Added missing $owner where clause for group lookup. Added unit tests for the group cases. | ||||
* | | | | | Merge pull request #13362 from owncloud/fix-11442 | Thomas Müller | 2015-01-19 | 3 | -38/+92 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | LDAP Wizared: update user or group count only, when the multiselect is closed | ||||
| * | | | | coding style | Arthur Schiwon | 2015-01-15 | 2 | -5/+8 |
| | | | | | |||||
| * | | | | update user or group count only, when the multiselect is closed | Arthur Schiwon | 2015-01-14 | 1 | -4/+34 |
| | | | | | |||||
| * | | | | allow to read again objectclasses and groups under certain conditions | Arthur Schiwon | 2015-01-14 | 2 | -2/+31 |
| | | | | | |||||
| * | | | | JS cleanup | Arthur Schiwon | 2015-01-13 | 3 | -34/+26 |
| | | | | | |||||
* | | | | | Merge pull request #13443 from owncloud/fix-filtering-for-users | Thomas Müller | 2015-01-19 | 2 | -1/+128 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Fix filtering for users when $gid is empty | ||||
| * | | | | Fix filtering for users when $gid is empty | Lukas Reschke | 2015-01-18 | 2 | -1/+128 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously when $gid was empty the users were not filtered at all. Rendering the search function in the user management pretty useless. Fixes itself | ||||
* | | | | | Merge pull request #13438 from owncloud/cache-the-array | Thomas Müller | 2015-01-19 | 1 | -70/+71 |
|\ \ \ \ \ | | | | | | | | | | | | | Reuse the array key of mimetypes | ||||
| * | | | | | Reuse the array key of mimetypes | Lukas Reschke | 2015-01-18 | 1 | -70/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is called a lot of times and was really slow before due to not reusing the same array. Previously when it was called 500'000 times it took about 2seconds, now we're down to 0.2 seconds on my local machine. Ref https://github.com/owncloud/core/issues/13434 | ||||
* | | | | | | Merge pull request #13447 from owncloud/fix_typo | Joas Schilling | 2015-01-19 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | fix typo - caused by 3d997e8c62bd752f38bcc11f02fb2af0e46d9154 | ||||
| * | | | | | | fix typo - caused by 3d997e8c62bd752f38bcc11f02fb2af0e46d9154 | Morris Jobke | 2015-01-18 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-19 | 10 | -14/+20 |
| | | | | | | |||||
* | | | | | | Merge pull request #13448 from owncloud/fix-exif-orientation | Georg Ehrke | 2015-01-19 | 1 | -5/+12 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix exif orientation for flipped images | ||||
| * | | | | | | Fix exif orientation for flipped images | Morris Jobke | 2015-01-18 | 1 | -5/+12 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #13363 Links: * http://www.daveperrett.com/articles/2012/07/28/exif-orientation-handling-is-a-ghetto/ * Example data: https://github.com/recurser/exif-orientation-examples | ||||
* | | | | | | Merge pull request #13276 from Sugaroverdose/fix_#11348 | Morris Jobke | 2015-01-18 | 2 | -4/+18 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | fix safari rename button positioning #11348 | ||||
| * | | | | | | Add ie8 text-overflow: ellipsis support | Sugaroverdose | 2015-01-17 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | minimum browser window width ≈ 1280px | ||||
| * | | | | | | use some magic to make 'popular browsers' work | Sugaroverdose | 2015-01-16 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | as expected with inline-block span | ||||
| * | | | | | | fix_#11348 Safari rename button positioning | Sergei Shuykov | 2015-01-16 | 2 | -5/+6 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #13433 from owncloud/favoritesl10n | Lukas Reschke | 2015-01-18 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | fix unlocalized favorites browser title and alttext | ||||
| * | | | | | | fix unlocalized favorites browser title and alttext | Volkan Gezer | 2015-01-17 | 2 | -2/+2 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | 8.0.0 beta 2v8.0.0beta1 | Frank Karlitschek | 2015-01-18 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-18 | 16 | -22/+62 |
|/ / / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-17 | 66 | -116/+946 |
| | | | | | |||||
* | | | | | Merge pull request #13319 from owncloud/replace-line-breaks-in-app-description | Lukas Reschke | 2015-01-17 | 2 | -1/+67 |
|\ \ \ \ \ | | | | | | | | | | | | | replace line breaks in the app description by spaces - fixes #13315 | ||||
| * | | | | | OC_App::parseAppInfo | Morris Jobke | 2015-01-14 | 2 | -1/+67 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * replace line breaks (on non empty lines) in the app description by spaces * fixes #13315 * includes unit tests | ||||
* | | | | | | Merge pull request #13421 from owncloud/fix-rename | Robin McCorkell | 2015-01-16 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Fixes shifted rename field | ||||
| * | | | | | Fixes shifted rename field | Morris Jobke | 2015-01-16 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #13418 from owncloud/app-icons | Morris Jobke | 2015-01-16 | 3 | -118/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | add icon for Provisioning API | ||||
| * | | | | | compress icons of LDAP and WebDAV-Auth | Jan-Christoph Borchardt | 2015-01-16 | 2 | -118/+6 |
| | | | | | | |||||
| * | | | | | add icon for Provisioning API | Jan-Christoph Borchardt | 2015-01-16 | 1 | -0/+4 |
|/ / / / / |