summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | remove debug messagesHendrik Leppelsack2015-07-061-3/+0
| * | | | | | moved tooltip.js to vendor scriptsHendrik Leppelsack2015-06-227-287/+11
| * | | | | | deminified tooltip.jsHendrik Leppelsack2015-06-221-1/+525
| * | | | | | replaced tipsy with bootstrap tooltipHendrik Leppelsack2015-06-225-3/+186
* | | | | | | Merge pull request #17827 from owncloud/dont-set-share-password-twice-master-2Thomas Müller2015-07-231-5/+12
|\ \ \ \ \ \ \
| * | | | | | | Adding error handling in case setting the password failsThomas Müller2015-07-231-5/+12
* | | | | | | | Merge pull request #17818 from owncloud/fix-password-change-error-always-show...Roeland Douma2015-07-231-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | assign error message to correct objectmichag862015-07-221-2/+2
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-23122-270/+174
* | | | | | | | Merge pull request #17815 from owncloud/update-blueimp-md5Thomas Müller2015-07-222-11/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Update blueimp-md5 to 1.1.0Morris Jobke2015-07-222-11/+12
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #17807 from owncloud/improve_apps_templateBjörn Schießle2015-07-221-4/+4
|\ \ \ \ \ \ \
| * | | | | | | use arrow to indicate external link, use correct quotes and capitalizationJan-Christoph Borchardt2015-07-221-2/+2
| * | | | | | | make sure that there is a space between user- and admin-documentationBjoern Schiessle2015-07-221-4/+4
* | | | | | | | Merge pull request #17413 from owncloud/public-api-querybuilderMorris Jobke2015-07-2230-175/+4488
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a log message when the Doctrine Query Builder is retrievedJoas Schilling2015-07-214-24/+39
| * | | | | | | | Comment out LIMIT 0 case because of the mixed resultsJoas Schilling2015-07-212-1/+6
| * | | | | | | | Fix tests for setFirstResult and setMaxResults on oracleJoas Schilling2015-07-213-44/+66
| * | | | | | | | Set a limit until doctrine released a version that fixes SqliteJoas Schilling2015-07-211-0/+4
| * | | | | | | | Correctly count the number of items (rowCount is Update/Insert/Delete only)Joas Schilling2015-07-211-13/+22
| * | | | | | | | Can not test the string, thanks oracle....Joas Schilling2015-07-211-10/+32
| * | | | | | | | Fix existing usages by removing the quotesJoas Schilling2015-07-219-103/+109
| * | | | | | | | Add unit tests and automatic quotingJoas Schilling2015-07-2120-157/+2039
| * | | | | | | | Use the public interface and our method instead of the doctrine thingJoas Schilling2015-07-2111-72/+71
| * | | | | | | | Add QueryBuilder, ExpressionBuilder and CompositeExpression wrappersJoas Schilling2015-07-219-0/+2349
* | | | | | | | | Merge pull request #17806 from owncloud/enc_improved_app_descriptionRobin McCorkell2015-07-221-13/+8
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | improved app description and adjust it to the way the new encryption module w...Bjoern Schiessle2015-07-221-13/+8
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #17792 from szepeviktor/masterRobin McCorkell2015-07-222-24/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixing line comments and indentationViktor Szépe2015-07-212-24/+25
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #17342 from rullzer/test_preview_conditionsRoeland Douma2015-07-222-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Only run some preview unit tets if imagemagick is availableRoeland Jago Douma2015-07-022-0/+5
* | | | | | | | Merge pull request #17381 from owncloud/fix_sharing_add_to_groupMorris Jobke2015-07-214-32/+206
|\ \ \ \ \ \ \ \
| * | | | | | | | intproduce pre_addToGroup hook. we need to calculate the possible uniqueBjoern Schiessle2015-07-063-28/+196
| * | | | | | | | use the correct user if we update the share tableBjoern Schiessle2015-07-031-4/+10
* | | | | | | | | Merge pull request #17750 from owncloud/enc_migration_fix_mountpoint_detectionJoas Schilling2015-07-212-4/+81
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix mount point detectionBjoern Schiessle2015-07-202-4/+81
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #17766 from owncloud/escape-ampersandRoeland Douma2015-07-211-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Escape ampersand in logout URLMorris Jobke2015-07-211-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* / | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-218-4/+20
|/ / / / / / / /
* | | | | | | | Merge pull request #17743 from owncloud/return-proper-statuscodesBernhard Posselt2015-07-203-11/+91
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Return proper status code in case of a CORS exceptionLukas Reschke2015-07-203-11/+91
* | | | | | | | Merge pull request #17701 from owncloud/fix_repeated_migrationBjörn Schießle2015-07-206-25/+124
|\ \ \ \ \ \ \ \
| * | | | | | | | unit testsBjoern Schiessle2015-07-171-2/+36
| * | | | | | | | don't move keys if the key where already moved in a previous migration runBjoern Schiessle2015-07-176-24/+89
* | | | | | | | | Merge pull request #17723 from owncloud/fix-17631blizzz2015-07-202-125/+133
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix indentation. no code changes, whitespace only.Arthur Schiwon2015-07-201-126/+126
| * | | | | | | | | fix runtime caching in ldap's user manager, fixes #17631Arthur Schiwon2015-07-172-2/+10
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #16935 from owncloud/allow-app-check-code-for-deprecated-c...Joas Schilling2015-07-2029-181/+1348
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | PR #17046 deprecated OCP\Util::mb_(sub)str_replace()Joas Schilling2015-07-172-1/+3
| * | | | | | | | | Only decorate the type when it was matchedJoas Schilling2015-07-179-79/+194
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-29 02:31:19 +0000