summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* always set encrypted flag when overwriting a file we should encryptRobin Appelman2012-02-261-1/+2
* merge master into encryptionRobin Appelman2012-02-2645-192/+868
|\
| * improved humanFileSize for jsRobin Appelman2012-02-261-15/+11
| * improved password hashing based one phpassRobin Appelman2012-02-265-7/+494
| * stop using 3rdparty services for timezone detectionGeorg Ehrke2012-02-262-34/+12
| * add OC_Geo classGeorg Ehrke2012-02-261-0/+31
| * hopefully a fix for webroot detectionRobin Appelman2012-02-261-0/+7
| * missed one is_writeableRobin Appelman2012-02-261-1/+1
| * chunked implementation for readfileRobin Appelman2012-02-265-21/+8
| * application/ogg is music toRobin Appelman2012-02-262-1/+6
| * intval() of a number seems unnecessaryRobin Appelman2012-02-261-1/+1
| * additional error codes for file uploadRobin Appelman2012-02-261-6/+7
| * more robust png fallbackRobin Appelman2012-02-261-6/+12
| * improve log browsingRobin Appelman2012-02-269-47/+126
| * fix type error in dir creation for categoriesMichiel de Jong2012-02-252-2/+2
| * bump up version and update licenseMichiel de Jong2012-02-251-2/+2
| * bump up version and update licenseMichiel de Jong2012-02-251-2/+2
| * security hardening in remoteStorage appMichiel de Jong2012-02-253-13/+21
| * Merge branch 'master' of gitorious.org:owncloud/owncloudMichiel de Jong2012-02-2575-294/+887
| |\
| | * unicode chars in gallery name fixBartek Przybylski2012-02-253-5/+6
| | * some more error reporting during filesystem scanRobin Appelman2012-02-253-9/+42
| | * don't limit ourselfs to 32bit integersRobin Appelman2012-02-252-7/+7
| * | correct header Content-Type: application/xrd+xmlMichiel de Jong2012-02-222-2/+2
| * | BearerAuth and multiple tokens support in remoteStorage appMichiel de Jong2012-02-225-18/+84
| * | avoid notice in error log from user_webfinger appMichiel de Jong2012-02-222-2/+2
* | | Merge branch 'master' into encryptionRobin Appelman2012-02-2584-423/+803
|\ \ \ | | |/ | |/|
| * | add javascript bindings for OC_AppConfigRobin Appelman2012-02-253-0/+91
| * | some multiselect improvementsRobin Appelman2012-02-251-5/+14
| * | gallery thumbnail creation fixBartek Przybylski2012-02-251-1/+0
| * | cleanup pdfviewer app nameRobin Appelman2012-02-241-1/+2
| * | if a deleted file is uploaded, finish the delete firstRobin Appelman2012-02-241-0/+7
| * | slight change to select styleRobin Appelman2012-02-243-2/+6
| * | fix bug in group mangementRobin Appelman2012-02-242-2/+8
| * | add configure option for default quotaRobin Appelman2012-02-244-3/+30
| * | new config widget for user quotaRobin Appelman2012-02-245-45/+94
| * | add a default user quotaRobin Appelman2012-02-242-4/+36
| * | prevent errors when a user backends gives an invalid resultRobin Appelman2012-02-241-1/+4
| * | remove limit from configvalue for long config valuesArthur Schiwon2012-02-242-7/+7
| * | Calendar selection only available if there are more than one.Marvin Thomas Rabe2012-02-231-0/+7
| * | Sharing dropdown width fixed.Marvin Thomas Rabe2012-02-232-2/+3
| * | rename updatecalendar to updateGeorg Ehrke2012-02-231-0/+0
| * | change links in the event form for the new ajax foldersGeorg Ehrke2012-02-232-3/+3
| * | change pathes in calendar/templates/* files to make them work with the new fo...Georg Ehrke2012-02-232-2/+2
| * | update js files for new ajax pathesGeorg Ehrke2012-02-234-20/+20
| * | better var name in changeview.phpGeorg Ehrke2012-02-231-2/+11
| * | add moved files to clean up ajax folderGeorg Ehrke2012-02-2327-0/+1094
| * | remove old ajax filesGeorg Ehrke2012-02-2321-819/+0
| * | Editor fixed.Marvin Thomas Rabe2012-02-234-8/+10
| * | log typo fixBartek Przybylski2012-02-231-1/+1
| * | check if the tempfile was created successfullyGeorg Ehrke2012-02-231-0/+3