summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* go back to old template but add expire date as optional contentBjoern Schiessle2013-09-302-6/+15
* use OC_DB::executeAuditedBjoern Schiessle2013-09-251-5/+3
* use OC_DB::executeAuditedBjoern Schiessle2013-09-251-5/+3
* set default value for expire parameterBjoern Schiessle2013-09-251-2/+2
* use template for txt and html mails to send notification mailsBjoern Schiessle2013-09-255-51/+133
* fix PHPDocBjoern Schiessle2013-09-241-4/+4
* some small fixesBjoern Schiessle2013-09-241-8/+18
* some small js fixesBjoern Schiessle2013-09-241-4/+5
* revert broken 3rdparty referenceBjoern Schiessle2013-09-241-0/+0
* Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-23699-13635/+32331
|\
| * Merge pull request #4896 from owncloud/sharing_allow_disable_passwordBjörn Schießle2013-09-232-10/+25
| |\
| | * initialize variableBjoern Schiessle2013-09-201-0/+1
| | * calculate correct permissions while toggle the password protectionBjoern Schiessle2013-09-201-1/+11
| | * make sure that both $permissions and $oldPermissions have the same typeBjoern Schiessle2013-09-201-1/+1
| | * only remember password if the user changes the permissions, otherwise the use...Bjoern Schiessle2013-09-181-9/+13
| * | Merge pull request #4327 from owncloud/scanfile-removeThomas Müller2013-09-222-0/+12
| |\ \
| | * | remove deleted files while scanningRobin Appelman2013-08-062-0/+12
| * | | Merge pull request #4623 from owncloud/convert-oc_preferencesBart Visscher2013-09-225-73/+461
| |\ \ \
| | * | | update inherit docs commentBart Visscher2013-09-191-3/+3
| | * | | Fix insert/update/delete helper functions for oracleBart Visscher2013-09-192-1/+55
| | * | | Add missing return true statements to legacy preferences functionsBart Visscher2013-09-191-0/+9
| | * | | Add missing staticBart Visscher2013-09-191-1/+1
| | * | | Convert OC_Preference to object interfaceBart Visscher2013-09-193-72/+397
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-22171-472/+674
| * | | | Merge pull request #4929 from owncloud/fixing-4416-masterMorris Jobke2013-09-221-1/+1
| |\ \ \ \
| | * | | | setting a default on filecache column unencrypted_sizeThomas Müller2013-09-201-1/+1
| * | | | | Merge pull request #4938 from owncloud/scan-filter-outside-viewJörn Friedrich Dreyer2013-09-222-6/+22
| |\ \ \ \ \
| | * | | | | files: when filtering search results, ensure results are children of the fake...Robin Appelman2013-09-222-6/+22
| | |/ / / /
| * | | | | Merge pull request #4927 from owncloud/fix_namespaces_and_autoloadingThomas Müller2013-09-2114-27/+26
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | remove unneccessary lib in namespaceJörn Friedrich Dreyer2013-09-2010-20/+19
| | * | | | namespaces use upcasefirst partsJörn Friedrich Dreyer2013-09-2013-26/+26
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-20441-7022/+10867
| * | | | | Merge pull request #4684 from owncloud/improved-consoleBart Visscher2013-09-198-60/+137
| |\ \ \ \ \
| | * | | | | Add copyright, remove starting blank lineBart Visscher2013-09-193-1/+13
| | * | | | | Check all installed apps for console commandsBart Visscher2013-09-141-1/+1
| | * | | | | Use appinfo/register_command.php to add commands to the console commandBart Visscher2013-09-133-2/+25
| | * | | | | Cleanup and more style fixesBart Visscher2013-09-022-8/+5
| | * | | | | Change Files Scan command to use OC\User\ManagerBart Visscher2013-09-022-8/+19
| | * | | | | Use more object oriented way for console commandsBart Visscher2013-09-016-60/+94
| * | | | | | Merge pull request #4908 from owncloud/fix_css_selectorBart Visscher2013-09-191-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | css selectors never have a : before []Jörn Friedrich Dreyer2013-09-191-1/+1
| * | | | | | Merge pull request #4766 from owncloud/fix_3728_with_file_exists_dialogThomas Müller2013-09-1917-515/+1709
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-19281-1100/+8175
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #4900 from owncloud/fixing-4488-masterJörn Friedrich Dreyer2013-09-193-2/+13
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into fixing-4488-masterThomas Müller2013-09-19276-1227/+8231
| | |\ \ \ \ \ \ \
| | * | | | | | | | adding comma to get cleaner diffs in the futureThomas Müller2013-09-181-1/+1
| | * | | | | | | | no file actions during uploadThomas Müller2013-09-181-1/+0
| | * | | | | | | | remove file action elements before recreating themThomas Müller2013-09-181-0/+5
| | * | | | | | | | store the permissions retrieved via ajax within the dom elementThomas Müller2013-09-181-0/+6
| | * | | | | | | | add permissions of the file to the json responseThomas Müller2013-09-181-1/+2
| | | |_|_|_|/ / / | | |/| | | | | |