Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #10413 from owncloud/adding-handlebars | Lukas Reschke | 2014-08-15 | 1 | -0/+2746 |
|\ | | | | | Adding handlebars.js | ||||
| * | Adding handlebars.js | Thomas Müller | 2014-08-14 | 1 | -0/+2746 |
| | | |||||
* | | Merge pull request #10449 from owncloud/share-clientsidesortnoservercall | Lukas Reschke | 2014-08-15 | 2 | -5/+23 |
|\ \ | | | | | | | Client side sort for sharing overview | ||||
| * | | Client side sort for sharing overview | Vincent Petry | 2014-08-15 | 2 | -5/+23 |
| | | | | | | | | | | | | | | | Since the server doesn't support sorting, use client side sort directly instead of calling reload() first. | ||||
* | | | Merge pull request #10452 from owncloud/betterssl | Thomas Müller | 2014-08-15 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | We'd better use SSL in capital | ||||
| * | | | ssl capital | Volkan Gezer | 2014-08-15 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #10442 from owncloud/move-failed-logins | Lukas Reschke | 2014-08-15 | 3 | -10/+5 |
|\ \ \ | |/ / |/| | | Move authentication failed logging to checkPassword | ||||
| * | | Fix unit test | Lukas Reschke | 2014-08-15 | 1 | -1/+4 |
| | | | |||||
| * | | Move authentication failed logging to checkPassword | Lukas Reschke | 2014-08-15 | 3 | -10/+2 |
| | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/10366 | ||||
* | | | Merge pull request #10440 from owncloud/enforce-debug | Clark Tomlinson | 2014-08-15 | 1 | -7/+0 |
|\ \ \ | | | | | | | | | Remove ability to trigger DEBUG mode via cookie | ||||
| * | | | Remove ability to trigger DEBUG mode via cookie | Lukas Reschke | 2014-08-15 | 1 | -7/+0 |
| |/ / | | | | | | | | | | | | | Users should not be able to enable debug mode on their own by setting a cookie. Using debug mode might leak too much information about the environment or have other unexpected behaviour. We should backport this. | ||||
* | | | Merge pull request #9275 from NormalRa/master | Lukas Reschke | 2014-08-15 | 4 | -0/+71 |
|\ \ \ | | | | | | | | | Add .apk mimetype. | ||||
| * | | | Add APK mimetype tests. | Normal Ra | 2014-08-13 | 1 | -0/+27 |
| | | | | |||||
| * | | | Remove stray tab characters. | Normal Ra | 2014-08-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | APK mimetype icon to be a generic package icon. | Normal Ra | 2014-08-12 | 1 | -0/+1 |
| | | | | |||||
| * | | | Add APK mimetype repair scenario. | Normal Ra | 2014-08-12 | 1 | -0/+42 |
| | | | | |||||
| * | | | Add .apk mimetype. | Normal Ra | 2014-06-28 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #10439 from owncloud/design-fix-contrast | Morris Jobke | 2014-08-15 | 1 | -3/+2 |
|\ \ \ \ | |_|/ / |/| | | | change error text color to white for better contrast, fix #10424 | ||||
| * | | | change error text color to white for better contrast, fix #10424 | Jan-Christoph Borchardt | 2014-08-15 | 1 | -3/+2 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-15 | 375 | -4081/+5098 |
| | | | |||||
* | | | Merge pull request #10434 from owncloud/update_deprecation_doc | Morris Jobke | 2014-08-15 | 9 | -2/+22 |
|\ \ \ | | | | | | | | | add missing @deprecated annotation to legacy classes | ||||
| * | | | add missing @deprecated annotation to legacy classes | Jörn Friedrich Dreyer | 2014-08-14 | 9 | -2/+22 |
| | | | | |||||
* | | | | Merge pull request #10374 from ogasser/compare_upload_limit_against_biggest_file | Jan-Christoph Borchardt | 2014-08-14 | 1 | -4/+7 |
|\ \ \ \ | |/ / / |/| | | | Compare upload limit against biggest file | ||||
| * | | | Compare upload limit against biggest file | Oliver Gasser | 2014-08-12 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | When uploading multiple files from the web interface, compare the PHP upload limit against the largest file, not against the sum of all files. | ||||
* | | | | Merge pull request #10417 from owncloud/update_deprecation_doc | Thomas Müller | 2014-08-14 | 4 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | update deprecation docs | ||||
| * | | | | update deprecation docs | Jörn Friedrich Dreyer | 2014-08-14 | 4 | -4/+4 |
| | | | | | |||||
* | | | | | Merge pull request #10399 from owncloud/fix_setSendMailStatus | Björn Schießle | 2014-08-14 | 3 | -7/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | [sharing] fix mail notification | ||||
| * | | | | | we need the recipient as a additional parameter to know for which share the ↵ | Bjoern Schiessle | 2014-08-13 | 3 | -7/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | notification was send | ||||
* | | | | | | Merge pull request #10398 from owncloud/external-share-ssl-warn | Robin Appelman | 2014-08-14 | 1 | -11/+17 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Give a better error message for external shares with self-signed ssl certificates | ||||
| * | | | | | | Give a better error message for external shares with self-signed ssl ↵ | Robin Appelman | 2014-08-13 | 1 | -11/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | certificates | ||||
* | | | | | | | Merge pull request #10414 from owncloud/relax-code-checker | Clark Tomlinson | 2014-08-14 | 1 | -4/+0 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | in order to prevent false-positives on the code checker - exec and eval ... | ||||
| * | | | | | | | in order to prevent false-positives on the code checker - exec and eval will ↵ | Thomas Müller | 2014-08-14 | 1 | -4/+0 |
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | not longer be grepped for | ||||
* | | | | | | | Merge pull request #10410 from owncloud/typo | Volkan Gezer | 2014-08-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ascii typo | ||||
| * | | | | | | ascii typo | Volkan Gezer | 2014-08-14 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #10295 from owncloud/file_actions_error_handling | Björn Schießle | 2014-08-14 | 4 | -9/+62 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | file actions improved error handling | ||||
| * | | | | | | | new unit test added | Bjoern Schiessle | 2014-08-11 | 1 | -4/+42 |
| | | | | | | | | |||||
| * | | | | | | | no error if we try to delete a file which no longer exists | Bjoern Schiessle | 2014-08-11 | 1 | -1/+2 |
| | | | | | | | | |||||
| * | | | | | | | no special action for folder named 'Shared' needed | Bjoern Schiessle | 2014-08-11 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | add error message if user wants to rename a file which no longer exists | Bjoern Schiessle | 2014-08-11 | 2 | -4/+18 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #10395 from owncloud/close-filehandle-lib-files | Morris Jobke | 2014-08-14 | 3 | -0/+3 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Close open file handles in files library | ||||
| * | | | | | | | Close open file handles in files library | Morris Jobke | 2014-08-13 | 3 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ref #10392 | ||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-14 | 305 | -1338/+1352 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #10396 from owncloud/kill-filesync | Thomas Müller | 2014-08-13 | 2 | -65/+0 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Kill filesync.php in files/appinfo | ||||
| * | | | | | | | Kill filesync.php in files/appinfo | Morris Jobke | 2014-08-13 | 2 | -65/+0 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | * ref comment: https://github.com/owncloud/core/issues/10392#issuecomment-52050567 | ||||
* | | | | | | | Merge pull request #10394 from owncloud/close-filehandle-lib-image | Thomas Müller | 2014-08-13 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Close file handle if exception occurs in image class | ||||
| * | | | | | | | Close file handle if exception occurs in image class | Morris Jobke | 2014-08-13 | 1 | -0/+4 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | ref #10392 | ||||
* | | | | | | | Merge pull request #10403 from owncloud/getid-cast-int | Lukas Reschke | 2014-08-13 | 2 | -2/+3 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Cast file id's to int so we can compare them properly | ||||
| * | | | | | | Cast file id's to int so we can compare them properly | Robin Appelman | 2014-08-13 | 2 | -2/+3 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #10323 from gekmihesg/master | blizzz | 2014-08-13 | 1 | -0/+3 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Load authentication backends before tryBasicAuth | ||||
| * | | | | | Load authentication backends before tryBasicAuth | gekmihesg | 2014-08-10 | 1 | -0/+3 |
| | | | | | |