Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | go back to old template but add expire date as optional content | Bjoern Schiessle | 2013-09-30 | 2 | -6/+15 |
* | use OC_DB::executeAudited | Bjoern Schiessle | 2013-09-25 | 1 | -5/+3 |
* | use OC_DB::executeAudited | Bjoern Schiessle | 2013-09-25 | 1 | -5/+3 |
* | set default value for expire parameter | Bjoern Schiessle | 2013-09-25 | 1 | -2/+2 |
* | use template for txt and html mails to send notification mails | Bjoern Schiessle | 2013-09-25 | 5 | -51/+133 |
* | fix PHPDoc | Bjoern Schiessle | 2013-09-24 | 1 | -4/+4 |
* | some small fixes | Bjoern Schiessle | 2013-09-24 | 1 | -8/+18 |
* | some small js fixes | Bjoern Schiessle | 2013-09-24 | 1 | -4/+5 |
* | revert broken 3rdparty reference | Bjoern Schiessle | 2013-09-24 | 1 | -0/+0 |
* | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-23 | 699 | -13635/+32331 |
|\ | |||||
| * | Merge pull request #4896 from owncloud/sharing_allow_disable_password | Björn Schießle | 2013-09-23 | 2 | -10/+25 |
| |\ | |||||
| | * | initialize variable | Bjoern Schiessle | 2013-09-20 | 1 | -0/+1 |
| | * | calculate correct permissions while toggle the password protection | Bjoern Schiessle | 2013-09-20 | 1 | -1/+11 |
| | * | make sure that both $permissions and $oldPermissions have the same type | Bjoern Schiessle | 2013-09-20 | 1 | -1/+1 |
| | * | only remember password if the user changes the permissions, otherwise the use... | Bjoern Schiessle | 2013-09-18 | 1 | -9/+13 |
| * | | Merge pull request #4327 from owncloud/scanfile-remove | Thomas Müller | 2013-09-22 | 2 | -0/+12 |
| |\ \ | |||||
| | * | | remove deleted files while scanning | Robin Appelman | 2013-08-06 | 2 | -0/+12 |
| * | | | Merge pull request #4623 from owncloud/convert-oc_preferences | Bart Visscher | 2013-09-22 | 5 | -73/+461 |
| |\ \ \ | |||||
| | * | | | update inherit docs comment | Bart Visscher | 2013-09-19 | 1 | -3/+3 |
| | * | | | Fix insert/update/delete helper functions for oracle | Bart Visscher | 2013-09-19 | 2 | -1/+55 |
| | * | | | Add missing return true statements to legacy preferences functions | Bart Visscher | 2013-09-19 | 1 | -0/+9 |
| | * | | | Add missing static | Bart Visscher | 2013-09-19 | 1 | -1/+1 |
| | * | | | Convert OC_Preference to object interface | Bart Visscher | 2013-09-19 | 3 | -72/+397 |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-22 | 171 | -472/+674 |
| * | | | | Merge pull request #4929 from owncloud/fixing-4416-master | Morris Jobke | 2013-09-22 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | setting a default on filecache column unencrypted_size | Thomas Müller | 2013-09-20 | 1 | -1/+1 |
| * | | | | | Merge pull request #4938 from owncloud/scan-filter-outside-view | Jörn Friedrich Dreyer | 2013-09-22 | 2 | -6/+22 |
| |\ \ \ \ \ | |||||
| | * | | | | | files: when filtering search results, ensure results are children of the fake... | Robin Appelman | 2013-09-22 | 2 | -6/+22 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #4927 from owncloud/fix_namespaces_and_autoloading | Thomas Müller | 2013-09-21 | 14 | -27/+26 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | remove unneccessary lib in namespace | Jörn Friedrich Dreyer | 2013-09-20 | 10 | -20/+19 |
| | * | | | | namespaces use upcasefirst parts | Jörn Friedrich Dreyer | 2013-09-20 | 13 | -26/+26 |
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-20 | 441 | -7022/+10867 |
| * | | | | | Merge pull request #4684 from owncloud/improved-console | Bart Visscher | 2013-09-19 | 8 | -60/+137 |
| |\ \ \ \ \ | |||||
| | * | | | | | Add copyright, remove starting blank line | Bart Visscher | 2013-09-19 | 3 | -1/+13 |
| | * | | | | | Check all installed apps for console commands | Bart Visscher | 2013-09-14 | 1 | -1/+1 |
| | * | | | | | Use appinfo/register_command.php to add commands to the console command | Bart Visscher | 2013-09-13 | 3 | -2/+25 |
| | * | | | | | Cleanup and more style fixes | Bart Visscher | 2013-09-02 | 2 | -8/+5 |
| | * | | | | | Change Files Scan command to use OC\User\Manager | Bart Visscher | 2013-09-02 | 2 | -8/+19 |
| | * | | | | | Use more object oriented way for console commands | Bart Visscher | 2013-09-01 | 6 | -60/+94 |
| * | | | | | | Merge pull request #4908 from owncloud/fix_css_selector | Bart Visscher | 2013-09-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | css selectors never have a : before [] | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -1/+1 |
| * | | | | | | Merge pull request #4766 from owncloud/fix_3728_with_file_exists_dialog | Thomas Müller | 2013-09-19 | 17 | -515/+1709 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-19 | 281 | -1100/+8175 |
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #4900 from owncloud/fixing-4488-master | Jörn Friedrich Dreyer | 2013-09-19 | 3 | -2/+13 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' into fixing-4488-master | Thomas Müller | 2013-09-19 | 276 | -1227/+8231 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | adding comma to get cleaner diffs in the future | Thomas Müller | 2013-09-18 | 1 | -1/+1 |
| | * | | | | | | | | no file actions during upload | Thomas Müller | 2013-09-18 | 1 | -1/+0 |
| | * | | | | | | | | remove file action elements before recreating them | Thomas Müller | 2013-09-18 | 1 | -0/+5 |
| | * | | | | | | | | store the permissions retrieved via ajax within the dom element | Thomas Müller | 2013-09-18 | 1 | -0/+6 |
| | * | | | | | | | | add permissions of the file to the json response | Thomas Müller | 2013-09-18 | 1 | -1/+2 |
| | | |_|_|_|/ / / | | |/| | | | | | |